[svn:parrot] r33158 - in trunk: lib/Parrot src

[coke]

Author: coke
Date: Mon Nov 24 14:09:56 2008
New Revision: 33158

Modified:
   trunk/lib/Parrot/Vtable.pm
   trunk/src/oo.c

Log:
vtable slot names shouldn't have leading double underscore (RT #45965)


Modified: trunk/lib/Parrot/Vtable.pm
==============================================================================
--- trunk/lib/Parrot/Vtable.pm  (original)
+++ trunk/lib/Parrot/Vtable.pm  Mon Nov 24 14:09:56 2008
@@ -231,7 +231,7 @@
     for my $entry ( @{$vtable} ) {
         my $uc_meth = uc $entry->[1];
         $macros .= <<"EOM";
-#define PARROT_VTABLE_${uc_meth}_METHNAME \"__$entry->[1]\"
+#define PARROT_VTABLE_${uc_meth}_METHNAME \"$entry->[1]\"
 EOM
 
     }
@@ -266,7 +266,7 @@
         next if ( $entry->[4] =~ /MMD_/ );
         $num_vtable_funcs++;
         $macros .= <<"EOM";
-        \"__$entry->[1]\",
+        \"$entry->[1]\",
 EOM
     }
     $macros .= <<"EOM";
@@ -310,7 +310,7 @@
         next if ( $entry->[4] =~ /_STR$/ );
         next if ( $entry->[4] =~ /_FLOAT$/ );
         $macros .= <<"EOM";
-        \"__$entry->[1]\",
+        \"$entry->[1]\",
 EOM
     }
     $macros .= <<"EOM";

Modified: trunk/src/oo.c
==============================================================================
--- trunk/src/oo.c      (original)
+++ trunk/src/oo.c      Mon Nov 24 14:09:56 2008
@@ -382,8 +382,7 @@
         const INTVAL       mid    = (low + high) / 2;
         const char * const meth_c = Parrot_vtable_slot_names[mid];
 
-        /* RT #45965 slot_names still have __ in front */
-        const INTVAL cmp = strcmp(name_c, meth_c + 2);
+        const INTVAL cmp = strcmp(name_c, meth_c);
 
         if (cmp == 0) {
             string_cstring_free(name_c);