[sledge] Refactor: Rename Formula.true_ and false_ to tt and ff

Reviewed By: ngorogiannis

Differential Revision: D22170510

fbshipit-source-id: 68f9581a6
master
Josh Berdine 4 years ago committed by Facebook GitHub Bot
parent 8d2bb0ddcf
commit 94e8b07997

@ -96,6 +96,8 @@ module Formula = struct
let inject b = b let inject b = b
let project e = Some e let project e = Some e
let tt = true_
let ff = false_
let of_exp e = let of_exp e =
let b = Term.of_exp e in let b = Term.of_exp e in

@ -131,8 +131,8 @@ and Formula : sig
(** Construct *) (** Construct *)
(* constants *) (* constants *)
val true_ : t val tt : t
val false_ : t val ff : t
(* comparisons *) (* comparisons *)
val eq : Term.t -> Term.t -> t val eq : Term.t -> Term.t -> t

@ -33,7 +33,7 @@ let emp =
{ us= Var.Set.empty { us= Var.Set.empty
; xs= Var.Set.empty ; xs= Var.Set.empty
; ctx= Context.true_ ; ctx= Context.true_
; pure= Formula.true_ ; pure= Formula.tt
; heap= [] ; heap= []
; djns= [] } ; djns= [] }
@ -508,7 +508,7 @@ let or_ q1 q2 =
{ us= Var.Set.union q1.us q2.us { us= Var.Set.union q1.us q2.us
; xs= Var.Set.empty ; xs= Var.Set.empty
; ctx= Context.true_ ; ctx= Context.true_
; pure= Formula.true_ ; pure= Formula.tt
; heap= [] ; heap= []
; djns= [[q1; q2]] } ) ; djns= [[q1; q2]] } )
|> |>
@ -553,7 +553,7 @@ let subst sub q =
[%Trace.call fun {pf} -> pf "@[%a@]@ %a" Var.Subst.pp sub pp q] [%Trace.call fun {pf} -> pf "@[%a@]@ %a" Var.Subst.pp sub pp q]
; ;
let dom, eqs = let dom, eqs =
Var.Subst.fold sub ~init:(Var.Set.empty, Formula.true_) Var.Subst.fold sub ~init:(Var.Set.empty, Formula.tt)
~f:(fun var trm (dom, eqs) -> ~f:(fun var trm (dom, eqs) ->
( Var.Set.add dom var ( Var.Set.add dom var
, Formula.and_ (Formula.eq (Term.var var) (Term.var trm)) eqs ) ) , Formula.and_ (Formula.eq (Term.var var) (Term.var trm)) eqs ) )

@ -154,7 +154,7 @@ let excise_exists goal =
let solutions_for_xs = let solutions_for_xs =
let xs = let xs =
Var.Set.diff goal.xs Var.Set.diff goal.xs
(Sh.fv ~ignore_ctx:() (Sh.with_pure Formula.true_ goal.sub)) (Sh.fv ~ignore_ctx:() (Sh.with_pure Formula.tt goal.sub))
in in
Context.solve_for_vars [Var.Set.empty; goal.us; xs] goal.sub.ctx Context.solve_for_vars [Var.Set.empty; goal.us; xs] goal.sub.ctx
in in

Loading…
Cancel
Save