new parser for lp files

src/common/error.ml

@@ -73,4 +73,5 @@ let handle_exceptions : (unit -> unit) -> unit = fun f ->
   try f () with
   | Fatal(None,    msg) -> exit_with "%s" msg
   | Fatal(Some(p), msg) -> exit_with "[%a] %s" Pos.pp p msg
-  | e                   -> exit_with "Uncaught [%s]." (Printexc.to_string e)
+  | e                   ->
+      exit_with "Uncaught exception: %s" (Printexc.to_string e)

src/common/pos.ml

@@ -102,8 +102,8 @@ let to_string : ?print_fname:bool -> pos -> string =
 let popt_to_string : ?print_fname:bool -> popt -> string =
   fun ?(print_fname=true) pop ->
   match pop with
-    | None -> "Unknown location "
-    | Some (p) -> to_string ~print_fname p ^ " "
+    | None -> "Unknown location"
+    | Some (p) -> to_string ~print_fname p
 
 (** [pp ppf pos] prints the optional position [pos] on [ppf]. *)
 let pp : popt Lplib.Base.pp = fun ppf p ->

src/handle/command.ml

@@ -591,8 +591,8 @@ let get_proof_data : compiler -> sig_state -> p_command -> cmd_output =
   with
   | Timeout                as e -> raise e
   | Fatal(Some(Some(_)),_) as e -> raise e
-  | Fatal(None         ,m)      -> fatal pos "Error on command.@.%s" m
-  | Fatal(Some(None)   ,m)      -> fatal pos "Error on command.@.%s" m
+  | Fatal(None         ,m)      -> fatal pos "%s" m
+  | Fatal(Some(None)   ,m)      -> fatal pos "%s" m
   | e                           ->
       fatal pos "Uncaught exception: %s." (Printexc.to_string e)
 

src/handle/query.ml

@@ -159,7 +159,7 @@ let handle : Sig_state.t -> proof_state option -> p_query -> result =
   let ctxt = Env.to_ctxt env in
   let p = new_problem() in
   match elt with
-  | P_query_search s -> return string (Tool.Indexing.search_cmd_txt s)
+  | P_query_search q -> return string (Tool.Indexing.query_results q)
   | P_query_debug(_,_)
   | P_query_verbose(_)
   | P_query_flag(_,_)