Track spans better in the protocol compiler so we can get better error messages.

diff --git a/src/libsyntax/ext/pipes/ast_builder.rs b/src/libsyntax/ext/pipes/ast_builder.rs
index d2ef304a1f000c39b596e90de7d572b7058faa6a..da2f9d433739aa2d1c1808a5d694b04c4ae1c861 100644 (file)
--- a/src/libsyntax/ext/pipes/ast_builder.rs
+++ b/src/libsyntax/ext/pipes/ast_builder.rs
@@ -55,7 +55,7 @@ fn ty_param(id: ast::ident, +bounds: ~[ast::ty_param_bound])
     fn arg_mode(name: ident, ty: @ast::ty, mode: ast::rmode) -> ast::arg;
     fn expr_block(e: @ast::expr) -> ast::blk;
     fn fn_decl(+inputs: ~[ast::arg], output: @ast::ty) -> ast::fn_decl;
-    fn item(name: ident, +node: ast::item_) -> @ast::item;
+    fn item(name: ident, span: span, +node: ast::item_) -> @ast::item;
     fn item_fn_poly(name: ident,
                     +inputs: ~[ast::arg],
                     output: @ast::ty,
@@ -66,16 +66,19 @@ fn item_fn(name: ident,
                output: @ast::ty,
                +body: ast::blk) -> @ast::item;
     fn item_enum_poly(name: ident,
+                      span: span,
                       +enum_definition: ast::enum_def,
                       +ty_params: ~[ast::ty_param]) -> @ast::item;
-    fn item_enum(name: ident, +enum_definition: ast::enum_def) -> @ast::item;
-    fn variant(name: ident, +tys: ~[@ast::ty]) -> ast::variant;
-    fn item_mod(name: ident, +items: ~[@ast::item]) -> @ast::item;
+    fn item_enum(name: ident, span: span, 
+                 +enum_definition: ast::enum_def) -> @ast::item;
+    fn variant(name: ident, span: span, +tys: ~[@ast::ty]) -> ast::variant;
+    fn item_mod(name: ident, span: span, +items: ~[@ast::item]) -> @ast::item;
     fn ty_path_ast_builder(path: @ast::path) -> @ast::ty;
     fn item_ty_poly(name: ident,
+                    span: span,
                     ty: @ast::ty,
                     +params: ~[ast::ty_param]) -> @ast::item;
-    fn item_ty(name: ident, ty: @ast::ty) -> @ast::item;
+    fn item_ty(name: ident, span: span, ty: @ast::ty) -> @ast::item;
     fn ty_vars(+ty_params: ~[ast::ty_param]) -> ~[@ast::ty];
     fn ty_field_imm(name: ident, ty: @ast::ty) -> ast::ty_field;
     fn ty_rec(+~[ast::ty_field]) -> @ast::ty;
@@ -208,13 +211,14 @@ fn fn_decl(+inputs: ~[ast::arg],
     }
 
     fn item(name: ident,
+            span: span,
             +node: ast::item_) -> @ast::item {
         @{ident: name,
          attrs: ~[],
          id: self.next_id(),
          node: node,
          vis: ast::public,
-         span: self.empty_span()}
+         span: span}
     }
 
     fn item_fn_poly(name: ident,
@@ -223,6 +227,7 @@ fn item_fn_poly(name: ident,
                     +ty_params: ~[ast::ty_param],
                     +body: ast::blk) -> @ast::item {
         self.item(name,
+                  self.empty_span(),
                   ast::item_fn(self.fn_decl(inputs, output),
                                ty_params,
                                body))
@@ -236,16 +241,19 @@ fn item_fn(name: ident,
     }
 
     fn item_enum_poly(name: ident,
+                      span: span,
                       +enum_definition: ast::enum_def,
                       +ty_params: ~[ast::ty_param]) -> @ast::item {
-        self.item(name, ast::item_enum(enum_definition, ty_params))
+        self.item(name, span, ast::item_enum(enum_definition, ty_params))
     }
 
-    fn item_enum(name: ident, +enum_definition: ast::enum_def) -> @ast::item {
-        self.item_enum_poly(name, enum_definition, ~[])
+    fn item_enum(name: ident, span: span,
+                 +enum_definition: ast::enum_def) -> @ast::item {
+        self.item_enum_poly(name, span, enum_definition, ~[])
     }
 
     fn variant(name: ident,
+               span: span,
                +tys: ~[@ast::ty]) -> ast::variant {
         let args = tys.map(|ty| {ty: ty, id: self.next_id()});
 
@@ -255,12 +263,14 @@ fn variant(name: ident,
                 id: self.next_id(),
                 disr_expr: none,
                 vis: ast::public},
-         span: self.empty_span()}
+         span: span}
     }
 
     fn item_mod(name: ident,
+                span: span,
                 +items: ~[@ast::item]) -> @ast::item {
         self.item(name,
+                  span,
                   ast::item_mod({
                       view_items: ~[],
                       items: items}))
@@ -269,7 +279,7 @@ fn item_mod(name: ident,
     fn ty_path_ast_builder(path: @ast::path) -> @ast::ty {
         @{id: self.next_id(),
           node: ast::ty_path(path, self.next_id()),
-          span: self.empty_span()}
+          span: path.span}
     }
 
     fn ty_nil_ast_builder() -> @ast::ty {
@@ -279,13 +289,14 @@ fn ty_nil_ast_builder() -> @ast::ty {
     }
 
     fn item_ty_poly(name: ident,
+                    span: span,
                     ty: @ast::ty,
                     +params: ~[ast::ty_param]) -> @ast::item {
-        self.item(name, ast::item_ty(ty, params))
+        self.item(name, span, ast::item_ty(ty, params))
     }
 
-    fn item_ty(name: ident, ty: @ast::ty) -> @ast::item {
-        self.item_ty_poly(name, ty, ~[])
+    fn item_ty(name: ident, span: span, ty: @ast::ty) -> @ast::item {
+        self.item_ty_poly(name, span, ty, ~[])
     }
 
     fn ty_vars(+ty_params: ~[ast::ty_param]) -> ~[@ast::ty] {

diff --git a/src/libsyntax/ext/pipes/pipec.rs b/src/libsyntax/ext/pipes/pipec.rs
index 8bd0d3313d59943551e13ad69eb28eb7bb7869cb..f7f2981f066bd6ff53f3ed71deb7b16a61fdd7a0 100644 (file)
--- a/src/libsyntax/ext/pipes/pipec.rs
+++ b/src/libsyntax/ext/pipes/pipec.rs
@@ -207,7 +207,7 @@ fn to_type_decls(cx: ext_ctxt) -> ~[@ast::item] {
         let mut items_msg = ~[];
 
         for self.messages.each |m| {
-            let message(name, _span, tys, this, next) = m;
+            let message(name, span, tys, this, next) = m;
 
             let tys = match next {
               some({state: next, tys: next_tys}) => {
@@ -226,12 +226,13 @@ fn to_type_decls(cx: ext_ctxt) -> ~[@ast::item] {
               none => tys
             };
 
-            let v = cx.variant(name, tys);
+            let v = cx.variant(name, span, tys);
 
             vec::push(items_msg, v);
         }
 
         ~[cx.item_enum_poly(name,
+                            self.span,
                             ast::enum_def({ variants: items_msg,
                                             common: none }),
                             self.ty_params)]
@@ -255,6 +256,7 @@ fn to_endpoint_decls(cx: ext_ctxt, dir: direction) -> ~[@ast::item] {
             vec::push(items,
                       cx.item_ty_poly(
                           self.data_name(),
+                          self.span,
                           cx.ty_path_ast_builder(
                               (@~"pipes" + @(dir.to_str() + ~"_packet"))
                               .add_ty(cx.ty_path_ast_builder(
@@ -266,6 +268,7 @@ fn to_endpoint_decls(cx: ext_ctxt, dir: direction) -> ~[@ast::item] {
             vec::push(items,
                       cx.item_ty_poly(
                           self.data_name(),
+                          self.span,
                           cx.ty_path_ast_builder(
                               (@~"pipes" + @(dir.to_str()
                                              + ~"_packet_buffered"))
@@ -384,6 +387,7 @@ fn gen_buffer_type(cx: ext_ctxt) -> @ast::item {
 
         cx.item_ty_poly(
             @~"__Buffer",
+            cx.empty_span(),
             cx.ty_rec(fields),
             params)
     }
@@ -407,12 +411,14 @@ fn compile(cx: ext_ctxt) -> @ast::item {
 
         vec::push(items,
                   cx.item_mod(@~"client",
+                              self.span,
                               client_states));
         vec::push(items,
                   cx.item_mod(@~"server",
+                              self.span,
                               server_states));
 
-        cx.item_mod(self.name, items)
+        cx.item_mod(self.name, self.span, items)
     }
 }