[svn:parrot] r44862 - in branches/tt389_fix: lib/Parrot/Pmc2c/PMC t/pmc

[whiteknight at svn.parrot.org]

Author: whiteknight
Date: Thu Mar 11 01:04:53 2010
New Revision: 44862
URL: https://trac.parrot.org/parrot/changeset/44862

Log:
[tt389_fix] I committed this to the wrong branch. undo.

Modified:
   branches/tt389_fix/lib/Parrot/Pmc2c/PMC/Object.pm
   branches/tt389_fix/t/pmc/complex.t
   branches/tt389_fix/t/pmc/integer.t

Modified: branches/tt389_fix/lib/Parrot/Pmc2c/PMC/Object.pm
==============================================================================
--- branches/tt389_fix/lib/Parrot/Pmc2c/PMC/Object.pm	Thu Mar 11 00:57:32 2010	(r44861)
+++ branches/tt389_fix/lib/Parrot/Pmc2c/PMC/Object.pm	Thu Mar 11 01:04:53 2010	(r44862)
@@ -70,11 +70,6 @@
             $pcc_return_stmt
         }
         /* method name is $vt_method_name */
-EOC
-
-        # Multiply dispatched math opcodes shouldn't be invoked on a proxy object.
-        unless ($self->vtable_method_does_multi($vt_method_name)) {
-            $method_body_text .= <<"EOC";
         if (cur_class->vtable->base_type == enum_class_PMCProxy) {
             /* Get the PMC instance and call the vtable method on that. */
             STRING * const proxy      = CONST_STRING_GEN(interp, "proxy");
@@ -86,7 +81,7 @@
             }
         }
 EOC
-        }
+        #}
 
         $method_body_text .= <<"EOC";
     }

Modified: branches/tt389_fix/t/pmc/complex.t
==============================================================================
--- branches/tt389_fix/t/pmc/complex.t	Thu Mar 11 00:57:32 2010	(r44861)
+++ branches/tt389_fix/t/pmc/complex.t	Thu Mar 11 01:04:53 2010	(r44862)
@@ -1190,7 +1190,7 @@
     $S0 = concat $S0, $S1
     $S0 = concat $S0, ' - subclassing Complex add returns 0+0i - TT #562'
     $I0 = not $I0    # invert $I0 so todo does not pass
-    ok( $I0, $S0 )
+    todo( $I0, $S0 )
 .end
 
 .namespace ['MyComplex']

Modified: branches/tt389_fix/t/pmc/integer.t
==============================================================================
--- branches/tt389_fix/t/pmc/integer.t	Thu Mar 11 00:57:32 2010	(r44861)
+++ branches/tt389_fix/t/pmc/integer.t	Thu Mar 11 01:04:53 2010	(r44862)
@@ -19,7 +19,7 @@
 .sub 'test' :main
     .include 'test_more.pir'
 
-    plan(64)
+    plan(62)
     test_init()
     test_basic_math()
     test_truthiness_and_definedness()
@@ -39,7 +39,6 @@
     test_get_as_base_bounds_check()
     test_cmp_subclass()
     test_cmp_RT59336()
-    test_hll_mmd_tt562()
 .end
 
 .sub test_init
@@ -416,25 +415,6 @@
 fin:
 .end
 
-.sub test_hll_mmd_tt562
-    # Test for issues described in TT #562, where subclasses of basic arithmetic
-    # types have troubles in MMD vtable operations
-    $P0 = subclass 'Integer', '562Integer'
-
-    $P0 = new 'Integer'
-    $P0 = 10
-    $P1 = sub $P0, 1
-    $I0 = $P1
-    is($I0, 9, "Integer MMD subtract")
-
-    $P0 = new 'FooInt'
-    $P0 = 10
-    $P1 = new '562Integer'
-    $P1 = sub $P0, 1
-    $I0 = $P1
-    is($I0, 9, "Integer subclass MMD subtract")
-.end
-
 # Local Variables:
 #   mode: cperl
 #   cperl-indent-level: 4