Remove Pegex bootstrapping from TestML

ingydotnet · Aug 27, 2011 · 4b8b716 · 4b8b716
1 parent bf3545a
commit 4b8b716
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/lib/TestML/Grammar.pm b/lib/TestML/Grammar.pm
@@ -1,6 +1,5 @@
 package TestML::Grammar;
 use base 'Pegex::Grammar';
-# use base 'Pegex::Grammar::Bootstrap';
 
 sub build_tree {
     return +{

diff --git a/lib/TestML/Runtime/TAP.pm b/lib/TestML/Runtime/TAP.pm
@@ -3,6 +3,15 @@ use TestML::Runtime -base;
 
 use Test::Builder;
 
+if ($TestML::Test::Differences) {
+    no warnings 'redefine';
+    require Test::Differences;
+    *Test::Builder::is_eq = sub {
+        my $self = shift;
+        \&Test::Differences::eq_or_diff(@_);
+    };
+}
+
 has 'test_builder' => -init => 'Test::Builder->new';
 
 sub title {

diff --git a/src/grammar.pl b/src/grammar.pl
@@ -1,26 +1,15 @@
-# XXX This code currently depends on too much bootstrapping stuffs.
+use Pegex::Compiler;
 
-use lib "../../pegex-pm/lib";
-# use Pegex::Compiler;
-use Pegex::Compiler::Bootstrap;
-
-open IN, shift or die;
-my $testml = do {local $/; <IN>};
-# my $pegex = Pegex::Compiler->new;
-my $pegex = Pegex::Compiler::Bootstrap->new;
-$pegex->compile($testml);
-my $perl = $pegex->to_perl;
+my $perl = Pegex::Compiler->compile_file(shift)->to_perl;
 chomp($perl);
 
 print <<"...";
 package TestML::Grammar;
 use base 'Pegex::Grammar';
-# use base 'Pegex::Grammar::Bootstrap';
 
 sub build_tree {
     return +$perl;
 }
 
 1;
 ...
-