Cleanup dead code and fix exception reports.

Author: Iwan

Makefile

@@ -71,17 +71,17 @@ lib/test.exe: $(TEST_FILES)
 	$(OCAMLOPT) $(OCAMLFLAGS) -O2 -o ./lib/test.exe -bin-annot -I +compiler-libs ocamlcommon.cmxa -I src -I tests $(TEST_FILES)
 
 test: build-native lib/test.exe
-	./node_modules/.bin/reanalyze -all-cmt . -suppress tests
+	./node_modules/.bin/reanalyze -all-cmt . -suppress tests -suppress benchmarks
 	./node_modules/.bin/jest
 	./lib/test.exe
 
 roundtrip-test: bootstrap lib/test.exe
-	./node_modules/.bin/reanalyze -all-cmt . -suppress tests
+	./node_modules/.bin/reanalyze -all-cmt . -suppress tests -suppress benchmarks
 	ROUNDTRIP_TEST=1 ./node_modules/.bin/jest
 	./lib/test.exe
 
 reanalyze: build-native lib/test.exe
-	./node_modules/.bin/reanalyze -all-cmt . -suppress tests
+	./node_modules/.bin/reanalyze -all-cmt . -suppress tests -suppress benchmarks
 
 clean:
 	rm -rf src/*.cm*

src/res_cli.ml

@@ -270,7 +270,7 @@ module CliArgProcessor = struct
 end
 
 
-let () =
+let [@raises exit] () =
   if not !Sys.interactive then begin
     ResClflags.parse ();
     match !ResClflags.files with
@@ -294,6 +294,4 @@ let () =
           ~report:!ResClflags.report
           filename
         ) files
-
-  end
-[@@raises exit]
+end

src/res_core.ml

@@ -5710,8 +5710,16 @@ and parseWithConstraint p =
       )
     end
   | token ->
+    (* TODO: implement recovery strategy *)
     Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-    exit (-1) [@doesNotRaise] (* TODO: handle this case *)
+    Parsetree.Pwith_type (
+      (Location.mknoloc (Longident.Lident "")),
+      Ast_helper.Type.mk
+        ~params:[]
+        ~manifest:(Recover.defaultType ())
+        ~cstrs:[]
+        (Location.mknoloc "")
+    )
 
 and parseModuleTypeOf p =
   let startPos = p.Parser.startPos in

src/res_parser.ml

@@ -160,5 +160,3 @@ let lookahead p callback =
   p.comments <- comments;
 
   res
-
-let comments p = Array.of_list (List.rev p.comments)

src/res_parser.mli

@@ -47,5 +47,3 @@ val checkProgress:
   result: 'a ->
   t ->
   'a option
-
-val comments: t -> Comment.t array

src/res_scanner.ml

@@ -2,7 +2,7 @@ module CharacterCodes = Res_character_codes
 module Diagnostics = Res_diagnostics
 module Token = Res_token
 module Comment = Res_comment
-type mode = Template | Jsx | Diamond
+type mode = Jsx | Diamond
 
 type t = {
   filename: string;
@@ -23,9 +23,6 @@ type t = {
 let setDiamondMode scanner =
   scanner.mode <- Diamond::scanner.mode
 
-let setTemplateMode scanner =
-  scanner.mode <- Template::scanner.mode
-
 let setJsxMode scanner =
   scanner.mode <- Jsx::scanner.mode
 

src/res_scanner.mli

@@ -1,4 +1,4 @@
-type mode = Template | Jsx | Diamond
+type mode = Jsx | Diamond
 
 type t = {
   filename: string;
@@ -23,7 +23,6 @@ val scan: t -> (Lexing.position * Lexing.position * Res_token.t)
 
 val isBinaryOp: bytes -> int -> int -> bool
 
-val setTemplateMode: t -> unit
 val setJsxMode: t -> unit
 val setDiamondMode: t -> unit
 val popMode: t -> mode -> unit