Rename Template_parse_error into Parse_error

The idea was to leave space for "JSON parse error", but those can be
just JSON_error.

Author: gasche

bin/mustache_cli.ml

@@ -28,8 +28,8 @@ let load_template template_filename =
     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@."
+  with Mustache.Parse_error err ->
+    Format.eprintf "Parse error:@\n%a@."
       Mustache.pp_template_parse_error err;
     exit 3
 

bin/test/errors/parsing-errors.t

@@ -4,71 +4,71 @@ Delimiter problems:
   $ PROBLEM=no-closing-mustache.mustache
   $ echo "{{foo" > $PROBLEM
   $ mustache foo.json $PROBLEM
-  Template parse error:
+  Parse error:
   File "no-closing-mustache.mustache", line 2, character 0: '}}' expected.
   [3]
 
   $ PROBLEM=one-closing-mustache.mustache
   $ echo "{{foo}" > $PROBLEM
   $ mustache foo.json $PROBLEM
-  Template parse error:
+  Parse error:
   File "one-closing-mustache.mustache", line 1, character 5: '}}' expected.
   [3]
 
   $ PROBLEM=eof-before-variable.mustache
   $ echo "{{" > $PROBLEM
   $ mustache foo.json $PROBLEM
-  Template parse error:
+  Parse error:
   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:
+  Parse error:
   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:
+  Parse error:
   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:
+  Parse error:
   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:
+  Parse error:
   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:
+  Parse error:
   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:
+  Parse error:
   File "eof-before-partial.mustache", line 2, character 0: '}}' expected.
   [3]
 
   $ PROBLEM=eof-in-comment.mustache
   $ echo "{{! non-terminated comment" > $PROBLEM
   $ mustache foo.json $PROBLEM
-  Template parse error:
+  Parse error:
   File "eof-in-comment.mustache", line 2, character 0: non-terminated comment.
   [3]
 
@@ -78,14 +78,14 @@ Mismatches between opening and closing mustaches:
   $ PROBLEM=two-three.mustache
   $ echo "{{ foo }}}" > $PROBLEM
   $ mustache foo.json $PROBLEM
-  Template parse error:
+  Parse error:
   File "two-three.mustache", line 1, characters 7-10: '}}' expected.
   [3]
 
   $ PROBLEM=three-two.mustache
   $ echo "{{{ foo }}" > $PROBLEM
   $ mustache foo.json $PROBLEM
-  Template parse error:
+  Parse error:
   File "three-two.mustache", line 1, characters 8-10: '}}}' expected.
   [3]
 
@@ -95,22 +95,22 @@ Mismatch between section-start and section-end:
   $ PROBLEM=foo-bar.mustache
   $ echo "{{#foo}} {{.}} {{/bar}}" > $PROBLEM
   $ mustache foo.json $PROBLEM
-  Template parse error:
+  Parse error:
   File "foo-bar.mustache", line 1, characters 0-23:
   Section mismatch: {{#foo}} is closed by {{/bar}}.
   [3]
 
   $ PROBLEM=foo-not-closed.mustache
   $ echo "{{#foo}} {{.}} {{foo}}" > $PROBLEM
   $ mustache foo.json $PROBLEM
-  Template parse error:
+  Parse 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:
+  Parse error:
   File "wrong-nesting.mustache", line 1, characters 9-32:
   Section mismatch: {{#foo}} is closed by {{/bar}}.
   [3]
@@ -121,6 +121,6 @@ Weird cases that may confuse our lexer or parser:
   $ PROBLEM=weird-tag-name.mustache
   $ echo "{{.weird}} foo bar" > $PROBLEM
   $ mustache foo.json $PROBLEM
-  Template parse error:
+  Parse error:
   File "weird-tag-name.mustache", line 1, character 3: '}}' expected.
   [3]

lib/mustache.ml

@@ -154,14 +154,14 @@ and template_parse_error_kind =
       end_name: dotted_name;
     }
 
-exception Template_parse_error of template_parse_error
+exception Parse_error of template_parse_error
 
 let parse_lx (lexbuf: Lexing.lexbuf) : Locs.t =
   let loc_of lexbuf =
     let open Lexing in
     { loc_start = lexbuf.lex_start_p; loc_end = lexbuf.lex_curr_p } in
   let raise_err loc kind =
-    raise (Template_parse_error { loc; kind })
+    raise (Parse_error { loc; kind })
   in
   try
     MenhirLib.Convert.Simplified.traditional2revised
@@ -265,8 +265,8 @@ let () =
       pp_error err;
     Buffer.contents buf in
   Printexc.register_printer (function
-    | Template_parse_error err ->
-      Some (pretty_print "Template_parse_error" pp_template_parse_error err)
+    | Parse_error err ->
+      Some (pretty_print "Parse_error" pp_template_parse_error err)
     | Render_error err ->
       Some (pretty_print "Render_error" pp_render_error err)
     | _ -> None

lib/mustache.mli

@@ -40,9 +40,9 @@ type loc =
     { loc_start: Lexing.position;
       loc_end: Lexing.position }
 
-(** Read template files; those function may raise [Template_parse_error]. *)
+(** Read template files; those function may raise [Parse_error]. *)
 type template_parse_error
-exception Template_parse_error of template_parse_error
+exception Parse_error of template_parse_error
 
 val parse_lx : Lexing.lexbuf -> t
 val of_string : string -> t
@@ -54,7 +54,7 @@ val of_string : string -> t
 
     {|
       try ignore (Mustache.of_string "{{!")
-      with Mustache.Template_parse_error err ->
+      with Mustache.Parse_error err ->
         Format.eprintf "%a@." Mustache.pp_template_parse_error err
     |}
 *)