Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make sanity_check pass #1072

Merged
merged 1 commit into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/export/coq.ml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ let set_erasing : string -> unit = fun f ->
let id = snd lp_qid.elt in
if Logger.log_enabled() then log "erase %s" id;
erase := StrSet.add id !erase;
map_erased_qid_coq := QidMap.add lp_qid.elt coq_id !map_erased_qid_coq;
map_erased_qid_coq :=
QidMap.add lp_qid.elt coq_id !map_erased_qid_coq;
if fst lp_qid.elt = [] && id <> coq_id then
rmap := StrMap.add id coq_id !rmap
| {pos;_} -> fatal pos "Invalid command."
Expand Down
3 changes: 2 additions & 1 deletion src/export/rawdk.ml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ let rec remove_wraps ({elt;_} as t) =
let rule : p_rule pp =
let varset ppf set = List.pp string ", " ppf (StrSet.elements set) in
fun ppf {elt=(l,r);_} ->
out ppf "[%a] %a --> %a.@." varset (pvars_lhs l) term (remove_wraps l) term r
out ppf "[%a] %a --> %a.@."
varset (pvars_lhs l) term (remove_wraps l) term r

let partition_modifiers ms =
let ms = List.map (fun {elt;_} -> elt) ms in
Expand Down
8 changes: 4 additions & 4 deletions src/handle/command.ml
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,8 @@ let get_proof_data : compiler -> sig_state -> p_command -> cmd_output =
wrn pe.pos "Proof admitted.";
(* Keep the definition only if the symbol is not opaque. *)
let d =
if opaq then None
else Option.map (fun m -> unfold (mk_Meta(m,[||]))) ps.proof_term
if opaq then None else
Option.map (fun m -> unfold (mk_Meta(m,[||]))) ps.proof_term
in
(* Add the symbol in the signature. *)
fst (Sig_state.add_symbol
Expand All @@ -527,8 +527,8 @@ let get_proof_data : compiler -> sig_state -> p_command -> cmd_output =
fatal pe.pos "The proof is not finished:@.%a" goals ps;
(* Keep the definition only if the symbol is not opaque. *)
let d =
if opaq then None
else Option.map (fun m -> unfold (mk_Meta(m,[||]))) ps.proof_term
if opaq then None else
Option.map (fun m -> unfold (mk_Meta(m,[||]))) ps.proof_term
in
(* Add the symbol in the signature. *)
Console.out 2 (Color.red "symbol %a : %a") uid id term a;
Expand Down
6 changes: 3 additions & 3 deletions src/handle/tactic.ml
Original file line number Diff line number Diff line change
Expand Up @@ -383,9 +383,9 @@ let rec handle :
| Typ gt::_ ->
Why3_tactic.handle ss pos cfg gt; tac_admit ss sym_pos ps gt
| _ -> assert false)
| P_tac_try tactic ->
try handle ss sym_pos prv ps tactic
with Fatal(_, _s) -> ps
| P_tac_try tactic ->
try handle ss sym_pos prv ps tactic
with Fatal(_, _s) -> ps

(** Representation of a tactic output. *)
type tac_output = proof_state * Query.result
Expand Down
2 changes: 1 addition & 1 deletion src/parsing/pretty.ml
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ let rec tactic : p_tactic pp = fun ppf { elt; _ } ->
| P_tac_simpl (Some qid) -> out ppf "simplify %a" qident qid
| P_tac_solve -> out ppf "solve"
| P_tac_sym -> out ppf "symmetry"
| P_tac_try t -> out ppf "try %a" tactic t
| P_tac_try t -> out ppf "try %a" tactic t
| P_tac_why3 p ->
let prover ppf s = out ppf " \"%s\"" s in
out ppf "why3%a" (Option.pp prover) p
Expand Down