auto merge of rust-lang#6208 : sanxiyn/rust/accurate-span, r=sanxiyn

nikomatsakis · May 5, 2013 · 6e6a4be · 6e6a4be
2 parents 063851f + aca2a00
commit 6e6a4be
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs
@@ -156,7 +156,7 @@ impl parser_attr for Parser {
                 @spanned(lo, hi, ast::meta_list(name, inner_items))
             }
             _ => {
-                let hi = self.span.hi;
+                let hi = self.last_span.hi;
                 @spanned(lo, hi, ast::meta_word(name))
             }
         }

diff --git a/src/libsyntax/parse/common.rs b/src/libsyntax/parse/common.rs
@@ -122,7 +122,7 @@ pub impl Parser {
     fn parse_path_list_ident(&self) -> ast::path_list_ident {
         let lo = self.span.lo;
         let ident = self.parse_ident();
-        let hi = self.span.hi;
+        let hi = self.last_span.hi;
         spanned(lo, hi, ast::path_list_ident_ { name: ident,
                                                 id: self.get_id() })
     }

diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
@@ -591,7 +591,7 @@ mod test {
                                                                types: ~[]},
                                                            None // no idea
                                                           ),
-                                      span: sp(0,3)}, // really?
+                                      span: sp(0,1)},
                        id: 4 // fixme
                    })
     }
@@ -628,7 +628,7 @@ mod test {
                                                            types: ~[]},
                                                        None // no idea
                                                    ),
-                                                  span: sp(6,9)}, // bleah.
+                                                  span: sp(6,7)},
                                     id: 4 // fixme
                                 }],
                                 output: @ast::Ty{id:5, // fixme

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
@@ -2444,7 +2444,7 @@ pub impl Parser {
                     }
                 }
             }
-            hi = self.span.hi;
+            hi = self.last_span.hi;
           }
         }
         @ast::pat { id: self.get_id(), node: pat, span: mk_sp(lo, hi) }
@@ -4308,7 +4308,7 @@ pub impl Parser {
                                 rp: None,
                                 types: ~[] };
         return @spanned(lo,
-                        self.span.hi,
+                        self.last_span.hi,
                         view_path_simple(last, path, self.get_id()));
     }