use proper locations in mustache_cli and catch render errors

Author: gasche

bin/mustache_cli.ml

@@ -1,13 +1,22 @@
+module Mustache = struct
+  include Mustache
+  include With_locations
+end
+
 let apply_mustache json_data template_data =
   let env = Ezjsonm.from_string json_data
   and tmpl =
     try Mustache.of_string template_data
     with Mustache.Template_parse_error err ->
-      Format.eprintf "%a@."
+      Format.eprintf "Template parse error:@\n%a@."
         Mustache.pp_template_parse_error err;
       exit 3
   in
-  Mustache.render tmpl env |> print_endline
+  try Mustache.render tmpl env |> print_endline
+  with Mustache.Render_error err ->
+    Format.eprintf "Template render error:@\n%a@."
+      Mustache.pp_render_error err;
+    exit 2
 
 let load_file f =
   let ic = open_in f in

bin/test/errors/parsing-errors.t

@@ -4,60 +4,70 @@ Delimiter problems:
   $ PROBLEM=no-closing-mustache.mustache
   $ echo "{{foo" > $PROBLEM
   $ mustache foo.json $PROBLEM
+  Template parse error:
   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.
   [3]
 
   $ PROBLEM=eof-before-variable.mustache
   $ echo "{{" > $PROBLEM
   $ mustache foo.json $PROBLEM
+  Template parse error:
   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.
   [3]
 
   $ PROBLEM=eof-before-section-end.mustache
   $ echo "{{#foo}} {{.}} {{/" > $PROBLEM
   $ mustache foo.json $PROBLEM
+  Template parse error:
   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.
   [3]
 
   $ PROBLEM=eof-before-unescape.mustache
   $ echo "{{{" > $PROBLEM
   $ mustache foo.json $PROBLEM
+  Template parse error:
   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.
   [3]
 
   $ PROBLEM=eof-before-partial.mustache
   $ echo "{{>" > $PROBLEM
   $ mustache foo.json $PROBLEM
+  Template parse error:
   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.
   [3]
 
@@ -67,12 +77,14 @@ Mismatches between opening and closing mustaches:
   $ PROBLEM=two-three.mustache
   $ echo "{{ foo }}}" > $PROBLEM
   $ mustache foo.json $PROBLEM
+  Template parse error:
   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.
   [3]
 
@@ -82,17 +94,20 @@ Mismatch between section-start and section-end:
   $ PROBLEM=foo-bar.mustache
   $ echo "{{#foo}} {{.}} {{/bar}}" > $PROBLEM
   $ mustache foo.json $PROBLEM
+  Template parse error:
   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.
   [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'.
   [3]

bin/test/errors/render-errors.t/run.t

@@ -27,59 +27,59 @@ one possible source of error, or both, or none.
 Invalid variable name:
 
   $ mustache reference.json missing-variable.mustache
-  Fatal error: exception Mustache.Render_error:
-  Line 0, character -1: the variable 'na' is missing.
+  Template render error:
+  Line 14, characters 40-46: the variable 'na' is missing.
   [2]
 
   $ mustache missing-variable.json reference.mustache
-  Fatal error: exception Mustache.Render_error:
-  Line 0, character -1: the variable 'data' is missing.
+  Template render error:
+  Line 5, characters 4-12: the variable 'data' is missing.
   [2]
 
 Invalid section name:
 
   $ mustache reference.json missing-section.mustache
-  Fatal error: exception Mustache.Render_error:
-  Line 0, character -1: the section 'na' is missing.
+  Template render error:
+  Line 14, characters 0-55: the section 'na' is missing.
   [2]
 
   $ mustache missing-section.json reference.mustache
-  Fatal error: exception Mustache.Render_error:
-  Line 0, character -1: the section 'group' is missing.
+  Template render error:
+  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
-  Fatal error: exception Mustache.Render_error:
-  Line 0, character -1: the variable 'gro' is missing.
+  Template render error:
+  Line 10, characters 2-15: the variable 'gro' is missing.
   [2]
 
   $ mustache invalid-dotted-name-1.json reference.mustache
-  Fatal error: exception Mustache.Render_error:
-  Line 0, character -1: the section 'group' is missing.
+  Template render error:
+  Lines 9-12, characters 0-10: the section 'group' is missing.
   [2]
 
   $ mustache reference.json invalid-dotted-name-2.mustache
-  Fatal error: exception Mustache.Render_error:
-  Line 0, character -1: the variable 'group.fir' is missing.
+  Template render error:
+  Line 10, characters 2-15: the variable 'group.fir' is missing.
   [2]
 
   $ mustache invalid-dotted-name-2.json reference.mustache
-  Fatal error: exception Mustache.Render_error:
-  Line 0, character -1: the variable 'group.first' is missing.
+  Template render error:
+  Line 10, characters 2-17: the variable 'group.first' is missing.
   [2]
 
 Non-scalar used as a scalar:
 
   $ mustache reference.json non-scalar.mustache
-  Fatal error: exception Mustache.Render_error:
-  Line 0, character -1: the value of 'list' is not a valid scalar.
+  Template render error:
+  Line 4, characters 0-8: the value of 'list' is not a valid scalar.
   [2]
 
   $ mustache non-scalar.json reference.mustache
-  Fatal error: exception Mustache.Render_error:
-  Line 0, character -1: the value of 'title' is not a valid scalar.
+  Template render error:
+  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):
@@ -88,6 +88,6 @@ Missing partial (currently the CLI does not support any partial anyway):
 in better `ls` output).
 
   $ mustache reference.json z-missing-partial.mustache
-  Fatal error: exception Mustache.Render_error:
-  Line 0, character -1: the partial 'second' is missing.
+  Template render error:
+  Line 11, characters 2-13: the partial 'second' is missing.
   [2]