Remove more stuff

Author: cknitt

compiler/jsoo/jsoo_playground_main.ml

@@ -242,7 +242,7 @@ module ResDriver = struct
       {loc_start = start_pos; Location.loc_end = end_pos; loc_ghost = false}
     in
     let err = {Location.loc; msg; sub = []; if_highlight = ""} in
-    Location.default_error_reporter ~src:(Some src) Format.str_formatter err;
+    Location.report_error ~src:(Some src) Format.str_formatter err;
     Format.flush_str_formatter ()
 
   let parse_implementation ~sourcefile ~for_printer ~src =

compiler/ml/env.ml

@@ -1035,10 +1035,6 @@ let rec lookup_module_descr_aux ?loc lid env =
 and lookup_module_descr ?loc lid env =
   let ((p, comps) as res) = lookup_module_descr_aux ?loc lid env in
   mark_module_used env (Path.last p) comps.loc;
-  (*
-  Format.printf "USE module %s at %a@." (Path.last p)
-    Location.print comps.loc;
-*)
   report_deprecated ?loc p comps.deprecated;
   res
 

compiler/ml/location.ml

@@ -231,7 +231,7 @@ let error_of_exn exn =
 
 (* taken from https://github.com/rescript-lang/ocaml/blob/d4144647d1bf9bc7dc3aadc24c25a7efa3a67915/parsing/location.ml#L380 *)
 (* This is the error report entry point. We'll replace the default reporter with this one. *)
-let rec default_error_reporter ?(src = None) ppf {loc; msg; sub} =
+let rec report_error ?(src = None) ppf {loc; msg; sub} =
   setup_colors ();
   (* open a vertical box. Everything in our message is indented 2 spaces *)
   (* If src is given, it will display a syntax error after parsing. *)
@@ -243,13 +243,9 @@ let rec default_error_reporter ?(src = None) ppf {loc; msg; sub} =
   Format.fprintf ppf "@[<v>@,  %a@,  %s@,@]"
     (print ~src ~message_kind:`error intro)
     loc msg;
-  List.iter (Format.fprintf ppf "@,@[%a@]" (default_error_reporter ~src)) sub
+  List.iter (Format.fprintf ppf "@,@[%a@]" (report_error ~src)) sub
 (* no need to flush here; location's report_exception (which uses this ultimately) flushes *)
 
-let error_reporter = ref default_error_reporter
-
-let report_error ?(src = None) ppf err = !error_reporter ~src ppf err
-
 let error_of_printer loc print x = errorf ~loc "%a@?" print x
 
 let error_of_printer_file print x =

compiler/ml/location.mli

@@ -57,13 +57,6 @@ type 'a loc = {txt: 'a; loc: t}
 val mknoloc : 'a -> 'a loc
 val mkloc : 'a -> t -> 'a loc
 
-val print :
-  ?src:string option ->
-  message_kind:[< `error | `warning | `warning_as_error > `warning] ->
-  string ->
-  formatter ->
-  t ->
-  unit
 val print_filename : formatter -> string -> unit
 
 val show_filename : string -> string
@@ -112,12 +105,6 @@ val register_error_of_exn : (exn -> error option) -> unit
 
 val report_error : ?src:string option -> formatter -> error -> unit
 
-val error_reporter : (?src:string option -> formatter -> error -> unit) ref
-(** Hook for intercepting error reports. *)
-
-val default_error_reporter : ?src:string option -> formatter -> error -> unit
-(** Original error reporter for use in hooks. *)
-
 val report_exception : formatter -> exn -> unit
 (** Reraise the exception if it is unknown. *)
 

compiler/ml/syntaxerr.ml

@@ -15,66 +15,6 @@
 
 (* Auxiliary type for reporting syntax errors *)
 
-type error =
-  | Unclosed of Location.t * string * Location.t * string
-  | Expecting of Location.t * string
-  | Not_expecting of Location.t * string
-  | Applicative_path of Location.t
-  | Variable_in_scope of Location.t * string
-  | Other of Location.t
-  | Ill_formed_ast of Location.t * string
-  | Invalid_package_type of Location.t * string
+type error = Variable_in_scope of Location.t * string
 
 exception Error of error
-exception Escape_error
-
-let prepare_error = function
-  | Unclosed (opening_loc, opening, closing_loc, closing) ->
-    Location.errorf ~loc:closing_loc
-      ~sub:
-        [
-          Location.errorf ~loc:opening_loc "This '%s' might be unmatched" opening;
-        ]
-      ~if_highlight:
-        (Printf.sprintf
-           "Syntax error: '%s' expected, the highlighted '%s' might be \
-            unmatched"
-           closing opening)
-      "Syntax error: '%s' expected" closing
-  | Expecting (loc, nonterm) ->
-    Location.errorf ~loc "Syntax error: %s expected." nonterm
-  | Not_expecting (loc, nonterm) ->
-    Location.errorf ~loc "Syntax error: %s not expected." nonterm
-  | Applicative_path loc ->
-    Location.errorf ~loc
-      "Syntax error: applicative paths of the form F(X).t are not supported \
-       when the option -no-app-func is set."
-  | Variable_in_scope (loc, var) ->
-    Location.errorf ~loc
-      "In this scoped type, variable '%s is reserved for the local type %s." var
-      var
-  | Other loc -> Location.errorf ~loc "Syntax error"
-  | Ill_formed_ast (loc, s) ->
-    Location.errorf ~loc "broken invariant in parsetree: %s" s
-  | Invalid_package_type (loc, s) ->
-    Location.errorf ~loc "invalid package type: %s" s
-
-let () =
-  Location.register_error_of_exn (function
-    | Error err -> Some (prepare_error err)
-    | _ -> None)
-
-let report_error ppf err = Location.report_error ppf (prepare_error err)
-
-let location_of_error = function
-  | Unclosed (l, _, _, _)
-  | Applicative_path l
-  | Variable_in_scope (l, _)
-  | Other l
-  | Not_expecting (l, _)
-  | Ill_formed_ast (l, _)
-  | Invalid_package_type (l, _)
-  | Expecting (l, _) ->
-    l
-
-let ill_formed_ast loc s = raise (Error (Ill_formed_ast (loc, s)))

compiler/ml/syntaxerr.mli

@@ -15,23 +15,6 @@
 
 (** Auxiliary type for reporting syntax errors *)
 
-open Format
-
-type error =
-  | Unclosed of Location.t * string * Location.t * string
-  | Expecting of Location.t * string
-  | Not_expecting of Location.t * string
-  | Applicative_path of Location.t
-  | Variable_in_scope of Location.t * string
-  | Other of Location.t
-  | Ill_formed_ast of Location.t * string
-  | Invalid_package_type of Location.t * string
+type error = Variable_in_scope of Location.t * string
 
 exception Error of error
-exception Escape_error
-
-val report_error : formatter -> error -> unit
-(** @deprecated Use {!Location.error_of_exn}, {!Location.report_error}. *)
-
-val location_of_error : error -> Location.t
-val ill_formed_ast : Location.t -> string -> 'a