Fixes needed to make JSONY.pm pass tests

ingydotnet · Jan 30, 2014 · 2d78f39 · 2d78f39
1 parent a6b40b2
commit 2d78f39
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/lib/Module/Install/TestML.pm b/lib/Module/Install/TestML.pm
@@ -26,20 +26,24 @@ sub use_testml {
     my ($self) = @_;
 
     $self->include('Pegex::Grammar');
+    $self->include('Pegex::Base');
     $self->include('Pegex::Input');
     $self->include('Pegex::Parser');
     $self->include('Pegex::Tree');
     $self->include('Pegex::Receiver');
 
     $self->include('TestML');
     $self->include('TestML::Base');
-    $self->include('TestML::AST');
+    $self->include('TestML::Bridge');
     $self->include('TestML::Compiler');
-    $self->include('TestML::Grammar');
+    $self->include('TestML::Compiler::Pegex');
+    $self->include('TestML::Compiler::Pegex::AST');
+    $self->include('TestML::Compiler::Pegex::Grammar');
     $self->include('TestML::Library::Debug');
     $self->include('TestML::Library::Standard');
     $self->include('TestML::Runtime');
     $self->include('TestML::Runtime::TAP');
+    $self->include('TestML::Util');
 }
 
 sub testml_setup {

diff --git a/lib/TestML/Bridge.pm b/lib/TestML/Bridge.pm
@@ -1,8 +1,6 @@
 package TestML::Bridge;
 use TestML::Base;
 
-sub runtime {
-    $TestML::Runtime::Singleton;
-}
+use TestML::Util 'runtime';
 
 1;
diff --git a/lib/TestML/Util.pm b/lib/TestML/Util.pm
@@ -5,7 +5,9 @@ use TestML::Runtime;
 package TestML::Util;
 
 use Exporter 'import';
-our @EXPORT = qw( list str num bool none native );
+our @EXPORT = qw( runtime list str num bool none native );
+
+sub runtime { $TestML::Runtime::Singleton }
 
 sub list { TestML::List->new(value => $_[0]) }
 sub str { TestML::Str->new(value => $_[0]) }

diff --git a/t/compile.t b/t/compile.t
@@ -1,6 +1,7 @@
 # BEGIN { $Pegex::Parser::Debug = 1 }
 use Test::Differences; *is = \&eq_or_diff;
 use Test::More;
+# use Test::Diff;
 use strict;
 
 BEGIN {