Initial stab at getting $~Vars to work

rakudo · Nov 13, 2014 · 93987f1 · 93987f1
1 parent 1d3d97f
commit 93987f1
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 1 deletion.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -1753,6 +1753,22 @@ class Perl6::Actions is HLL::Actions does STDActions {
             $past := add_placeholder_parameter($/, $sigil, $desigilname,
                                 :named($twigil eq ':'), :full_name($past.name()));
         }
+        elsif $twigil eq '~' {
+            my $actionsname := $desigilname ~ '-actions';
+            $past := QAST::Op.new(
+                :op<callmethod>, :name<new>, :returns($*W.find_symbol(['Slang'])),
+                QAST::Var.new( :name<Slang>, :scope<lexical> ));
+            if nqp::existskey(%*LANG, $desigilname) {
+                my $wval := QAST::WVal.new( :value(%*LANG{$desigilname}) );
+                $wval.named('grammar');
+                $past.push($wval);
+            }
+            if nqp::existskey(%*LANG, $actionsname) {
+                my $wval := QAST::WVal.new( :value(%*LANG{$actionsname}) );
+                $wval.named('actions');
+                $past.push($wval);
+            }
+        }
         elsif $past.name() eq '@_' {
             if $*W.nearest_signatured_block_declares('@_') {
                 $past.scope('lexical');

diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -2134,7 +2134,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
     token twigil:sym<*> { <sym> <?before \w> }
     token twigil:sym<?> { <sym> <?before \w> }
     token twigil:sym<=> { <sym> <?before \w> }
-    token twigil:sym<~> { <sym> <?before \w> <.NYI("Slangy variables")> }
+    token twigil:sym<~> { <sym> <?before \w> }
 
     proto token package_declarator { <...> }
     token package_declarator:sym<package> {

diff --git a/src/core/Slang.pm b/src/core/Slang.pm
@@ -0,0 +1,11 @@
+class Slang {
+    has $.grammar;
+    has $.actions;
+    method gist {
+        # Handle NQP objects like Perl6::Grammar
+        'Slang.new('
+            ~ (':grammar('~$!grammar.HOW.name($!grammar)~')',
+               ':actions('~$!actions.HOW.name($!actions)~')').join(', ')
+            ~ ')'
+    }
+}
diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
@@ -197,6 +197,7 @@ J_CORE_SOURCES = \
   src/core/Inc.pm \
   src/core/Process.pm \
   src/core/StrDistance.pm \
+  src/core/Slang.pm \
   src/core/core_epilogue.pm \
 
 PERL6_DEBUG_JAR = perl6-debug.jar

diff --git a/tools/build/Makefile-Parrot.in b/tools/build/Makefile-Parrot.in
@@ -265,6 +265,7 @@ P_CORE_SOURCES = \
   src/core/Inc.pm \
   src/core/Process.pm \
   src/core/StrDistance.pm \
+  src/core/Slang.pm \
   src/core/core_epilogue.pm \
 
 PERL6_DEBUG_PBC = perl6-debug.pbc

diff --git a/tools/build/moar_core_sources b/tools/build/moar_core_sources
@@ -145,4 +145,5 @@ src/core/Argfiles.pm
 src/core/Inc.pm
 src/core/Process.pm
 src/core/StrDistance.pm
+src/core/Slang.pm
 src/core/core_epilogue.pm