♻️ {P_update, P_retry} = {P_succ}

Zeta611 · Feb 24, 2025 · 60d07a4 · 60d07a4
1 parent c957ff1
commit 60d07a4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/domains/concrete_domains.ml b/lib/domains/concrete_domains.ml
@@ -37,7 +37,7 @@ module M : Domains.S = struct
     and view_spec = Vs_null | Vs_int of int | Vs_comp of comp_spec
     [@@deriving sexp_of]
 
-    type phase = P_init | P_update | P_retry | P_effect [@@deriving sexp_of]
+    type phase = P_init | P_succ | P_effect [@@deriving sexp_of]
     type decision = Idle | Retry | Update [@@deriving sexp_of]
 
     type part_view =
@@ -227,7 +227,7 @@ module M : Domains.S = struct
   end
 
   module Phase = struct
-    type t = phase = P_init | P_update | P_retry | P_effect [@@deriving equal]
+    type t = phase = P_init | P_succ | P_effect [@@deriving equal]
 
     let ( = ) = equal
     let ( <> ) p1 p2 = not (p1 = p2)

diff --git a/lib/domains/domains.ml b/lib/domains/domains.ml
@@ -34,7 +34,7 @@ module type T = sig
   and comp_spec = { comp : Prog.comp; env : env; arg : value }
   and view_spec = Vs_null | Vs_int of int | Vs_comp of comp_spec
 
-  type phase = P_init | P_update | P_retry | P_effect
+  type phase = P_init | P_succ | P_effect
   type decision = Idle | Retry | Update
 
   type part_view =

diff --git a/lib/interp.ml b/lib/interp.ml
@@ -213,7 +213,7 @@ let rec eval : type a. a Expr.t -> value =
           in
           perform (Update_st (path, label, (v, Job_q.empty)));
           perform (In_env env) eval body
-      | P_update | P_retry ->
+      | P_succ ->
           let v_old, q = perform (Lookup_st (path, label)) in
           (* Run the setting thunks in the set queue *)
           let v =
@@ -314,7 +314,7 @@ let rec eval_mult : type a. ?re_render:int -> a Expr.t -> value =
                ( path,
                  { ent with part_view = Node { node with eff_q = Job_q.empty } }
                )));
-      ptph_h ~ptph:(path, P_retry) (eval_mult ~re_render) expr
+      ptph_h ~ptph:(path, P_succ) (eval_mult ~re_render) expr
   | Idle | Update -> v
 
 let alloc_tree (vs : view_spec) : tree =
@@ -398,7 +398,7 @@ let rec update (path : Path.t) (arg : value option) : bool =
             perform (Set_arg (path, arg));
             let env = Env.extend env ~id:param ~value:arg in
             let vss =
-              (eval_mult |> env_h ~env |> ptph_h ~ptph:(path, P_update)) body
+              (eval_mult |> env_h ~env |> ptph_h ~ptph:(path, P_succ)) body
               |> vss_of_value_exn
             in