new pegex changes

ingydotnet · Mar 30, 2014 · 4b462fe · 4b462fe
1 parent 8df76b0
commit 4b462fe
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/lib/TestML/Compiler/Pegex/Grammar.pm b/lib/TestML/Compiler/Pegex/Grammar.pm
@@ -6,7 +6,13 @@ use constant file => '../testml-pgx/testml.pgx';
 
 sub make_tree {
   {
+    '+grammar' => 'testml',
+    '+include' => 'atom',
     '+toprule' => 'testml_document',
+    '+version' => '0.0.1',
+    '__' => {
+      '.rgx' => qr/\G(?:[\ \t]|\r?\n|\#.*\r?\n)+/
+    },
     'assertion_call' => {
       '.any' => [
         {
@@ -121,6 +127,9 @@ sub make_tree {
     'blank_line' => {
       '.rgx' => qr/\G[\ \t]*\r?\n/
     },
+    'blanks' => {
+      '.rgx' => qr/\G[\ \t]+/
+    },
     'block_header' => {
       '.all' => [
         {
@@ -130,15 +139,15 @@ sub make_tree {
           '+max' => 1,
           '.all' => [
             {
-              '.rgx' => qr/\G[\ \t]+/
+              '.ref' => 'blanks'
             },
             {
               '.ref' => 'block_label'
             }
           ]
         },
         {
-          '.rgx' => qr/\G[\ \t]*\r?\n/
+          '.ref' => 'blank_line'
         }
       ]
     },
@@ -250,7 +259,7 @@ sub make_tree {
       '+min' => 0,
       '.any' => [
         {
-          '.rgx' => qr/\G(?:[\ \t]|\r?\n|\#.*\r?\n)+/
+          '.ref' => '__'
         },
         {
           '.ref' => 'assignment_statement'
@@ -337,7 +346,7 @@ sub make_tree {
           '+min' => 0,
           '.any' => [
             {
-              '.rgx' => qr/\G(?:[\ \t]|\r?\n|\#.*\r?\n)+/
+              '.ref' => '__'
             },
             {
               '.ref' => 'assignment_statement'
@@ -385,13 +394,13 @@ sub make_tree {
           '.ref' => 'point_marker'
         },
         {
-          '.rgx' => qr/\G[\ \t]+/
+          '.ref' => 'blanks'
         },
         {
           '.ref' => 'point_name'
         },
         {
-          '.rgx' => qr/\G[\ \t]*\r?\n/
+          '.ref' => 'blank_line'
         },
         {
           '.ref' => 'point_lines'
@@ -410,7 +419,7 @@ sub make_tree {
           '.ref' => 'point_marker'
         },
         {
-          '.rgx' => qr/\G[\ \t]+/
+          '.ref' => 'blanks'
         },
         {
           '.ref' => 'point_name'