simon/sidekick
1
0
Fork 0
mirror of https://github.com/c-cube/sidekick.git synced 2025-12-09 20:55:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(proof): rename defc to stepc

Browse source
This commit is contained in:
Simon Cruanes 2021-04-27 23:14:02 -04:00
parent d195a2fa87
commit 19e6f80b45
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/base-term/Proof.ml
View file

@ -17,11 +17,12 @@ let lit_not = function
| L_a t -> L_na t | L_a t -> L_na t
| L_na t -> L_a t | L_na t -> L_a t
let pp_lit out = function let pp_lit_with ~pp_t out = function
| L_eq (t,u) -> Fmt.fprintf out "(@[+@ (@[=@ %a@ %a@])@])" T.pp t T.pp u | L_eq (t,u) -> Fmt.fprintf out "(@[+@ (@[=@ %a@ %a@])@])" pp_t t pp_t u
| L_neq (t,u) -> Fmt.fprintf out "(@[-@ (@[=@ %a@ %a@])@])" T.pp t T.pp u | L_neq (t,u) -> Fmt.fprintf out "(@[-@ (@[=@ %a@ %a@])@])" pp_t t pp_t u
| L_a t -> Fmt.fprintf out "(@[+@ %a@])" T.pp t | L_a t -> Fmt.fprintf out "(@[+@ %a@])" pp_t t
| L_na t -> Fmt.fprintf out "(@[-@ %a@])" T.pp t | L_na t -> Fmt.fprintf out "(@[-@ %a@])" pp_t t
let pp_lit = pp_lit_with ~pp_t:Term.pp
let lit_a t = L_a t let lit_a t = L_a t
let lit_na t = L_na t let lit_na t = L_na t
@ -60,7 +61,7 @@ type t =
} }
and composite_step = and composite_step =
| S_define_c of { | S_step_c of {
name: string; (* name *) name: string; (* name *)
res: clause; (* result of [proof] *) res: clause; (* result of [proof] *)
proof: t; (* sub-proof *) proof: t; (* sub-proof *)
@ -81,7 +82,7 @@ let r1 p = R1 p
let p p ~lhs ~rhs : hres_step = P { p; lhs; rhs } let p p ~lhs ~rhs : hres_step = P { p; lhs; rhs }
let p1 p = P1 p let p1 p = P1 p
let defc ~name res proof : composite_step = S_define_c {proof;name;res} let stepc ~name res proof : composite_step = S_step_c {proof;name;res}
let deft c rhs : composite_step = S_define_t (c,rhs) let deft c rhs : composite_step = S_define_t (c,rhs)
let is_trivial_refl = function let is_trivial_refl = function

2
src/core/Sidekick_core.ml
View file

@ -178,7 +178,7 @@ module type PROOF = sig
val lit_not : lit -> lit val lit_not : lit -> lit
type composite_step type composite_step
val defc : name:string -> lit list -> t -> composite_step val stepc : name:string -> lit list -> t -> composite_step
val deft : term -> term -> composite_step (** define a (new) atomic term *) val deft : term -> term -> composite_step (** define a (new) atomic term *)
val is_trivial_refl : t -> bool val is_trivial_refl : t -> bool

4
src/msat-solver/Sidekick_msat_solver.ml
View file

@ -535,7 +535,7 @@ module Make(A : ARG)
Some pp Some pp
(* export to proof {!P.t}, translating Msat-level proof ising: (* export to proof {!P.t}, translating Msat-level proof ising:
- [defc name cl proof] to bind [name] to given clause and proof - [stepc name cl proof] to bind [name] to given clause and proof
- [deft name t] to define [name] as a shortcut for [t] (tseitin, etc.). - [deft name t] to define [name] as a shortcut for [t] (tseitin, etc.).
Checker will always expand these. (TODO) Checker will always expand these. (TODO)
- [steps <defc>+] for a structure proof with definitions, returning last one - [steps <defc>+] for a structure proof with definitions, returning last one
@ -622,7 +622,7 @@ module Make(A : ARG)
(Iter.of_list steps |> Iter.map tr_step) (Iter.of_list steps |> Iter.map tr_step)
in in
let step = P.defc ~name concl pr_step in let step = P.stepc ~name concl pr_step in
add_step step; add_step step;
) )
in in