Use new Pegex

ingydotnet · Aug 25, 2011 · 799bcae · 799bcae
1 parent 0160878
commit 799bcae
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/lib/TestML/Compiler.pm b/lib/TestML/Compiler.pm
@@ -141,24 +141,25 @@ sub fixup_grammar {
     my $namespace = $grammar->receiver->function->namespace;
     $namespace->{TestML} = $hash->{TestML};
 
-    $grammar = $grammar->grammar;
-    my $point_lines = $grammar->{point_lines}{'+re'};
+    my $tree = $grammar->tree;
+
+    my $point_lines = $tree->{point_lines}{'+re'};
 
     my $block_marker = $hash->{BlockMarker};
     if ($block_marker) {
         $block_marker =~ s/([\$\%\^\*\+\?\|])/\\$1/g;
-        $grammar->{block_marker}{'+re'} = qr/\G$block_marker/;
+        $tree->{block_marker}{'+re'} = qr/\G$block_marker/;
         $point_lines =~ s/===/$block_marker/;
     }
 
     my $point_marker = $hash->{PointMarker};
     if ($point_marker) {
         $point_marker =~ s/([\$\%\^\*\+\?\|])/\\$1/g;
-        $grammar->{point_marker}{'+re'} = qr/\G$point_marker/;
+        $tree->{point_marker}{'+re'} = qr/\G$point_marker/;
         $point_lines =~ s/---/$point_marker/;
     }
 
-    $grammar->{point_lines}{'+re'} = qr/$point_lines/;
+    $tree->{point_lines}{'+re'} = qr/$point_lines/;
 }
 
 sub slurp {

diff --git a/lib/TestML/Grammar.pm b/lib/TestML/Grammar.pm
@@ -1,7 +1,8 @@
 package TestML::Grammar;
 use base 'Pegex::Grammar';
+# use base 'Pegex::Grammar::Bootstrap';
 
-sub grammar_tree {
+sub build_tree {
     return +{
   'NEVER' => {
     '+re' => qr/(?-xism:\G(?!))/
@@ -473,7 +474,8 @@ sub grammar_tree {
   'unit_call' => {
     '+all' => [
       {
-        '+not' => 'assertion_call_test'
+        '+rule' => 'assertion_call_test',
+        '<' => '!'
       },
       {
         '+rule' => 'call_indicator'

diff --git a/src/grammar.pl b/src/grammar.pl
@@ -1,3 +1,5 @@
+# XXX This code currently depends on too much bootstrapping stuffs.
+
 use lib "../../pegex-pm/lib";
 # use Pegex::Compiler;
 use Pegex::Compiler::Bootstrap;
@@ -13,8 +15,9 @@
 print <<"...";
 package TestML::Grammar;
 use base 'Pegex::Grammar';
+# use base 'Pegex::Grammar::Bootstrap';
 
-sub grammar_tree {
+sub build_tree {
     return +$perl;
 }
 

diff --git a/src/testml.pgx b/src/testml.pgx
@@ -42,7 +42,7 @@ code_expression:
   <unit_call>*
 
 unit_call:
-  <!assertion_call_test>
+  !<assertion_call_test>
   <call_indicator>
   <code_object>