[nqp]: Add interpolation of scalars into double-quoted strings.

perl6 · Oct 31, 2009 · dcee671 · dcee671
1 parent 1e17347
commit dcee671
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -548,6 +548,8 @@ method quote:sym<Q:PIR>($/) {
                        :node($/) );
 }
 
+method quote_escape:sym<$>($/) { make $<variable>.ast; }
+
 ## Operators
 
 method nulltermish($/) {

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -292,6 +292,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 circumfix:sym<( )> { '(' <.ws> <EXPR> ')' }
 token circumfix:sym<ang> { <?[<]>  <quote_EXPR: ':q', ':w'>  }
 token circumfix:sym<{ }> { <?[{]> <pblock> }

diff --git a/t/nqp/38-quotes.t b/t/nqp/38-quotes.t
@@ -0,0 +1,11 @@
+#! nqp
+
+# interpolating quotes
+
+plan(2);
+
+my $abc := 'abc';
+
+ok( "xxx$abc" eq 'xxxabc', "basic scalar interpolation" );
+
+ok( qq{xxx $abc zzz} eq 'xxx abc zzz', 'basic qq{} interpolation' );