Skip to content

More accurate spans #6208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 5, 2013
Merged

More accurate spans #6208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0d8873
More accurate spans
sanxiyn May 2, 2013
aca2a00
Fix span tests
sanxiyn May 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libsyntax/parse/attr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/parse/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() })
}
Expand Down
4 changes: 2 additions & 2 deletions src/libsyntax/parse/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ mod test {
types: ~[]},
None // no idea
),
span: sp(0,3)}, // really?
span: sp(0,1)},
id: 4 // fixme
})
}
Expand Down Expand Up @@ -627,7 +627,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
Expand Down
4 changes: 2 additions & 2 deletions src/libsyntax/parse/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2445,7 +2445,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) }
Expand Down Expand Up @@ -4311,7 +4311,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()));
}

Expand Down