[svn:parrot] r42858 - branches/cs_csr_merge/src/pmc

[bacek at svn.parrot.org]

Author: bacek
Date: Wed Dec  2 10:03:16 2009
New Revision: 42858
URL: https://trac.parrot.org/parrot/changeset/42858

Log:
Remove old results storage from CallSignature

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

Modified: branches/cs_csr_merge/src/pmc/callsignature.pmc
==============================================================================
--- branches/cs_csr_merge/src/pmc/callsignature.pmc	Wed Dec  2 10:02:47 2009	(r42857)
+++ branches/cs_csr_merge/src/pmc/callsignature.pmc	Wed Dec  2 10:03:16 2009	(r42858)
@@ -360,7 +360,6 @@
 
 pmclass CallSignature auto_attrs provides array provides hash {
     ATTR struct Pcc_cell *positionals; /* linked list of positionals */
-    ATTR PMC    *results;              /* Storage for return arguments */
     ATTR PMC    *type_tuple;           /* Cached argument types for MDD */
     ATTR STRING *short_sig;            /* Simple string sig args & returns */
     ATTR PMC    *arg_flags;            /* Integer array of argument flags */
@@ -387,7 +386,6 @@
             PMC_data_typed(SELF, Parrot_CallSignature_attributes *);
         SUPER();
         attrs->type_tuple      = PMCNULL;
-        attrs->results         = PMCNULL;
         attrs->positionals     = NULL;
         attrs->num_positionals = 0;
         PObj_custom_mark_destroy_SETALL(SELF);
@@ -407,7 +405,6 @@
         if (!attrs)
             return;
 
-        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);
@@ -593,13 +590,7 @@
 
     VTABLE void set_attr_str(STRING *key, PMC *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"))) {
+        if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "arg_flags"))) {
             SET_ATTR_arg_flags(interp, SELF, value);
         }
         else if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "return_flags"))) {
@@ -650,12 +641,6 @@
         if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "named"))) {
             value = get_named_names(INTERP, SELF);
         }
-        else 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);
         }
@@ -1237,8 +1222,10 @@
             APPEND_CELL(dest, cloned_cell);
         }
 
+        /* FIXME
         if (!PMC_IS_NULL(sig->results))
             dest_sig->results = VTABLE_clone(INTERP, sig->results);
+        */
 
         if (!PMC_IS_NULL(sig->type_tuple))
             dest_sig->type_tuple = VTABLE_clone(INTERP, sig->type_tuple);