Allow intermingling Perl6 terms in NIL

sorear · Jul 13, 2010 · e7d59a1 · e7d59a1
1 parent ce81a8f
commit e7d59a1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Niecza/Actions.pm b/Niecza/Actions.pm
@@ -528,6 +528,10 @@ sub insn__S_push_null { my ($cl, $M) = @_;
     $M->{_ast} = [[ push_null => $M->{clrid}->Str ]];
 }
 
+sub insn__S_hll { my ($cl, $M) = @_;
+    $M->{_ast} = [ $M->{EXPR}{_ast} ];
+}
+
 sub clrid {}
 sub clrqual {}
 sub clrgeneric {}

diff --git a/Niecza/Grammar.pm6 b/Niecza/Grammar.pm6
@@ -109,6 +109,7 @@ grammar NIL is STD {
     token insn:clr_sfield_set { 'F!' {} <clrid> }
     token insn:return { <sym> '/' (<[ 0 1 ]>) }
     token insn:push_null { 'null:' {} <clrid> }
+    token insn:hll { '{' ~ '}' [ :lang(%*LANG<MAIN>) <EXPR> ] }
 }
 
 }

diff --git a/Op.pm b/Op.pm
@@ -20,8 +20,12 @@ use 5.010;
     sub item_cg {
         my ($self, $cg, $body) = @_;
         for my $insn (@{ $self->code }) {
-            my ($op, @args) = @$insn;
-            $cg->$op(@args);
+            if (blessed $insn) {
+                $insn->item_cg($cg, $body);
+            } else {
+                my ($op, @args) = @$insn;
+                $cg->$op(@args);
+            }
         }
     }