From 55fbed3d8d7078bfd3864e64cc044cbe876c5d1a Mon Sep 17 00:00:00 2001 From: Lindsey Kuper Date: Tue, 29 Mar 2011 15:51:53 -0700 Subject: Beginnings of support for magical self prefix; nothing profound happening yet. --- src/comp/middle/ty.rs | 1 + src/comp/middle/typeck.rs | 7 +++++++ 2 files changed, 8 insertions(+) (limited to 'src/comp/middle') diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs index f9822d97..d1d7c5e3 100644 --- a/src/comp/middle/ty.rs +++ b/src/comp/middle/ty.rs @@ -757,6 +757,7 @@ fn expr_ty(@ast.expr expr) -> @t { case (ast.expr_rec(_, _, ?ann)) { ret ann_to_type(ann); } case (ast.expr_bind(_, _, ?ann)) { ret ann_to_type(ann); } case (ast.expr_call(_, _, ?ann)) { ret ann_to_type(ann); } + case (ast.expr_call_self(_, _, ?ann)) { ret ann_to_type(ann); } case (ast.expr_spawn(_, _, _, _, ?ann)) { ret ann_to_type(ann); } case (ast.expr_binary(_, _, _, ?ann)) { ret ann_to_type(ann); } diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index cdb61cbd..daab4b49 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -1312,6 +1312,13 @@ fn demand_expr_full(&@fn_ctxt fcx, @ty.t expected, @ast.expr e, ann_to_type(ann), adk); e_1 = ast.expr_call(sube, es, ast.ann_type(t, none[vec[@ty.t]])); } + case (ast.expr_call_self(?sube, ?es, ?ann)) { + auto t = demand_full(fcx, e.span, expected, + ann_to_type(ann), adk); + e_1 = ast.expr_call_self(sube, + es, + ast.ann_type(t, none[vec[@ty.t]])); + } case (ast.expr_binary(?bop, ?lhs, ?rhs, ?ann)) { auto t = demand(fcx, e.span, expected, ann_to_type(ann)); e_1 = ast.expr_binary(bop, lhs, rhs, -- cgit v1.2.3