From 213e863cc9c5350fb697fc884a6140a4527a86be Mon Sep 17 00:00:00 2001 From: Lindsey Kuper Date: Wed, 30 Mar 2011 16:27:37 -0700 Subject: [PATCH 1/3] More machinery for adding an expr_call_self AST node. --- src/comp/middle/fold.rs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/comp/middle/fold.rs b/src/comp/middle/fold.rs index 0b1a01ad6b42f..0c25052c8e901 100644 --- a/src/comp/middle/fold.rs +++ b/src/comp/middle/fold.rs @@ -1,5 +1,5 @@ import std.map.hashmap; - import std.option; +import std.option; import std.option.some; import std.option.none; @@ -87,6 +87,10 @@ type ast_fold[ENV] = @expr f, vec[@expr] args, ann a) -> @expr) fold_expr_call, + (fn(&ENV e, &span sp, + @expr f, vec[@expr] args, + ann a) -> @expr) fold_expr_call_self, + (fn(&ENV e, &span sp, @expr f, vec[option.t[@expr]] args, ann a) -> @expr) fold_expr_bind, @@ -562,6 +566,12 @@ fn fold_expr[ENV](&ENV env, ast_fold[ENV] fld, &@expr e) -> @expr { ret fld.fold_expr_call(env_, e.span, ff, aargs, t); } + case (ast.expr_call_self(?f, ?args, ?t)) { + auto ff = fold_expr(env_, fld, f); + auto aargs = fold_exprs(env_, fld, args); + ret fld.fold_expr_call_self(env_, e.span, ff, aargs, t); + } + case (ast.expr_bind(?f, ?args_opt, ?t)) { auto ff = fold_expr(env_, fld, f); let vec[option.t[@ast.expr]] aargs_opt = vec(); @@ -1175,6 +1185,11 @@ fn identity_fold_expr_call[ENV](&ENV env, &span sp, @expr f, ret @respan(sp, ast.expr_call(f, args, a)); } +fn identity_fold_expr_call_self[ENV](&ENV env, &span sp, @expr f, + vec[@expr] args, ann a) -> @expr { + ret @respan(sp, ast.expr_call_self(f, args, a)); +} + fn identity_fold_expr_bind[ENV](&ENV env, &span sp, @expr f, vec[option.t[@expr]] args_opt, ann a) -> @expr { @@ -1580,6 +1595,8 @@ fn new_identity_fold[ENV]() -> ast_fold[ENV] { fold_expr_tup = bind identity_fold_expr_tup[ENV](_,_,_,_), fold_expr_rec = bind identity_fold_expr_rec[ENV](_,_,_,_,_), fold_expr_call = bind identity_fold_expr_call[ENV](_,_,_,_,_), + fold_expr_call_self + = bind identity_fold_expr_call_self[ENV](_,_,_,_,_), fold_expr_bind = bind identity_fold_expr_bind[ENV](_,_,_,_,_), fold_expr_spawn = bind identity_fold_expr_spawn[ENV](_,_,_,_,_,_,_), fold_expr_binary = bind identity_fold_expr_binary[ENV](_,_,_,_,_,_), From 06be16f019a381304b20824710bf13c5cd012f20 Mon Sep 17 00:00:00 2001 From: Lindsey Kuper Date: Thu, 31 Mar 2011 11:26:25 -0700 Subject: [PATCH 2/3] More stuff to go with the new expr_call_self AST node --- src/comp/middle/trans.rs | 68 +++++++++++++++++++++++++++++++++++++++ src/comp/pretty/pprust.rs | 7 ++++ 2 files changed, 75 insertions(+) diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index ceb15f71f2e18..38aff67bc9263 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -4444,6 +4444,70 @@ fn trans_call(@block_ctxt cx, @ast.expr f, ret res(bcx, retval); } +fn trans_call_self(@block_ctxt cx, @ast.expr f, + option.t[ValueRef] lliterbody, + vec[@ast.expr] args, + &ast.ann ann) -> result { + log "translating a self-call"; + + auto f_res = trans_lval(cx, f); + auto faddr = f_res.res.val; + auto llenv = C_null(T_opaque_closure_ptr(cx.fcx.ccx.tn)); + + alt (f_res.llobj) { + case (some[ValueRef](_)) { + // It's a vtbl entry. + faddr = f_res.res.bcx.build.Load(faddr); + } + case (none[ValueRef]) { + // It's a closure. + auto bcx = f_res.res.bcx; + auto pair = faddr; + faddr = bcx.build.GEP(pair, vec(C_int(0), + C_int(abi.fn_field_code))); + faddr = bcx.build.Load(faddr); + + auto llclosure = bcx.build.GEP(pair, + vec(C_int(0), + C_int(abi.fn_field_box))); + llenv = bcx.build.Load(llclosure); + } + } + auto fn_ty = ty.expr_ty(f); + auto ret_ty = ty.ann_to_type(ann); + auto args_res = trans_args(f_res.res.bcx, + llenv, f_res.llobj, + f_res.generic, + lliterbody, + args, fn_ty); + + auto bcx = args_res._0; + auto llargs = args_res._1; + auto llretslot = args_res._2; + + /* + log "calling: " + val_str(cx.fcx.ccx.tn, faddr); + + for (ValueRef arg in llargs) { + log "arg: " + val_str(cx.fcx.ccx.tn, arg); + } + */ + + bcx.build.FastCall(faddr, llargs); + auto retval = C_nil(); + + if (!ty.type_is_nil(ret_ty)) { + retval = load_scalar_or_boxed(bcx, llretslot, ret_ty); + // Retval doesn't correspond to anything really tangible in the frame, + // but it's a ref all the same, so we put a note here to drop it when + // we're done in this scope. + find_scope_cx(cx).cleanups += + vec(clean(bind drop_ty(_, retval, ret_ty))); + } + + ret res(bcx, retval); +} + fn trans_tup(@block_ctxt cx, vec[ast.elt] elts, &ast.ann ann) -> result { auto bcx = cx; @@ -4680,6 +4744,10 @@ fn trans_expr(@block_ctxt cx, @ast.expr e) -> result { ret trans_call(cx, f, none[ValueRef], args, ann); } + case (ast.expr_call_self(?f, ?args, ?ann)) { + ret trans_call_self(cx, f, none[ValueRef], args, ann); + } + case (ast.expr_cast(?e, _, ?ann)) { ret trans_cast(cx, e, ann); } diff --git a/src/comp/pretty/pprust.rs b/src/comp/pretty/pprust.rs index 0007cfd5f9e32..49964753d1a9b 100644 --- a/src/comp/pretty/pprust.rs +++ b/src/comp/pretty/pprust.rs @@ -431,6 +431,13 @@ impure fn print_expr(ps s, &@ast.expr expr) { commasep_exprs(s, args); pclose(s); } + case (ast.expr_call_self(?func,?args,_)) { + wrd(s, "self."); + print_expr(s, func); + popen(s); + commasep_exprs(s, args); + pclose(s); + } case (ast.expr_bind(?func,?args,_)) { impure fn print_opt(ps s, &option.t[@ast.expr] expr) { alt (expr) { From 7134e0558b6ad6ecb0bb97369c0cda90d75c61ad Mon Sep 17 00:00:00 2001 From: Lindsey Kuper Date: Thu, 31 Mar 2011 11:48:50 -0700 Subject: [PATCH 3/3] Oops, guess I made a mistake resolving conflicts in the pretty-printer. --- src/comp/pretty/pprust.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/comp/pretty/pprust.rs b/src/comp/pretty/pprust.rs index 49964753d1a9b..2d17696be88be 100644 --- a/src/comp/pretty/pprust.rs +++ b/src/comp/pretty/pprust.rs @@ -432,7 +432,7 @@ impure fn print_expr(ps s, &@ast.expr expr) { pclose(s); } case (ast.expr_call_self(?func,?args,_)) { - wrd(s, "self."); + wrd(s.s, "self."); print_expr(s, func); popen(s); commasep_exprs(s, args);