mustache binary: include the input filename in locations

gasche · gasche · commit c7c090bf60ba · 2020-12-27T20:47:45.000+01:00
diff --git a/bin/mustache_cli.ml b/bin/mustache_cli.ml
@@ -3,10 +3,15 @@ module Mustache = struct
   include With_locations
 end
 
-let apply_mustache json_data template_data =
+let apply_mustache ~json_data ~template_filename ~template_data =
   let env = Ezjsonm.from_string json_data
   and tmpl =
-    try Mustache.of_string template_data
+    let lexbuf = Lexing.from_string template_data in
+    let () =
+      let open Lexing in
+      lexbuf.lex_curr_p <- { lexbuf.lex_curr_p with pos_fname = template_filename };
+    in
+    try Mustache.parse_lx lexbuf
     with Mustache.Template_parse_error err ->
       Format.eprintf "Template parse error:@\n%a@."
         Mustache.pp_template_parse_error err;
@@ -27,10 +32,10 @@ let load_file f =
   (Bytes.to_string s)
 
 let run json_filename template_filename =
-  let j = load_file json_filename
-  and t = load_file template_filename
+  let json_data = load_file json_filename
+  and template_data = load_file template_filename
   in
-  apply_mustache j t
+  apply_mustache ~json_data ~template_filename ~template_data
 
 let usage () =
   print_endline "Usage: mustache-cli json_filename template_filename"
diff --git a/bin/test/errors/parsing-errors.t b/bin/test/errors/parsing-errors.t
@@ -5,70 +5,72 @@ Delimiter problems:
   $ echo "{{foo" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Line 2, character 0: syntax error.
+  File "no-closing-mustache.mustache", line 2, character 0: syntax error.
   [3]
 
   $ PROBLEM=one-closing-mustache.mustache
   $ echo "{{foo}" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Lines 1-2, characters 6-0: syntax error.
+  File "one-closing-mustache.mustache", lines 1-2, characters 6-0:
+  syntax error.
   [3]
 
   $ PROBLEM=eof-before-variable.mustache
   $ echo "{{" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Line 2, character 0: ident expected.
+  File "eof-before-variable.mustache", line 2, character 0: ident expected.
   [3]
 
   $ PROBLEM=eof-before-section.mustache
   $ echo "{{#" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Line 2, character 0: ident expected.
+  File "eof-before-section.mustache", line 2, character 0: ident expected.
   [3]
 
   $ PROBLEM=eof-before-section-end.mustache
   $ echo "{{#foo}} {{.}} {{/" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Line 2, character 0: ident expected.
+  File "eof-before-section-end.mustache", line 2, character 0: ident expected.
   [3]
 
   $ PROBLEM=eof-before-inverted-section.mustache
   $ echo "{{^" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Line 2, character 0: ident expected.
+  File "eof-before-inverted-section.mustache", line 2, character 0:
+  ident expected.
   [3]
 
   $ PROBLEM=eof-before-unescape.mustache
   $ echo "{{{" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Line 2, character 0: ident expected.
+  File "eof-before-unescape.mustache", line 2, character 0: ident expected.
   [3]
 
   $ PROBLEM=eof-before-unescape.mustache
   $ echo "{{&" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Line 2, character 0: ident expected.
+  File "eof-before-unescape.mustache", line 2, character 0: ident expected.
   [3]
 
   $ PROBLEM=eof-before-partial.mustache
   $ echo "{{>" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Line 2, character 0: ident expected.
+  File "eof-before-partial.mustache", line 2, character 0: ident expected.
   [3]
 
   $ PROBLEM=eof-in-comment.mustache
   $ echo "{{! non-terminated comment" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Line 2, character 0: non-terminated comment.
+  File "eof-in-comment.mustache", line 2, character 0: non-terminated comment.
   [3]
 
 
@@ -78,14 +80,14 @@ Mismatches between opening and closing mustaches:
   $ echo "{{ foo }}}" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Lines 1-2, characters 10-0: syntax error.
+  File "two-three.mustache", lines 1-2, characters 10-0: syntax error.
   [3]
 
   $ PROBLEM=three-two.mustache
   $ echo "{{{ foo }}" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Lines 1-2, characters 10-0: syntax error.
+  File "three-two.mustache", lines 1-2, characters 10-0: syntax error.
   [3]
 
 
@@ -95,19 +97,21 @@ Mismatch between section-start and section-end:
   $ echo "{{#foo}} {{.}} {{/bar}}" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Lines 1-2, characters 23-0: Mismatched section 'foo' with 'bar'.
+  File "foo-bar.mustache", lines 1-2, characters 23-0:
+  Mismatched section 'foo' with 'bar'.
   [3]
 
   $ PROBLEM=foo-not-closed.mustache
   $ echo "{{#foo}} {{.}} {{foo}}" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Line 2, character 0: syntax error.
+  File "foo-not-closed.mustache", line 2, character 0: syntax error.
   [3]
 
   $ PROBLEM=wrong-nesting.mustache
   $ echo "{{#bar}} {{#foo}} {{.}} {{/bar}} {{/foo}}" > $PROBLEM
   $ mustache foo.json $PROBLEM
   Template parse error:
-  Lines 1-2, characters 41-0: Mismatched section 'foo' with 'bar'.
+  File "wrong-nesting.mustache", lines 1-2, characters 41-0:
+  Mismatched section 'foo' with 'bar'.
   [3]
diff --git a/bin/test/errors/render-errors.t/run.t b/bin/test/errors/render-errors.t/run.t
@@ -28,58 +28,68 @@ Invalid variable name:
 
   $ mustache reference.json missing-variable.mustache
   Template render error:
-  Line 14, characters 40-46: the variable 'na' is missing.
+  File "missing-variable.mustache", line 14, characters 40-46:
+  the variable 'na' is missing.
   [2]
 
   $ mustache missing-variable.json reference.mustache
   Template render error:
-  Line 5, characters 4-12: the variable 'data' is missing.
+  File "reference.mustache", line 5, characters 4-12:
+  the variable 'data' is missing.
   [2]
 
 Invalid section name:
 
   $ mustache reference.json missing-section.mustache
   Template render error:
-  Line 14, characters 0-55: the section 'na' is missing.
+  File "missing-section.mustache", line 14, characters 0-55:
+  the section 'na' is missing.
   [2]
 
   $ mustache missing-section.json reference.mustache
   Template render error:
-  Lines 9-12, characters 0-10: the section 'group' is missing.
+  File "reference.mustache", lines 9-12, characters 0-10:
+  the section 'group' is missing.
   [2]
 
 Error in a dotted path foo.bar (one case for the first component, the other in the second).
 
   $ mustache reference.json invalid-dotted-name-1.mustache
   Template render error:
-  Line 10, characters 2-15: the variable 'gro' is missing.
+  File "invalid-dotted-name-1.mustache", line 10, characters 2-15:
+  the variable 'gro' is missing.
   [2]
 
   $ mustache invalid-dotted-name-1.json reference.mustache
   Template render error:
-  Lines 9-12, characters 0-10: the section 'group' is missing.
+  File "reference.mustache", lines 9-12, characters 0-10:
+  the section 'group' is missing.
   [2]
 
   $ mustache reference.json invalid-dotted-name-2.mustache
   Template render error:
-  Line 10, characters 2-15: the variable 'group.fir' is missing.
+  File "invalid-dotted-name-2.mustache", line 10, characters 2-15:
+  the variable 'group.fir' is missing.
   [2]
 
   $ mustache invalid-dotted-name-2.json reference.mustache
   Template render error:
-  Line 10, characters 2-17: the variable 'group.first' is missing.
+  File "reference.mustache", line 10, characters 2-17:
+  the variable 'group.first' is missing.
   [2]
 
 Non-scalar used as a scalar:
 
   $ mustache reference.json non-scalar.mustache
   Template render error:
-  Line 4, characters 0-8: the value of 'list' is not a valid scalar.
+  File "non-scalar.mustache", line 4, characters 0-8:
+  the value of 'list' is not a valid scalar.
   [2]
 
   $ mustache non-scalar.json reference.mustache
   Template render error:
-  Line 1, characters 7-16: the value of 'title' is not a valid scalar.
+  File "reference.mustache", line 1, characters 7-16:
+  the value of 'title' is not a valid scalar.
   [2]
 
 Missing partial (currently the CLI does not support any partial anyway):
@@ -89,5 +99,6 @@ in better `ls` output).
 
   $ mustache reference.json z-missing-partial.mustache
   Template render error:
-  Line 11, characters 2-13: the partial 'second' is missing.
+  File "z-missing-partial.mustache", line 11, characters 2-13:
+  the partial 'second' is missing.
   [2]
