let ds: [deref] = [], ex = ex;
while true {
alt copy ex.node {
- expr_field(base, ident) {
+ expr_field(base, ident, _) {
let auto_unbox = maybe_auto_unbox(tcx, ty::expr_ty(tcx, base));
let is_mut = false;
alt ty::struct(tcx, auto_unbox.t) {
fn resolve_impl_in_expr(e: @env, x: @ast::expr, sc: iscopes, v: vt<iscopes>) {
alt x.node {
- ast::expr_field(_, _) { e.impl_map.insert(x.id, sc); }
+ ast::expr_field(_, _, _) { e.impl_map.insert(x.id, sc); }
_ {}
}
visit::visit_expr(x, sc, v);
fn trans_callee(bcx: @block_ctxt, e: @ast::expr) -> lval_maybe_callee {
alt e.node {
ast::expr_path(p) { ret trans_path(bcx, p, e.id); }
- ast::expr_field(base, ident) {
+ ast::expr_field(base, ident, _) {
// Lval means this is a record field, so not a method
if !expr_is_lval(bcx, e) {
alt bcx_ccx(bcx).method_map.find(e.id) {
let v = trans_path(cx, p, e.id);
ret lval_maybe_callee_to_lval(v, ty::expr_ty(bcx_tcx(cx), e));
}
- ast::expr_field(base, ident) {
+ ast::expr_field(base, ident, _) {
ret trans_rec_field(cx, base, ident);
}
ast::expr_index(base, idx) {
ast::expr_call(f, args, _) {
ret trans_call(bcx, f, args, e.id, dest);
}
- ast::expr_field(_, _) {
+ ast::expr_field(_, _, _) {
fail "Taking the value of a method does not work yet (issue #435)";
}
set_pre_and_post(fcx.ccx, e.id, alts_overall_pp.precondition,
alts_overall_pp.postcondition);
}
- expr_field(operator, _) {
+ expr_field(operator, _, _) {
find_pre_post_expr(fcx, operator);
copy_pre_post(fcx.ccx, e.id, operator);
}
}
ret changed | set_poststate_ann(fcx.ccx, e.id, a_post);
}
- expr_field(val, _) {
+ expr_field(val, _, _) {
ret find_pre_post_state_sub(fcx, pres, val, e.id, none);
}
expr_unary(_, operand) {
alt e.node {
ast::expr_path(_) | ast::expr_index(_, _) |
ast::expr_unary(ast::deref., _) { true }
- ast::expr_field(base, ident) {
+ ast::expr_field(base, ident, _) {
method_map.contains_key(e.id) ? false : {
let basety = type_autoderef(tcx, expr_ty(tcx, base));
alt struct(tcx, basety) {
}
}
}
- ast::expr_field(base, field) {
+ ast::expr_field(base, field, tys) {
bot |= check_expr(fcx, base);
let expr_t = expr_ty(tcx, base);
let base_t = do_autoderef(fcx, expr.span, expr_t);
- let handled = false;
+ let handled = false, n_tys = vec::len(tys);
alt structure_of(fcx, expr.span, base_t) {
ty::ty_rec(fields) {
alt ty::field_idx(field, fields) {
some(ix) {
+ if n_tys > 0u {
+ tcx.sess.span_err(expr.span,
+ "can't provide type parameters \
+ to a field access");
+ }
write::ty_only_fixup(fcx, id, fields[ix].mt.ty);
handled = true;
}
ty::ty_obj(methods) {
alt ty::method_idx(field, methods) {
some(ix) {
+ if n_tys > 0u {
+ tcx.sess.span_err(expr.span,
+ "can't provide type parameters \
+ to an obj method");
+ }
let meth = methods[ix];
let t = ty::mk_fn(tcx, meth.proto, meth.inputs,
meth.output, meth.cf, meth.constrs);
fty, method.n_tps);
ids += b.ids;
fty = b.ty;
+ if n_tys > 0u {
+ if n_tys != method.n_tps {
+ tcx.sess.span_fatal
+ (expr.span, "incorrect number of type \
+ parameters given for this method");
+
+ }
+ let i = 0u;
+ for ty in tys {
+ let tvar = ty::mk_var(fcx.ccx.tcx, b.ids[i]);
+ let t_subst = ast_ty_to_ty_crate(fcx.ccx, ty);
+ demand::simple(fcx, expr.span, tvar, t_subst);
+ i += 1u;
+ }
+ }
+ } else if n_tys > 0u {
+ tcx.sess.span_fatal(expr.span,
+ "this method does not take type \
+ parameters");
}
let substs = vec::map(ids, {|id| ty::mk_var(tcx, id)});
write::ty_fixup(fcx, id, {substs: some(substs), ty: fty});
expr_assign(@expr, @expr);
expr_swap(@expr, @expr);
expr_assign_op(binop, @expr, @expr);
- expr_field(@expr, ident);
+ expr_field(@expr, ident, [@ty]);
expr_index(@expr, @expr);
expr_path(@path);
expr_fail(option::t<@expr>);
expr_assign_op(op, el, er) {
expr_assign_op(op, fld.fold_expr(el), fld.fold_expr(er))
}
- expr_field(el, id) {
- expr_field(fld.fold_expr(el), fld.fold_ident(id))
+ expr_field(el, id, tys) {
+ expr_field(fld.fold_expr(el), fld.fold_ident(id),
+ vec::map(tys, fld.fold_ty))
}
expr_index(el, er) {
expr_index(fld.fold_expr(el), fld.fold_expr(er))
token::IDENT(i, _) {
hi = p.get_hi_pos();
p.bump();
- e = mk_expr(p, lo, hi, ast::expr_field(e, p.get_str(i)));
+ let tys = if eat(p, token::MOD_SEP) {
+ expect(p, token::LT);
+ parse_seq_to_gt(some(token::COMMA),
+ {|p| parse_ty(p, false)}, p)
+ } else { [] };
+ e = mk_expr(p, lo, hi, ast::expr_field(e, p.get_str(i), tys));
}
t { unexpected(p, t); }
}
word_space(s, "=");
print_expr(s, rhs);
}
- ast::expr_field(expr, id) {
+ ast::expr_field(expr, id, tys) {
// Deal with '10.x'
if ends_in_lit_int(expr) {
popen(s); print_expr(s, expr); pclose(s);
}
word(s.s, ".");
word(s.s, id);
+ if vec::len(tys) > 0u {
+ word(s.s, "::<");
+ commasep(s, inconsistent, tys, print_type);
+ word(s.s, ">");
+ }
}
ast::expr_index(expr, index) {
print_expr_parens_if_not_bot(s, expr);
v.visit_expr(b, e, v);
v.visit_expr(a, e, v);
}
- expr_field(x, _) { v.visit_expr(x, e, v); }
+ expr_field(x, _, tys) {
+ v.visit_expr(x, e, v);
+ for tp in tys { v.visit_ty(tp, e, v); }
+ }
expr_index(a, b) { v.visit_expr(a, e, v); v.visit_expr(b, e, v); }
expr_path(p) { visit_path(p, e, v); }
expr_fail(eo) { visit_expr_opt(eo, e, v); }
assert [1].len().str() == "1";
assert [3, 4].map({|a| a + 4})[0] == 7;
+ assert [3, 4].map::<uint>({|a| a as uint + 4u})[0] == 7u;
let x = 0u;
10u.times {|_n| x += 2u;}
assert x == 20u;