aboutsummaryrefslogtreecommitdiff
path: root/src/comp/front/parser.rs
diff options
context:
space:
mode:
authorMarijn Haverbeke <[email protected]>2011-03-29 12:46:55 +0200
committerGraydon Hoare <[email protected]>2011-03-31 14:41:40 +0000
commit39f0656b4f428b81bd6be06b89a8de1e63b72e87 (patch)
tree212cc3c132a48f497f7243956bd0e2235cd6b00e /src/comp/front/parser.rs
parentSupport break and cont in pretty-printer (diff)
downloadrust-39f0656b4f428b81bd6be06b89a8de1e63b72e87.tar.xz
rust-39f0656b4f428b81bd6be06b89a8de1e63b72e87.zip
Improve line comment positioning
This involved making ast.variant spanned.
Diffstat (limited to 'src/comp/front/parser.rs')
-rw-r--r--src/comp/front/parser.rs10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs
index cc3388b3..8562c56a 100644
--- a/src/comp/front/parser.rs
+++ b/src/comp/front/parser.rs
@@ -451,7 +451,9 @@ impure fn parse_ty(parser p) -> @ast.ty {
}
case (token.IDENT(_)) {
- t = ast.ty_path(parse_path(p, GREEDY), none[ast.def]);
+ auto path = parse_path(p, GREEDY);
+ t = ast.ty_path(path, none[ast.def]);
+ hi = path.span;
}
case (token.MUTABLE) {
@@ -2067,6 +2069,7 @@ impure fn parse_item_tag(parser p) -> @ast.item {
auto tok = p.peek();
alt (tok) {
case (token.IDENT(?name)) {
+ auto vlo = p.get_span();
p.bump();
let vec[ast.variant_arg] args = vec();
@@ -2084,11 +2087,12 @@ impure fn parse_item_tag(parser p) -> @ast.item {
case (_) { /* empty */ }
}
+ auto vhi = p.get_span();
expect(p, token.SEMI);
auto id = p.next_def_id();
- variants += vec(rec(name=name, args=args, id=id,
- ann=ast.ann_none));
+ auto vr = rec(name=name, args=args, id=id, ann=ast.ann_none);
+ variants += vec(spanned[ast.variant_](vlo, vhi, vr));
}
case (token.RBRACE) { /* empty */ }
case (_) {