Lexer improvements

Makefile

@@ -3,7 +3,7 @@ default: build
 
 .PHONY: generate-re2c
 generate-re2c:
-	re2ocaml -W --no-generation-date -i src/lexer.ml.re -o src/lexer.ml
+	re2ocaml -W -Wno-nondeterministic-tags --no-generation-date --conditions -i src/lexer.ml.re -o src/lexer.ml
 	sed -i "s/'\\\\f'/'\\\\x0C'/g" src/lexer.ml
 	sed -i "s/'\\\\a'/'\\\\x07'/g" src/lexer.ml
 	sed -i "s/'\\\\v'/'\\\\x0B'/g" src/lexer.ml

src/err.ml

@@ -1,5 +1,5 @@
 exception Custom_parsing_error of string * Loc.t
-exception Custom_lexing_error of string
+exception Custom_lexing_error of string * Loc.t
 
 type error_loc = Loc.t
 

src/kdl.ml

@@ -6,18 +6,18 @@ module L = Lens
 
 let document_revised =
   MenhirLib.Convert.Simplified.traditional2revised Parser.document
-let parse yyrecord : (t, error) result =
-  try Ok (document_revised @@ Lexer.main_tokenizer yyrecord) with
-  | Custom_lexing_error msg ->
-    Error (msg, Lexer.get_location yyrecord)
+let parse state : (t, error) result =
+  try Ok (document_revised @@ Lexer.main_tokenizer state) with
+  | Custom_lexing_error (msg, loc) ->
+    Error (msg, loc)
   | Custom_parsing_error (msg, loc) ->
     Error (msg, loc)
   | Parser.Error ->
     (* note: this doesn't seem to print correct locations with lookahead tokens *)
-    Error ("Syntax error", Lexer.get_location yyrecord)
+    Error ("Syntax error", Lexer.get_location state)
 
 let from_string ?fname input =
-  parse (Lexer.make_tokenizer_yyrecord ?fname input)
+  parse (Lexer.make_tokenizer_state ?fname input)
 
 let from_string_exn ?fname input =
   match from_string ?fname input with