simon/sidekick
1
0
Fork 0
mirror of https://github.com/c-cube/sidekick.git synced 2026-01-28 04:14:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: small changes

Browse source
This commit is contained in:
Simon Cruanes 2018-07-02 18:55:36 -05:00
parent bf70f9688d
commit 74cd2009a3
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/smt/Congruence_closure.ml
View file

@ -102,7 +102,7 @@ let[@inline] false_ cc = cc.false_
let[@inline] get_ cc (t:term) : node = let[@inline] get_ cc (t:term) : node =
try Term.Tbl.find cc.tbl t try Term.Tbl.find cc.tbl t
with Not_found -> with Not_found ->
Log.debugf 5 (fun k->k "(@[<hv1>missing@ %a@])" Term.pp t); Log.debugf 1 (fun k->k "(@[<hv1>cc.error: missing@ %a@])" Term.pp t);
assert false assert false
(* non-recursive, inlinable function for [find] *) (* non-recursive, inlinable function for [find] *)
@ -172,8 +172,15 @@ let rec reroot_expl (cc:t) (n:node): unit =
n.n_expl <- E_none; n.n_expl <- E_none;
end end
let[@inline] raise_conflict (cc:t) (e:conflict): _ = let raise_conflict (cc:t) (e:conflict): _ =
let (module A) = cc.acts in let (module A) = cc.acts in
(* clear tasks queue *)
Vec.iter
(function
| T_pending n -> Equiv_class.set_field Equiv_class.field_is_pending false n
| T_merge _ -> ())
cc.tasks;
Vec.clear cc.tasks;
A.raise_conflict e A.raise_conflict e
let[@inline] all_classes cc : repr Sequence.t = let[@inline] all_classes cc : repr Sequence.t =
@ -403,7 +410,7 @@ and notify_merge cc (ra:repr) ~into:(rb:repr) (e:explanation): unit =
(* add [t] to [cc] when not present already *) (* add [t] to [cc] when not present already *)
and add_new_term_ cc (t:term) : node = and add_new_term_ cc (t:term) : node =
assert (not @@ mem cc t); assert (not @@ mem cc t);
Log.debugf 15 (fun k->k "(@[cc.add_term@ %a@])" Term.pp t); Log.debugf 15 (fun k->k "(@[cc.add-term@ %a@])" Term.pp t);
let n = Equiv_class.make t in let n = Equiv_class.make t in
(* how to add a subterm *) (* how to add a subterm *)
let add_to_parents_of_sub_node (sub:node) : unit = let add_to_parents_of_sub_node (sub:node) : unit =