Skip to content

Commit cd88b51

Browse files
brsonpaulstansifer
authored andcommitted
rustc: Return the correct span from parse_seq
1 parent 462e47e commit cd88b51

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/comp/front/parser.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,6 @@ fn parse_arg(&parser p) -> ast::arg {
608608
fn parse_seq_to_end[T](token::token ket,
609609
option::t[token::token] sep,
610610
(fn(&parser) -> T) f,
611-
uint hi,
612611
&parser p) -> vec[T] {
613612
let bool first = true;
614613
let vec[T] v = [];
@@ -628,7 +627,6 @@ fn parse_seq_to_end[T](token::token ket,
628627
let T t = f(p);
629628
v += [t];
630629
}
631-
hi = p.get_hi_pos();
632630
expect(p, ket);
633631
ret v;
634632
}
@@ -639,9 +637,9 @@ fn parse_seq[T](token::token bra,
639637
(fn(&parser) -> T) f,
640638
&parser p) -> util::common::spanned[vec[T]] {
641639
auto lo = p.get_lo_pos();
642-
auto hi = p.get_hi_pos();
643640
expect(p, bra);
644-
auto result = parse_seq_to_end[T](ket, sep, f, hi, p);
641+
auto result = parse_seq_to_end[T](ket, sep, f, p);
642+
auto hi = p.get_hi_pos();
645643
ret spanned(lo, hi, result);
646644
}
647645

@@ -823,7 +821,7 @@ fn parse_bottom_expr(&parser p) -> @ast::expr {
823821

824822
auto es = parse_seq_to_end[@ast::expr](token::RBRACKET,
825823
some(token::COMMA),
826-
pf, hi, p);
824+
pf, p);
827825
ex = ast::expr_vec(es, mut, p.get_ann());
828826
} else if (eat_word(p, "obj")) {
829827
// Anonymous object
@@ -836,15 +834,14 @@ fn parse_bottom_expr(&parser p) -> @ast::expr {
836834
none[vec[ast::obj_field]];
837835
if (p.peek() == token::LPAREN) {
838836
auto pf = parse_obj_field;
839-
hi = p.get_hi_pos();
840837
expect(p, token::LPAREN);
841838

842839

843840
fields = some[vec[ast::obj_field]]
844841
(parse_seq_to_end[ast::obj_field]
845842
(token::RPAREN,
846843
some(token::COMMA),
847-
pf, hi, p));
844+
pf, p));
848845
}
849846

850847
let vec[@ast::method] meths = [];

0 commit comments

Comments
 (0)