%Import uses TESTML_LIB

Also support trailing comments on %Import

Author: ingydotnet

src/testml-compiler-perl/lib/TestML/Compiler.pm

@@ -71,14 +71,32 @@ sub importer {
     $root =~ s/^(.*)\/.*/$1/;
   }
 
-  my $testml_file = "$root/$name.tml";
+  my @lib = grep length,
+    split(':', ($ENV{TESTML_LIB} || '')), $root;
+
+  my $testml_file;
+  for my $lib (@lib) {
+    $testml_file = "$lib/$name.tml";
+    last if -e "$lib/$name.tml";
+    $testml_file = '';
+  }
+  if (not $testml_file) {
+    die "Can't find '$name.tml' in:\n" .
+      join '', map "- '$_'\n", @lib;
+  }
   my $testml_input = file_read($testml_file);
 
-  return parse_testml(
+  my $parse = parse_testml(
     $testml_input,
     $testml_file,
     \&importer,
   );
+
+  for my $block (@{$parse->{data}}) {
+    $block->{Name} = $name;
+  }
+
+  return $parse;
 }
 
 sub ast_to_json {

src/testml-compiler-perl/lib/TestML/Compiler/Grammar.pm

@@ -49,7 +49,7 @@ sub rule_undent {
   return;
 }
 
-sub make_tree {   # Generated/Inlined by Pegex::Grammar (0.64_01)
+sub make_tree {   # Generated/Inlined by Pegex::Grammar (0.75)
   {
     '+toprule' => 'testml_document',
     'DOT' => {
@@ -192,7 +192,7 @@ sub make_tree {   # Generated/Inlined by Pegex::Grammar (0.64_01)
           '.ref' => 'function_signature'
         },
         {
-          '.rgx' => qr/\G[\ \t]*=\>(?:;(?:\ (?=\S))?|\r?\n?)/
+          '.rgx' => qr/\G[\ \t]*=\>(?:;(?:\ (?=\S))?|[\ \t]*(?:\#.*\r?\n)|\r?\n?)/
         },
         {
           '-skip' => 1,
@@ -313,7 +313,7 @@ sub make_tree {   # Generated/Inlined by Pegex::Grammar (0.64_01)
       '.rgx' => qr/\G[\ \t]+%[\ \t]+/
     },
     'ending' => {
-      '.rgx' => qr/\G(?:;(?:\ (?=\S))?|\r?\n?)/
+      '.rgx' => qr/\G(?:;(?:\ (?=\S))?|[\ \t]*(?:\#.*\r?\n)|\r?\n?)/
     },
     'expression_label' => {
       '.rgx' => qr/\G"((?:[^\n\\"]|\\[\\"0nt])*?)":\s*/
@@ -365,7 +365,7 @@ sub make_tree {   # Generated/Inlined by Pegex::Grammar (0.64_01)
           '.ref' => 'function_signature'
         },
         {
-          '.rgx' => qr/\G[\ \t]*=\>(?:;(?:\ (?=\S))?|\r?\n?)/
+          '.rgx' => qr/\G[\ \t]*=\>(?:;(?:\ (?=\S))?|[\ \t]*(?:\#.*\r?\n)|\r?\n?)/
         },
         {
           '-skip' => 1,
@@ -547,7 +547,7 @@ sub make_tree {   # Generated/Inlined by Pegex::Grammar (0.64_01)
       ]
     },
     'module_name' => {
-      '.rgx' => qr/\G(\S+)/
+      '.rgx' => qr/\G(\w\S*)/
     },
     'number_object' => {
       '.rgx' => qr/\G(\-?[0-9]+(?:\.[0-9]+)?)/
@@ -649,7 +649,7 @@ sub make_tree {   # Generated/Inlined by Pegex::Grammar (0.64_01)
       '.rgx' => qr/\G\s*:"((?:[^\n\\"]|\\[\\"0nt])*?)"/
     },
     'testml_directive' => {
-      '.rgx' => qr/\G%TestML[\ \t]+([0-9]+\.[0-9]+\.[0-9]+)(?:;(?:\ (?=\S))?|\r?\n?)/
+      '.rgx' => qr/\G%TestML[\ \t]+([0-9]+\.[0-9]+\.[0-9]+)(?:;(?:\ (?=\S))?|[\ \t]*(?:\#.*\r?\n)|\r?\n?)/
     },
     'testml_document' => {
       '.all' => [

src/testml-pgx/testml.pgx

@@ -267,7 +267,7 @@ point-multi: /
 
 #------------------------------------------------------------------------------
 
-ending: /(: SEMI (: SPACE (= NS))? | EOL?)/
+ending: /(: SEMI (: SPACE (= NS))? | - comment-line | EOL?)/
 
 assignment-operator:
   /(: '=' | '||=' )/
@@ -306,7 +306,7 @@ identifier-name:
 identifier-user:
   / LOWER ALNUM* (: DASH ALPHA ALNUM*)* /
 
-module-name: /( NS+ )/
+module-name: /( WORD NS* )/
 
 point-name:
   /(: identifier-user | pseudo-point-name)/

test/compiler-tml/070-import-directive.tml

@@ -31,7 +31,8 @@ Diff = 1
   "data": [
     { "Label": "Test 1",
       "a": 1,
-      "b": 2}]}
+      "b": 2,
+      "Name": "data"}]}
 
 === Import multiple files at once
 --- input
@@ -65,12 +66,15 @@ Diff = 1
   "data": [
     { "Label": "Test 1",
       "a": 1,
-      "b": 2},
+      "b": 2,
+      "Name": "data1"},
     { "Label": "Test 2",
       "a": 3,
-      "b": 4},
+      "b": 4,
+      "Name": "data2"},
     { "Label": "Test 3",
       "a": 5,
-      "b": 6}]}
+      "b": 6,
+      "Name": "data3"}]}
 
 # vim: ft=: