[svn:parrot] r44772 - branches/ops_pct/compilers/opsc/src/Ops/Compiler

Mon Mar 8 19:57:48 UTC 2010

Author: bacek
Date: Mon Mar  8 19:57:48 2010
New Revision: 44772
URL: https://trac.parrot.org/parrot/changeset/44772

Log:
Don't put {} into op body.

Modified:
   branches/ops_pct/compilers/opsc/src/Ops/Compiler/Actions.pm
   branches/ops_pct/compilers/opsc/src/Ops/Compiler/Grammar.pm

Modified: branches/ops_pct/compilers/opsc/src/Ops/Compiler/Actions.pm
==============================================================================

--- branches/ops_pct/compilers/opsc/src/Ops/Compiler/Actions.pm	Mon Mar  8 19:57:38 2010	(r44771)
+++ branches/ops_pct/compilers/opsc/src/Ops/Compiler/Actions.pm	Mon Mar  8 19:57:48 2010	(r44772)
@@ -226,7 +226,7 @@
         :node($/),
         :pasttype('inline'),
     );
-    $op<inline> := munch_body($op, ~$/);
+    $op<inline> := munch_body($op, ~$<body>);
     make $op;
 }
 

Modified: branches/ops_pct/compilers/opsc/src/Ops/Compiler/Grammar.pm
==============================================================================
--- branches/ops_pct/compilers/opsc/src/Ops/Compiler/Grammar.pm	Mon Mar  8 19:57:38 2010	(r44771)
+++ branches/ops_pct/compilers/opsc/src/Ops/Compiler/Grammar.pm	Mon Mar  8 19:57:48 2010	(r44772)
@@ -85,7 +85,7 @@
 
 # OpBody starts with '{' and ends with single '}' on line.
 token op_body {
-    '{' .*? ^^ '}' {*}
+    '{' $<body>=[.*?] ^^ '}' {*}
 }
 
 token identifier {
