First pass at getting variable traits in place.

rakudo · Jul 25, 2013 · 4766065 · 4766065
1 parent b54c12b
commit 4766065
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -2016,7 +2016,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
             if $desigilname eq '' {
                 $name := QAST::Node.unique('ANON_VAR_');
             }
-            $*W.install_lexical_container($BLOCK, $name, %cont_info, $descriptor,
+            my $cont := $*W.install_lexical_container($BLOCK, $name, %cont_info, $descriptor,
                 :scope($*SCOPE), :package($*PACKAGE));
 
             # Set scope and type on container, and if needed emit code to
@@ -2052,6 +2052,20 @@ class Perl6::Actions is HLL::Actions does STDActions {
                     scope  => $*SCOPE,
                 );
             }
+
+            # Apply any traits.
+            if $trait_list {
+                my $Variable := $*W.find_symbol(['Variable']);
+                my $varvar   := nqp::create($Variable);
+                nqp::bindattr_s($varvar, $Variable, '$!name', $name);
+                nqp::bindattr_s($varvar, $Variable, '$!scope', $*SCOPE);
+                nqp::bindattr($varvar, $Variable, '$!var', $cont);
+                nqp::bindattr($varvar, $Variable, '$!block', $*DECLARAND);
+                for $trait_list {
+                    my $applier := $_.ast;
+                    if $applier { $applier($varvar); }
+                }
+            }
         }
         else {
             $*W.throw($/, 'X::Comp::NYI',

diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -605,7 +605,7 @@ class Perl6::World is HLL::World {
                     QAST::Var.new( :scope('lexical'), :name($name) ),
                     QAST::SVal.new( :value('') ) ))
             }
-            return 1;
+            return nqp::null();
         }
 
         # Build container.
@@ -622,6 +622,9 @@ class Perl6::World is HLL::World {
         # Tweak var to have container.
         $var.value($cont);
         $var.decl($scope eq 'state' ?? 'statevar' !! 'contvar');
+
+        # Evaluate to the container.
+        $cont
     }
 
     # Creates a new container descriptor and adds it to the SC.

diff --git a/src/core/Variable.pm b/src/core/Variable.pm
@@ -0,0 +1,6 @@
+my class Variable {
+    has str $.name;
+    has str $.scope;
+    has $.var is rw;
+    has $.block;
+}
diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
@@ -117,6 +117,7 @@ CORE_SOURCES = \
   src/core/WhateverCode.pm \
   src/core/Block.pm \
   src/core/Attribute.pm \
+  src/core/Variable.pm \
   src/core/Routine.pm \
   src/core/Sub.pm \
   src/core/Macro.pm \

diff --git a/tools/build/Makefile-Parrot.in b/tools/build/Makefile-Parrot.in
@@ -162,6 +162,7 @@ CORE_SOURCES = \
   src/core/WhateverCode.pm \
   src/core/Block.pm \
   src/core/Attribute.pm \
+  src/core/Variable.pm \
   src/core/Routine.pm \
   src/core/Sub.pm \
   src/core/Macro.pm \