[svn:parrot] r49104 - in branches/gc_massacre: . src/pmc

[bacek at svn.parrot.org]

Author: bacek
Date: Fri Sep 17 23:47:06 2010
New Revision: 49104
URL: https://trac.parrot.org/parrot/changeset/49104

Log:
Per discussion with pmichaud et. al., only the 'die' needs to be handled via deprecation cycle.  Duplicated vtable functions can be eliminated now.

Modified:
   branches/gc_massacre/DEPRECATED.pod
   branches/gc_massacre/src/pmc/oplib.pmc
   branches/gc_massacre/src/pmc/resizablestringarray.pmc

Modified: branches/gc_massacre/DEPRECATED.pod
==============================================================================
--- branches/gc_massacre/DEPRECATED.pod	Fri Sep 17 23:46:50 2010	(r49103)
+++ branches/gc_massacre/DEPRECATED.pod	Fri Sep 17 23:47:06 2010	(r49104)
@@ -140,11 +140,11 @@
 
 L<https://trac.parrot.org/parrot/ticket/1564>
 
-=item Duplicated VTABLE functions [eligible in 2.10]
+=item Behavior of Parrot::Pmc2c::PMC::add_method() [eligible in 2.10]
 
-In F<src/pmc/oplib.pmc>, C<INTVAL get_integer()> is declared twice.
-
-In F<src/pmc/resizablestringarray.pmc>, C<PMC *shift_pmc()> is declared twice.
+Duplicated vtable functions currently generate only a warning; after deadline,
+they will cause a C<die> and failure to build Parrot or any HLL
+using this method.
 
 L<http://trac.parrot.org/parrot/ticket/1785>
 

Modified: branches/gc_massacre/src/pmc/oplib.pmc
==============================================================================
--- branches/gc_massacre/src/pmc/oplib.pmc	Fri Sep 17 23:46:50 2010	(r49103)
+++ branches/gc_massacre/src/pmc/oplib.pmc	Fri Sep 17 23:47:06 2010	(r49104)
@@ -116,10 +116,6 @@
         return STATICSELF.elements();
     }
 
-    VTABLE INTVAL get_integer() {
-        return STATICSELF.elements();
-    }
-
     METHOD op_family(STRING *shortname)
     {
         char * const sname = Parrot_str_to_cstring(INTERP, shortname);

Modified: branches/gc_massacre/src/pmc/resizablestringarray.pmc
==============================================================================
--- branches/gc_massacre/src/pmc/resizablestringarray.pmc	Fri Sep 17 23:46:50 2010	(r49103)
+++ branches/gc_massacre/src/pmc/resizablestringarray.pmc	Fri Sep 17 23:47:06 2010	(r49104)
@@ -302,25 +302,6 @@
 
 /*
 
-=item C<PMC *shift_pmc()>
-
-Removes and returns the first element in the array.
-
-=cut
-
-*/
-
-    VTABLE PMC *shift_pmc() {
-        STRING * const strval = SELF.shift_string();
-        PMC    * const value  = Parrot_pmc_new(INTERP, enum_class_String);
-
-        VTABLE_set_string_native(INTERP, value, strval);
-
-        return value;
-    }
-
-/*
-
 =item C<INTVAL shift_integer()>
 
 Removes and returns the first element in the array.