[svn:parrot] r43109 - in branches/context_unify3: src src/pmc t/op

whiteknight at svn.parrot.org whiteknight at svn.parrot.org
Wed Dec 16 16:28:50 UTC 2009


Author: whiteknight
Date: Wed Dec 16 16:28:48 2009
New Revision: 43109
URL: https://trac.parrot.org/parrot/changeset/43109

Log:
t/op/cc_params.t was looking for CallSignature, which doesn't exit. Replace references with CallContext and things work normally

Modified:
   branches/context_unify3/src/debug.c
   branches/context_unify3/src/pmc/object.pmc
   branches/context_unify3/t/op/cc_params.t

Modified: branches/context_unify3/src/debug.c
==============================================================================
--- branches/context_unify3/src/debug.c	Wed Dec 16 15:37:20 2009	(r43108)
+++ branches/context_unify3/src/debug.c	Wed Dec 16 16:28:48 2009	(r43109)
@@ -3510,7 +3510,7 @@
     PMC *sub = interpinfo_p(interp, CURRENT_SUB);
     PMC *ctx = CURRENT_CONTEXT(interp);
 
-    if (!PMC_IS_NULL(sub)) {
+    //if (!PMC_IS_NULL(sub)) {
         str = Parrot_Context_infostr(interp, ctx);
         if (str) {
             Parrot_io_eprintf(interp, "%Ss", str);
@@ -3531,7 +3531,7 @@
             }
             Parrot_io_eprintf(interp, "\n");
         }
-    }
+    //}
 
     /* backtrace: follow the continuation chain */
     while (1) {

Modified: branches/context_unify3/src/pmc/object.pmc
==============================================================================
--- branches/context_unify3/src/pmc/object.pmc	Wed Dec 16 15:37:20 2009	(r43108)
+++ branches/context_unify3/src/pmc/object.pmc	Wed Dec 16 16:28:48 2009	(r43109)
@@ -659,7 +659,7 @@
                                                          meth_name);
             if (!PMC_IS_NULL(meth)) {
                 /* Experimental code. See DEPRECATED.pod */
-                PMC *call_sig = Parrot_pcc_get_signature(interp, CURRENT_CONTEXT(interp));
+                PMC *call_sig = CURRENT_CONTEXT(interp);
                 if (PMC_IS_NULL(interp->current_object) &&
                         (VTABLE_elements(interp, call_sig) == 0 ||
                         VTABLE_get_pmc_keyed_int(interp, call_sig, 0) != SELF))

Modified: branches/context_unify3/t/op/cc_params.t
==============================================================================
--- branches/context_unify3/t/op/cc_params.t	Wed Dec 16 15:37:20 2009	(r43108)
+++ branches/context_unify3/t/op/cc_params.t	Wed Dec 16 16:28:48 2009	(r43109)
@@ -32,7 +32,7 @@
 .sub call_sig_with_no_args
     .param pmc sig :call_sig
     $S0 = typeof sig
-    is('CallSignature', $S0)
+    is('CallContext', $S0)
     $I0 = elements sig
     is(0, $I0)
 .end
@@ -40,7 +40,7 @@
 .sub call_sig_with_positionals
     .param pmc sig :call_sig
     $S0 = typeof sig
-    is('CallSignature', $S0)
+    is('CallContext', $S0)
     $I0 = elements sig
     is(3, $I0)
     $I1 = sig[0]
@@ -54,7 +54,7 @@
 .sub call_sig_with_named
     .param pmc sig :call_sig
     $S0 = typeof sig
-    is('CallSignature', $S0)
+    is('CallContext', $S0)
     $I0 = elements sig
     is(0, $I0)
     $I1 = sig["x"]
@@ -67,14 +67,14 @@
 .namespace ['OMGClass']
 .sub 'lolmethod' :method
     .param pmc sig :call_sig
-    
+
     # Self is set up correctly.
     $S0 = typeof self
     is('OMGClass', $S0)
 
     # Have call sig.
     $S0 = typeof sig
-    is('CallSignature', $S0)
+    is('CallContext', $S0)
 
     # First element is self.
     $P0 = sig[0]
@@ -88,14 +88,14 @@
 
 .sub 'wtfmethod' :method
     .param pmc sig :call_sig
-    
+
     # Self is set up correctly.
     $S0 = typeof self
     is('OMGClass', $S0)
 
     # Have call sig.
     $S0 = typeof sig
-    is('CallSignature', $S0)
+    is('CallContext', $S0)
 
     # First element is self.
     $P0 = sig[0]


More information about the parrot-commits mailing list