[ parser_util ] remove spare unit argument in Location.to_string

Author: bobatkey

parser_util/driver.ml

@@ -8,7 +8,7 @@ let string_of_error (location, message, lexeme) =
 let string_of_error_with_location (location, message, lexeme) =
   match lexeme with
   | "" -> Printf.sprintf "At the end of the input, %s" message
-  | _ -> Printf.sprintf "On the input '%s' at %s, %s" lexeme (Location.to_string () location) message
+  | _ -> Printf.sprintf "On the input '%s' at %s, %s" lexeme (Location.to_string location) message
 
 module type PARSER = sig
   type token

parser_util/location.ml

@@ -11,21 +11,22 @@ let generated = Generated
 
 open Lexing
 
-let to_string () = function
-  | Generated -> "<generated>"
-  | FromSource { loc_start; loc_end } when loc_start.pos_lnum = loc_end.pos_lnum
-    ->
-      Printf.sprintf "line %d, characters %d-%d"
-        loc_start.pos_lnum
-        (loc_start.pos_cnum - loc_start.pos_bol)
-        (loc_end.pos_cnum - loc_end.pos_bol)
+let to_string = function
+  | Generated ->
+     "<generated>"
+  | FromSource { loc_start; loc_end }
+       when loc_start.pos_lnum = loc_end.pos_lnum ->
+     Printf.sprintf "line %d, characters %d-%d"
+       loc_start.pos_lnum
+       (loc_start.pos_cnum - loc_start.pos_bol)
+       (loc_end.pos_cnum - loc_end.pos_bol)
   | FromSource { loc_start; loc_end } ->
-      Printf.sprintf
-        "file %S, line %d, character %d, to line %d, character %d, "
-        loc_start.pos_fname loc_start.pos_lnum
-        (loc_start.pos_cnum - loc_start.pos_bol)
-        loc_end.pos_lnum
-        (loc_end.pos_cnum - loc_end.pos_bol)
+     Printf.sprintf
+       "file %S, line %d, character %d, to line %d, character %d, "
+       loc_start.pos_fname loc_start.pos_lnum
+       (loc_start.pos_cnum - loc_start.pos_bol)
+       loc_end.pos_lnum
+       (loc_end.pos_cnum - loc_end.pos_bol)
 
 let pp fmt = function
   | Generated -> Format.pp_print_string fmt "<generated>"

parser_util/location.mli

@@ -5,4 +5,4 @@ val of_lexbuf : Lexing.lexbuf -> t
 val generated : t
 val pp : Format.formatter -> t -> unit
 val pp_without_filename : Format.formatter -> t -> unit
-val to_string : unit -> t -> string
+val to_string : t -> string

slakemoth/bin/main.ml

@@ -9,8 +9,8 @@ let handle_errors = function
      Printf.eprintf "ERROR: %s\n" (Parser_util.Driver.string_of_error err);
      exit 1
   | Error (`Type_error (location, msg)) ->
-     let msg = Printf.sprintf "Problem at %a: %s"
-                 Ast.Location.to_string location
+     let msg = Printf.sprintf "Problem at %s: %s"
+                 (Ast.Location.to_string location)
                  msg
      in
      prerr_endline msg;

slakemoth/lib/core/type_checker.ml

@@ -353,9 +353,9 @@ let check_arg_specs global_env arg_specs =
   in
   match check_duplicates names with
   | Some (duplicate, location1, location2) ->
-     errorf location1 "Parameter name '%s' already used at %a"
+     errorf location1 "Parameter name '%s' already used at %s"
        duplicate
-       Location.to_string location2
+       (Location.to_string location2)
   | None ->
      Ok ()
 
@@ -411,10 +411,10 @@ let check_declaration (env, commands) = function
                     constructor_domains)
            | existing_domain, previous_location ->
               errorf constructor.location
-                "Constructor '%s' previously defined in domain '%s' at %a"
+                "Constructor '%s' previously defined in domain '%s' at %s"
                 constructor.detail
                 existing_domain
-                Location.to_string previous_location)
+                (Location.to_string previous_location))
          env.constructor_domains
          constructors
      in

slakemoth/widget/slakemoth_widget.ml

@@ -125,8 +125,8 @@ let component configuration =
             | Ok commands ->
                Ok commands
             | Error (`Type_error (location, msg)) ->
-               Error (Printf.sprintf "Problem at %a: %s"
-                        Ast.Location.to_string location
+               Error (Printf.sprintf "Problem at %s: %s"
+                        (Ast.Location.to_string location)
                         msg))
         | Error (`Parse err) ->
            Error (Parser_util.Driver.string_of_error err)