[svn:parrot] r45071 - branches/pcc_hackathon_6Mar10/src/ops

[chromatic at svn.parrot.org]

Author: chromatic
Date: Sun Mar 21 01:00:35 2010
New Revision: 45071
URL: https://trac.parrot.org/parrot/changeset/45071

Log:
[ops] Tidied code; no functional changes.

Modified:
   branches/pcc_hackathon_6Mar10/src/ops/core.ops

Modified: branches/pcc_hackathon_6Mar10/src/ops/core.ops
==============================================================================
--- branches/pcc_hackathon_6Mar10/src/ops/core.ops	Fri Mar 19 23:17:25 2010	(r45070)
+++ branches/pcc_hackathon_6Mar10/src/ops/core.ops	Sun Mar 21 01:00:35 2010	(r45071)
@@ -512,16 +512,11 @@
 op set_returns(inconst PMC) :flow {
     opcode_t * const raw_args  = CUR_OPCODE;
     PMC      * const signature = $1;
-    PMC      *       call_sig;
-    INTVAL argc;
-
-    /* don't let PCC unshift the invocant into the returns */
-    interp->current_object = PMCNULL;
-
-    call_sig = Parrot_pcc_build_sig_object_from_op(interp,
-            Parrot_pcc_get_signature(interp,
+    PMC      *       call_sig  = Parrot_pcc_build_sig_object_from_op(interp,
+                Parrot_pcc_get_signature(interp,
                 Parrot_pcc_get_caller_ctx(interp, CURRENT_CONTEXT(interp))),
-            signature, raw_args);
+                    signature, raw_args);
+    INTVAL argc;
 
     Parrot_pcc_set_signature(interp, CURRENT_CONTEXT(interp), call_sig);
 
@@ -530,16 +525,13 @@
 }
 
 op get_results(inconst PMC) :flow {
-    opcode_t * const raw_params = CUR_OPCODE;
-    PMC *caller_ctx, *ctx;
-    PMC *ccont, *call_object;
-    PMC * const signature = $1;
-    INTVAL argc;
-
-    ctx     = CURRENT_CONTEXT(interp);
-    ccont   = Parrot_pcc_get_continuation(interp, ctx);
+    opcode_t * const raw_params  = CUR_OPCODE;
+    PMC      * const signature   = $1;
+    PMC             *ctx         = CURRENT_CONTEXT(interp);
+    PMC             *ccont       = Parrot_pcc_get_continuation(interp, ctx);
+    PMC             *call_object = Parrot_pcc_get_signature(interp, ctx);
 
-    call_object = Parrot_pcc_get_signature(interp, ctx);
+    INTVAL argc;
 
     Parrot_pcc_fill_params_from_op(interp, call_object, signature, raw_params,
             PARROT_ERRORS_RESULT_COUNT_FLAG);