squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Change spans for sugary call expressions

Browse source
This commit is contained in:
Seo Sanghyeon 2013-07-04 20:48:45 +09:00
parent 20458899d5
commit 30fca57f17
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libsyntax/parse/parser.rs
View file

@ -1549,10 +1549,10 @@ impl Parser {
} else if self.eat_keyword(keywords::If) { } else if self.eat_keyword(keywords::If) {
return self.parse_if_expr(); return self.parse_if_expr();
} else if self.eat_keyword(keywords::For) { } else if self.eat_keyword(keywords::For) {
return self.parse_sugary_call_expr(~"for", ForSugar, return self.parse_sugary_call_expr(lo, ~"for", ForSugar,
expr_loop_body); expr_loop_body);
} else if self.eat_keyword(keywords::Do) { } else if self.eat_keyword(keywords::Do) {
return self.parse_sugary_call_expr(~"do", DoSugar, return self.parse_sugary_call_expr(lo, ~"do", DoSugar,
expr_do_body); expr_do_body);
} else if self.eat_keyword(keywords::While) { } else if self.eat_keyword(keywords::While) {
return self.parse_while_expr(); return self.parse_while_expr();
@ -2264,12 +2264,11 @@ impl Parser {
// parse a 'for' or 'do'. // parse a 'for' or 'do'.
// the 'for' and 'do' expressions parse as calls, but look like // the 'for' and 'do' expressions parse as calls, but look like
// function calls followed by a closure expression. // function calls followed by a closure expression.
pub fn parse_sugary_call_expr(&self, pub fn parse_sugary_call_expr(&self, lo: BytePos,
keyword: ~str, keyword: ~str,
sugar: CallSugar, sugar: CallSugar,
ctor: &fn(v: @expr) -> expr_) ctor: &fn(v: @expr) -> expr_)
-> @expr { -> @expr {
let lo = self.last_span;
// Parse the callee `foo` in // Parse the callee `foo` in
// for foo || { // for foo || {
// for foo.bar || { // for foo.bar || {
@ -2286,21 +2285,21 @@ impl Parser {
let last_arg = self.mk_expr(block.span.lo, block.span.hi, let last_arg = self.mk_expr(block.span.lo, block.span.hi,
ctor(block)); ctor(block));
let args = vec::append(copy *args, [last_arg]); let args = vec::append(copy *args, [last_arg]);
self.mk_expr(lo.lo, block.span.hi, expr_call(f, args, sugar)) self.mk_expr(lo, block.span.hi, expr_call(f, args, sugar))
} }
expr_method_call(_, f, i, ref tps, ref args, NoSugar) => { expr_method_call(_, f, i, ref tps, ref args, NoSugar) => {
let block = self.parse_lambda_block_expr(); let block = self.parse_lambda_block_expr();
let last_arg = self.mk_expr(block.span.lo, block.span.hi, let last_arg = self.mk_expr(block.span.lo, block.span.hi,
ctor(block)); ctor(block));
let args = vec::append(copy *args, [last_arg]); let args = vec::append(copy *args, [last_arg]);
self.mk_expr(lo.lo, block.span.hi, self.mk_expr(lo, block.span.hi,
self.mk_method_call(f, i, copy *tps, args, sugar)) self.mk_method_call(f, i, copy *tps, args, sugar))
} }
expr_field(f, i, ref tps) => { expr_field(f, i, ref tps) => {
let block = self.parse_lambda_block_expr(); let block = self.parse_lambda_block_expr();
let last_arg = self.mk_expr(block.span.lo, block.span.hi, let last_arg = self.mk_expr(block.span.lo, block.span.hi,
ctor(block)); ctor(block));
self.mk_expr(lo.lo, block.span.hi, self.mk_expr(lo, block.span.hi,
self.mk_method_call(f, i, copy *tps, ~[last_arg], sugar)) self.mk_method_call(f, i, copy *tps, ~[last_arg], sugar))
} }
expr_path(*) | expr_call(*) | expr_method_call(*) | expr_path(*) | expr_call(*) | expr_method_call(*) |
@ -2309,7 +2308,7 @@ impl Parser {
let last_arg = self.mk_expr(block.span.lo, block.span.hi, let last_arg = self.mk_expr(block.span.lo, block.span.hi,
ctor(block)); ctor(block));
self.mk_expr( self.mk_expr(
lo.lo, lo,
last_arg.span.hi, last_arg.span.hi,
self.mk_call(e, ~[last_arg], sugar)) self.mk_call(e, ~[last_arg], sugar))
} }
@ -2319,7 +2318,7 @@ impl Parser {
// but they aren't represented by tests // but they aren't represented by tests
debug!("sugary call on %?", e.node); debug!("sugary call on %?", e.node);
self.span_fatal( self.span_fatal(
*lo, e.span,
fmt!("`%s` must be followed by a block call", keyword)); fmt!("`%s` must be followed by a block call", keyword));
} }
} }