[svn:parrot] r41792 - branches/pcc_reapply/src/pmc

[allison at svn.parrot.org]

Author: allison
Date: Sat Oct 10 10:56:10 2009
New Revision: 41792
URL: https://trac.parrot.org/parrot/changeset/41792

Log:
[pcc] A bit of internal renaming on the CallSignature (they're not "returns"
they're "results"), while preserving the external interface.

Modified:
   branches/pcc_reapply/src/pmc/callsignature.pmc

Modified: branches/pcc_reapply/src/pmc/callsignature.pmc
==============================================================================
--- branches/pcc_reapply/src/pmc/callsignature.pmc	Sat Oct 10 10:54:02 2009	(r41791)
+++ branches/pcc_reapply/src/pmc/callsignature.pmc	Sat Oct 10 10:56:10 2009	(r41792)
@@ -28,7 +28,7 @@
         PARROT_CAPTURE(obj)->hash = pmc_new((i), enum_class_Hash);
 
 pmclass CallSignature extends Capture auto_attrs provides array provides hash {
-    ATTR PMC    *returns;      /* Storage for return arguments */
+    ATTR PMC    *results;      /* Storage for return arguments */
     ATTR PMC    *type_tuple;   /* Cached argument types for multiple dispatch */
     ATTR STRING *short_sig;    /* Simple string signature args & returns */
     ATTR PMC    *arg_flags;    /* Integer array of argument flags */
@@ -49,7 +49,7 @@
             (Parrot_CallSignature_attributes *) PMC_data(SELF);
         SUPER();
         sig_struct->type_tuple = PMCNULL;
-        sig_struct->returns    = PMCNULL;
+        sig_struct->results    = PMCNULL;
     }
 
 /*
@@ -130,7 +130,7 @@
 
 =over
 
-=item returns
+=item results
 
 Stores the return signature, an array of PMCs.
 
@@ -152,8 +152,11 @@
 
     VTABLE void set_attr_str(STRING *key, PMC *value) {
 
-        if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "returns"))) {
-            SET_ATTR_returns(interp, SELF, value);
+        if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "results"))) {
+            SET_ATTR_results(interp, SELF, value);
+        }
+        else if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "returns"))) {
+            SET_ATTR_results(interp, SELF, value);
         }
         else if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "arg_flags"))) {
             SET_ATTR_arg_flags(interp, SELF, value);
@@ -176,7 +179,7 @@
 
 =over
 
-=item returns
+=item results
 
 Retrieves the return signature, an array of PMCs.
 
@@ -203,8 +206,11 @@
     VTABLE PMC *get_attr_str(STRING *key) {
         PMC *value = PMCNULL;
 
-        if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "returns"))) {
-            GET_ATTR_returns(interp, SELF, value);
+        if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "results"))) {
+            GET_ATTR_results(interp, SELF, value);
+        }
+        else if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "returns"))) {
+            GET_ATTR_results(interp, SELF, value);
         }
         else if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "arg_flags"))) {
             GET_ATTR_arg_flags(interp, SELF, value);
@@ -239,7 +245,7 @@
         if (!attrs)
             return;
 
-        Parrot_gc_mark_PMC_alive(interp, attrs->returns);
+        Parrot_gc_mark_PMC_alive(interp, attrs->results);
         Parrot_gc_mark_PMC_alive(interp, attrs->type_tuple);
         Parrot_gc_mark_STRING_alive(interp, attrs->short_sig);
         Parrot_gc_mark_PMC_alive(interp, attrs->arg_flags);