Dequote strings during parsing

parrot · Mar 28, 2011 · 77d0dcf · 77d0dcf
1 parent 4a04e0f
commit 77d0dcf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/compilers/opsc/src/Ops/Compiler/Actions.pm b/compilers/opsc/src/Ops/Compiler/Actions.pm
@@ -246,6 +246,9 @@ method op_body($/) {
     make $<blockoid>.ast;
 }
 
+method quote:sym<apos>($/) { make $<quote_EXPR>.ast; }
+method quote:sym<dblq>($/) { make $<quote_EXPR>.ast; }
+
 method op_macro:sym<expr offset>($/) {
     make PAST::Op.new(
         :pasttype<macro>,
@@ -521,7 +524,7 @@ method term:sym<int> ($/) {
 
 method term:sym<str> ($/) {
     make PAST::Val.new(
-        :value(~$<quote>),
+        :value($<quote>.ast.value),
         :returns<string>
     );
 }

diff --git a/compilers/opsc/src/Ops/Compiler/Grammar.pm b/compilers/opsc/src/Ops/Compiler/Grammar.pm
@@ -93,7 +93,7 @@ token op_body {
 
 proto token quote { <...> }
 token quote:sym<apos> { <?[']> <quote_EXPR: ':q'>  }
-token quote:sym<dblq> { <?["]> <quote_EXPR: ':q'> }
+token quote:sym<dblq> { <?["]> <quote_EXPR: ':qq'> }
 
 proto rule op_macro { <...> }
 rule op_macro:sym<goto offset>  { 'goto' 'OFFSET' '(' <arg=.EXPR> ')' }

diff --git a/compilers/opsc/src/Ops/Op.pm b/compilers/opsc/src/Ops/Op.pm
@@ -286,7 +286,9 @@ method get_body( %context ) {
 
 # Recursively process body chunks returning string.
 our multi method to_c(PAST::Val $val, %c) {
-    $val.value;
+    $val.returns eq 'string'
+        ?? '"' ~ subst($val.value, /\n/, '\n', :global) ~ '"' # FIXME other quoted
+        !! $val.value;
 }
 
 our multi method to_c(PAST::Var $var, %c) {