Fix stringification of protoobjects (RT #61486, #63908).

rakudo · Apr 28, 2009 · f5bbcad · f5bbcad
1 parent 2498093
commit f5bbcad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/build/PARROT_REVISION b/build/PARROT_REVISION
@@ -1 +1 @@
-38379
+38385
diff --git a/src/builtins/assign.pir b/src/builtins/assign.pir
@@ -25,6 +25,8 @@ src/builtins/assign.pir - assignments
 
     # This is a workaround because Parrot's multi-dispatch sometimes gets us
     # here by accident when we have a Perl6Array that got re-blessed.
+    $I0 = isa cont, 'Perl6Scalar'
+    if $I0 goto not_hash
     $I0 = isa cont, 'Perl6Array'
     unless $I0 goto not_array
     .tailcall cont.'!STORE'(source)

diff --git a/t/01-sanity/09-types.t b/t/01-sanity/09-types.t
@@ -20,8 +20,8 @@ $int = 14;
 
 # From http://www.rakudo.org/2008/06/mixins-generic-routines-and-en.html
 sub typeof(::T $x) { return T }
-(typeof(42) eq 'Int') && say 'ok 5';
-(typeof('42') eq 'Str') && say 'ok 6';
+(typeof(42) eq 'Int()') && say 'ok 5';
+(typeof('42') eq 'Str()') && say 'ok 6';
 
 # Stuff that goes crashy-crashy right now
 #$num = 0;