Fix init of typed variables; my Monkey $martin .= new; now works again.

rakudo · Feb 4, 2010 · 7b0a0ba · 7b0a0ba
1 parent 17dd439
commit 7b0a0ba
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -715,13 +715,14 @@ sub declare_variable($/, $past, $sigil, $twigil, $desigilname, $trait_list) {
 
         # If we have traits, set up us the node to emit handlers into, then
         # emit them.
+        my $init_type := 0;
         if $trait_list || $*TYPENAME {
             my $trait_node := get_var_traits_node($BLOCK, $name);
             for $trait_list {
                 my $trait := $_.ast;
                 $trait.unshift(PAST::Var.new( :name('declarand'), :scope('register') ));
                 if $trait.name() eq '&trait_mod:<of>' && $*TYPENAME {
-                    $trait[1] := PAST::Op.new(
+                    $init_type := $trait[1] := PAST::Op.new(
                         :pasttype('callmethod'), :name('postcircumfix:<[ ]>'),
                         $*TYPENAME, $trait[1]
                     );
@@ -735,8 +736,15 @@ sub declare_variable($/, $past, $sigil, $twigil, $desigilname, $trait_list) {
                     PAST::Var.new( :name('declarand'), :scope('register') ),
                     $*TYPENAME
                 ));
+                $init_type := $*TYPENAME;
             }
         }
+
+        # If we've a type to init with and it's a scalar, do so.
+        if $init_type && $sigil eq '$' {
+            $cont.pirop('new PsP');
+            $cont.push($init_type);
+        }
     }
 
     return $past;