simon/sidekick
1
0
Fork 0
mirror of https://github.com/c-cube/sidekick.git synced 2025-12-06 11:15:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(tvar): remove redundant has_value bitvec

Browse source
This commit is contained in:
Simon Cruanes 2022-11-08 11:46:46 -05:00
parent 1153c21a52
commit 3412b272fb
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cdsat/TVar.ml
View file

@ -25,7 +25,6 @@ type store = {
value: Value.t option Vec.t; value: Value.t option Vec.t;
reason: reason Vec.t; reason: reason Vec.t;
theory_views: theory_view Vec.t; theory_views: theory_view Vec.t;
has_value: Bitvec.t;
new_vars: Vec_of.t; (* TODO: a recycle vec to reuse identifiers *) new_vars: Vec_of.t; (* TODO: a recycle vec to reuse identifiers *)
} }
@ -40,7 +39,6 @@ let new_var_ (self : store) ~term:(term_for_v : Term.t) ~theory_view () : t =
value; value;
reason; reason;
theory_views; theory_views;
has_value;
new_vars; new_vars;
} = } =
self self
@ -51,22 +49,21 @@ let new_var_ (self : store) ~term:(term_for_v : Term.t) ~theory_view () : t =
(* fake *) (* fake *)
Vec.push reason dummy_reason_; Vec.push reason dummy_reason_;
Vec.push theory_views theory_view; Vec.push theory_views theory_view;
Bitvec.ensure_size has_value (v + 1);
Bitvec.set has_value v false;
Vec_of.push new_vars v; Vec_of.push new_vars v;
v v
let[@inline] get_of_term (self : store) (t : Term.t) : t option = let[@inline] get_of_term (self : store) (t : Term.t) : t option =
Term.Weak_map.find_opt self.of_term t Term.Weak_map.find_opt self.of_term t
let[@inline] has_value (self : store) (v : t) : bool =
Bitvec.get self.has_value v
let[@inline] equal (a : t) (b : t) = a = b let[@inline] equal (a : t) (b : t) = a = b
let[@inline] compare (a : t) (b : t) = compare a b let[@inline] compare (a : t) (b : t) = compare a b
let[@inline] hash (a : t) = CCHash.int a let[@inline] hash (a : t) = CCHash.int a
let[@inline] level (self : store) (v : t) : int = Veci.get self.level v let[@inline] level (self : store) (v : t) : int = Veci.get self.level v
let[@inline] value (self : store) (v : t) : _ option = Vec.get self.value v let[@inline] value (self : store) (v : t) : _ option = Vec.get self.value v
let[@inline] has_value (self : store) (v : t) : bool =
Option.is_some (value self v)
let[@inline] theory_view (self : store) (v : t) = Vec.get self.theory_views v let[@inline] theory_view (self : store) (v : t) = Vec.get self.theory_views v
let[@inline] bool_value (self : store) (v : t) : _ option = let[@inline] bool_value (self : store) (v : t) : _ option =
@ -113,7 +110,6 @@ module Store = struct
level = Veci.create (); level = Veci.create ();
value = Vec.create (); value = Vec.create ();
theory_views = Vec.create (); theory_views = Vec.create ();
has_value = Bitvec.create ();
new_vars = Vec_of.create (); new_vars = Vec_of.create ();
} }
end end

1
src/cdsat/watch_schemes.ml
View file

@ -133,6 +133,7 @@ struct
(* update a single watch *) (* update a single watch *)
let update1 (self : t) (h : handle) (w : watch) ~updated_var ~f : let update1 (self : t) (h : handle) (w : watch) ~updated_var ~f :
watch_update_res = watch_update_res =
assert (TVar.has_value self.vst updated_var);
match w with match w with
| No_watch -> Watch_remove | No_watch -> Watch_remove
| _ when not (alive self h) -> Watch_remove | _ when not (alive self h) -> Watch_remove