bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

syntax: move callee_id into the expr_ variants

Browse source
This commit is contained in:
Erick Tryzelaar 2013-06-01 15:31:56 -07:00
parent 871684376f
commit 23808efd11
40 changed files with 337 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -926,7 +926,7 @@ impl Parser {
if minus_present {
let minus_hi = self.span.hi;
self.mk_expr(minus_lo, minus_hi, expr_unary(neg, expr))
self.mk_expr(minus_lo, minus_hi, self.mk_unary(neg, expr))
} else {
expr
}
@ -1168,16 +1168,47 @@ impl Parser {
pub fn mk_expr(&self, lo: BytePos, hi: BytePos, node: expr_) -> @expr {
@expr {
id: self.get_id(),
callee_id: self.get_id(),
node: node,
span: mk_sp(lo, hi),
}
}
pub fn mk_unary(&self, unop: ast::unop, expr: @expr) -> ast::expr_ {
expr_unary(self.get_id(), unop, expr)
}
pub fn mk_binary(&self, binop: ast::binop, lhs: @expr, rhs: @expr) -> ast::expr_ {
expr_binary(self.get_id(), binop, lhs, rhs)
}
pub fn mk_call(&self, f: @expr, args: ~[@expr], sugar: CallSugar) -> ast::expr_ {
expr_call(f, args, sugar)
}
pub fn mk_method_call(&self,
rcvr: @expr,
ident: ident,
tps: ~[@Ty],
args: ~[@expr],
sugar: CallSugar) -> ast::expr_ {
expr_method_call(self.get_id(), rcvr, ident, tps, args, sugar)
}
pub fn mk_index(&self, expr: @expr, idx: @expr) -> ast::expr_ {
expr_index(self.get_id(), expr, idx)
}
pub fn mk_field(&self, expr: @expr, ident: ident, tys: ~[@Ty]) -> ast::expr_ {
expr_field(expr, ident, tys)
}
pub fn mk_assign_op(&self, binop: ast::binop, lhs: @expr, rhs: @expr) -> ast::expr_ {
expr_assign_op(self.get_id(), binop, lhs, rhs)
}
pub fn mk_mac_expr(&self, lo: BytePos, hi: BytePos, m: mac_) -> @expr {
@expr {
id: self.get_id(),
callee_id: self.get_id(),
node: expr_mac(codemap::spanned {node: m, span: mk_sp(lo, hi)}),
span: mk_sp(lo, hi),
}
@ -1192,7 +1223,6 @@ impl Parser {
@expr {
id: self.get_id(),
callee_id: self.get_id(),
node: expr_lit(lv_lit),
span: *span,
}
@ -1454,11 +1484,11 @@ impl Parser {
);
hi = self.span.hi;
let nd = expr_method_call(e, i, tys, es, NoSugar);
let nd = self.mk_method_call(e, i, tys, es, NoSugar);
e = self.mk_expr(lo, hi, nd);
}
_ => {
e = self.mk_expr(lo, hi, expr_field(e, i, tys));
e = self.mk_expr(lo, hi, self.mk_field(e, i, tys));
}
}
}
@ -1478,7 +1508,7 @@ impl Parser {
);
hi = self.span.hi;
let nd = expr_call(e, es, NoSugar);
let nd = self.mk_call(e, es, NoSugar);
e = self.mk_expr(lo, hi, nd);
}
@ -1488,7 +1518,7 @@ impl Parser {
let ix = self.parse_expr();
hi = ix.span.hi;
self.expect(&token::RBRACKET);
e = self.mk_expr(lo, hi, expr_index(e, ix));
e = self.mk_expr(lo, hi, self.mk_index(e, ix));
}
_ => return e
@ -1703,7 +1733,7 @@ impl Parser {
self.bump();
let e = self.parse_prefix_expr();
hi = e.span.hi;
ex = expr_unary(not, e);
ex = self.mk_unary(not, e);
}
token::BINOP(b) => {
match b {
@ -1711,13 +1741,13 @@ impl Parser {
self.bump();
let e = self.parse_prefix_expr();
hi = e.span.hi;
ex = expr_unary(neg, e);
ex = self.mk_unary(neg, e);
}
token::STAR => {
self.bump();
let e = self.parse_prefix_expr();
hi = e.span.hi;
ex = expr_unary(deref, e);
ex = self.mk_unary(deref, e);
}
token::AND => {
self.bump();
@ -1758,7 +1788,7 @@ impl Parser {
expr_vec(*) |
expr_lit(@codemap::spanned { node: lit_str(_), span: _}) |
expr_repeat(*) if m == m_imm => expr_vstore(e, expr_vstore_box),
_ => expr_unary(box(m), e)
_ => self.mk_unary(box(m), e)
};
}
token::TILDE => {
@ -1776,7 +1806,7 @@ impl Parser {
expr_lit(@codemap::spanned { node: lit_str(_), span: _}) |
expr_repeat(*)
if m == m_imm => expr_vstore(e, expr_vstore_uniq),
_ => expr_unary(uniq(m), e)
_ => self.mk_unary(uniq(m), e)
};
}
_ => return self.parse_dot_or_call_expr()
@ -1810,7 +1840,7 @@ impl Parser {
let expr = self.parse_prefix_expr();
let rhs = self.parse_more_binops(expr, cur_prec);
let bin = self.mk_expr(lhs.span.lo, rhs.span.hi,
expr_binary(cur_op, lhs, rhs));
self.mk_binary(cur_op, lhs, rhs));
self.parse_more_binops(bin, min_prec)
} else {
lhs
@ -1860,7 +1890,7 @@ impl Parser {
token::SHR => aop = shr
}
self.mk_expr(lo, rhs.span.hi,
expr_assign_op(aop, lhs, rhs))
self.mk_assign_op(aop, lhs, rhs))
}
token::LARROW => {
self.obsolete(*self.span, ObsoleteBinaryMove);
@ -1992,30 +2022,30 @@ impl Parser {
let args = vec::append(copy *args, [last_arg]);
self.mk_expr(lo.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 last_arg = self.mk_expr(block.span.lo, block.span.hi,
ctor(block));
let args = vec::append(copy *args, [last_arg]);
self.mk_expr(lo.lo, block.span.hi,
expr_method_call(f, i, copy *tps,
args, sugar))
self.mk_method_call(f, i, copy *tps, args, sugar))
}
expr_field(f, i, ref tps) => {
let block = self.parse_lambda_block_expr();
let last_arg = self.mk_expr(block.span.lo, block.span.hi,
ctor(block));
self.mk_expr(lo.lo, block.span.hi,
expr_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_paren(*) => {
let block = self.parse_lambda_block_expr();
let last_arg = self.mk_expr(block.span.lo, block.span.hi,
ctor(block));
self.mk_expr(lo.lo, last_arg.span.hi,
expr_call(e, ~[last_arg], sugar))
self.mk_expr(
lo.lo,
last_arg.span.hi,
self.mk_call(e, ~[last_arg], sugar))
}
_ => {
// There may be other types of expressions that can
@ -2274,7 +2304,6 @@ impl Parser {
}) => {
let vst = @expr {
id: self.get_id(),
callee_id: self.get_id(),
node: expr_vstore(e, expr_vstore_box),
span: mk_sp(lo, hi),
};
@ -2297,7 +2326,6 @@ impl Parser {
}) => {
let vst = @expr {
id: self.get_id(),
callee_id: self.get_id(),
node: expr_vstore(e, expr_vstore_uniq),
span: mk_sp(lo, hi),
};
@ -2320,7 +2348,6 @@ impl Parser {
}) => {
let vst = @expr {
id: self.get_id(),
callee_id: self.get_id(),
node: expr_vstore(e, expr_vstore_slice),
span: mk_sp(lo, hi)
};