Add closure interpolation.

perl6 · Nov 8, 2009 · 5559916 · 5559916
1 parent 57d2a44
commit 5559916
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -553,6 +553,11 @@ method quote:sym<Q:PIR>($/) {
 }
 
 method quote_escape:sym<$>($/) { make $<variable>.ast; }
+method quote_escape:sym<{ }>($/) {
+    make PAST::Op.new( 
+        :pirop('set S*'), block_immediate($<block>.ast), :node($/) 
+    );
+}
 
 ## Operators
 

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -333,7 +333,8 @@ token quote:sym<qq>   { 'qq' <![(]> <.ws> <quote_EXPR: ':qq'> }
 token quote:sym<Q>    { 'Q'  <![(]> <.ws> <quote_EXPR> }
 token quote:sym<Q:PIR> { 'Q:PIR' <.ws> <quote_EXPR> }
 
-token quote_escape:sym<$> { <?[$]> <?quotemod_check('s')> <variable> }
+token quote_escape:sym<$>   { <?[$]> <?quotemod_check('s')> <variable> }
+token quote_escape:sym<{ }> { <?[{]> <?quotemod_check('c')> <block> }
 
 token circumfix:sym<( )> { '(' <.ws> <EXPR> ')' }
 token circumfix:sym<ang> { <?[<]>  <quote_EXPR: ':q', ':w'>  }

diff --git a/t/nqp/38-quotes.t b/t/nqp/38-quotes.t
@@ -2,10 +2,18 @@
 
 # interpolating quotes
 
-plan(2);
+plan(4);
 
 my $abc := 'abc';
 
 ok( "xxx$abc" eq 'xxxabc', "basic scalar interpolation" );
 
 ok( qq{xxx $abc zzz} eq 'xxx abc zzz', 'basic qq{} interpolation' );
+
+my $num := 5;
+
+ok( "xxx {3+$num} zzz" eq 'xxx 8 zzz', "basic closure interpolation" );
+
+ok( qq{xxx {3+$num} zzz} eq 'xxx 8 zzz', "basic qq{} closure interpolation" );
+
+