Add support for redefining data section markers.

ingydotnet · Jul 11, 2010 · 7340c1b · 7340c1b
1 parent ab1b5b1
commit 7340c1b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/lib/TestML/Parser.pm b/lib/TestML/Parser.pm
@@ -18,6 +18,8 @@ method parse($testml) {
     if (not $rc1) {
         die "Parse TestML failed";
     }
+    $TestML::Parser::Grammar::DataSection::block_marker = $doc.meta.data<BlockMarker>;
+    $TestML::Parser::Grammar::DataSection::point_marker = $doc.meta.data<PointMarker>;
     my $rc2 = TestML::Parser::Grammar::DataSection.parse(
         $data, :actions(TestML::Parser::Actions)
     );

diff --git a/lib/TestML/Parser/Grammar.pm b/lib/TestML/Parser/Grammar.pm
@@ -207,6 +207,9 @@ token data_section {
 #------------------------------------------------------------------------------#
 grammar TestML::Parser::Grammar::DataSection is TestML::Parser::Grammar::Base;
 
+our $block_marker = '===';
+our $point_marker = '---';
+
 token TOP { ^ <data_section> $ }
 
 token data_section {
@@ -222,7 +225,7 @@ token block_header {
 }
 
 token block_marker {
-    '==='
+    $block_marker
 }
 
 token block_label {
@@ -251,7 +254,7 @@ token phrase_point {
 }
 
 token point_marker {
-    '---'
+    $point_marker
 }
 
 token point_name {

diff --git a/lib/TestML/Runner.pm b/lib/TestML/Runner.pm
@@ -117,9 +117,11 @@ method parse_document () {
 
 method _transform_modules() {
     my @modules = (
-        $.bridge,
         'TestML::Standard',
     );
+    if $.bridge {
+        @modules.push($.bridge);
+    }
     for @modules -> $module_name {
         eval "use $module_name";
         my $module = eval($module_name);

diff --git a/t/markers.t b/t/markers.t
@@ -0,0 +1,5 @@
+use TestML::Runner::TAP;
+
+TestML::Runner::TAP.new(
+    document => 'testml-tml/markers.tml',
+).run();
diff --git a/t/parse-testml-document.t b/t/parse-testml-document.t
@@ -1,14 +1,14 @@
 use v6;
 use Test;
-plan 22;
+plan 23;
 
 use TestML::Parser;
 
 my $testml = '
-%TestML: 1.0
+# A comment
+%TestML: 1.0                #A line comment
 %Plan: 2
 %Title: O HAI TEST
-%PointMarker: +++         #A line comment
 
 *input.uppercase() == *output;
 
@@ -27,7 +27,8 @@ try {
     is $match.meta.data<TestML>, '1.0', 'Version parses';
     is $match.meta.data<Plan>, '2', 'Plan parses';
     is $match.meta.data<Title>, 'O HAI TEST', 'Title parses';
-    is $match.meta.data<PointMarker>, '+++', 'PointMarker parses';
+    is $match.meta.data<BlockMarker>, '===', 'BlockMarker defaults';
+    is $match.meta.data<PointMarker>, '---', 'PointMarker defaults';
 
     is $match.test.statements.elems, 1, 'One test statement';
     my $statement = $match.test.statements[0];