new parser for lp files

src/common/logger.ml

@@ -32,9 +32,11 @@ let update_log_enabled () =
 
 (** [make key name desc] registers a new logger and returns its pp. *)
 let make logger_key logger_name logger_desc =
+
   (* Sanity checks. *)
   if String.length logger_name <> 4 then
     invalid_arg "Logger.make: name must be 4 characters long";
+
   let check data =
     if logger_key  = data.logger_key then
       invalid_arg "Logger.make: key is already used";
@@ -44,6 +46,7 @@ let make logger_key logger_name logger_desc =
   List.iter check Stdlib.(!loggers);
 
   let logger_enabled = ref false in
+
   (* Actual printing function. *)
   let pp fmt =
     Color.update_with_color Stdlib.(!Error.err_fmt);

src/common/pos.ml

@@ -88,13 +88,11 @@ let to_string : ?print_dirname:bool -> ?print_fname:bool -> pos -> string =
   fun ?(print_dirname=true) ?(print_fname=true)
     {fname; start_line; start_col; end_line; end_col} ->
   let fname =
-    if not print_fname then "" else
-    match fname with
-    | None    -> ""
-    | Some(n) ->
-        if print_dirname then n ^ ":"
-        else
-          Filename.basename n ^ ":"
+    if print_fname then
+      match fname with
+      | None -> ""
+      | Some n -> (if print_dirname then n else Filename.basename n) ^ ":"
+    else ""
   in
   if start_line <> end_line then
     Printf.sprintf "%s%d:%d-%d:%d" fname start_line start_col end_line end_col

src/handle/command.ml

@@ -625,8 +625,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

@@ -184,9 +184,9 @@ 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 ->
+  | P_query_search q ->
       let dbpath = Path.default_dbpath in
-      return string (Tool.Indexing.search_cmd_txt ss s ~dbpath)
+      return string (Tool.Indexing.search_cmd_txt_query ss q ~dbpath)
   | P_query_debug(_,_)
   | P_query_verbose(_)
   | P_query_flag(_,_)

src/handle/tactic.ml

@@ -314,8 +314,7 @@ let p_term_of_string (pos:popt) (t:term): p_term =
       begin
         let string = remove_quotes s.sym_name in
         let fname = match pos with Some{fname=Some fn;_} -> fn | _ -> "" in
-        let stream = Parsing.Parser.Lp.parse_term_string fname string in
-        try Stream.next stream with Stream.Failure -> assert false
+        Parsing.Parser.Lp.parse_term_string fname string
       end
   | _ -> fatal pos "refine tactic not applied to a term string literal"
 
@@ -325,11 +324,8 @@ let p_rw_patt_of_string (pos:popt) (t:term): p_rw_patt option =
       let string = remove_quotes s.sym_name in
       if string = "" then None
       else
-        begin
-          let fname = match pos with Some{fname=Some fn;_} -> fn | _ -> "" in
-          let stream = Parsing.Parser.Lp.parse_rwpatt_string fname string in
-          try Some (Stream.next stream) with Stream.Failure -> assert false
-        end
+        let fname = match pos with Some{fname=Some fn;_} -> fn | _ -> "" in
+        Some (Parsing.Parser.Lp.parse_rwpatt_string fname string)
   | _ -> fatal pos "rewrite tactic not applied to a pattern string literal"
 
 let is_right (pos:popt) (t:term): bool =
@@ -703,7 +699,7 @@ let handle :
     ps, Query.handle ss (Some ps) q
   | _ ->
   match ps.proof_goals with
-  | [] -> fatal pos "No remaining goals."
+  | [] -> fatal pos "No remaining goal."
   | g::_ ->
     if Logger.log_enabled() then
       log ("Goal %a%a") Goal.pp_no_hyp g Pretty.tactic tac;