Clean up & comment a bit.

1 files changed, 32 insertions, 1 deletions

diff --git a/abstract/varenv.ml b/abstract/varenv.ml
index 4d6caca..cf29edf 100644
--- a/abstract/varenv.ml
+++ b/abstract/varenv.ml
@@ -25,6 +25,37 @@ type varenv = {
 
 
 
+
+(*
+    Extract variables accessed by a LAST
+*)
+
+let rec extract_last_vars = function
+  | BRel(_, a, b, _) ->
+      elv_ne a @ elv_ne b
+  | BEnumCons c ->
+      elv_ec c
+  | BAnd(a, b) | BOr (a, b) ->
+    extract_last_vars a @ extract_last_vars b
+  | BNot(e) -> extract_last_vars e
+  | BTernary(c, a, b) -> extract_last_vars c @ 
+      extract_last_vars a @ extract_last_vars b
+  | _ -> []
+
+and elv_ne = function
+  | NIdent i when i.[0] = 'L' -> [i]
+  | NBinary(_, a, b, _) -> elv_ne a @ elv_ne b
+  | NUnary (_, a, _) -> elv_ne a
+  | _ -> []
+
+and elv_ec (_, v, q) =
+  (if v.[0] = 'L' then [v] else []) @
+  (match q with
+    | EIdent i when i.[0] = 'L' -> [i]
+    | _ -> [])
+
+
+
 (*
   extract_linked_evars : conslist -> (id * id) list
 
@@ -200,7 +231,7 @@ let force_ordering vars groups =
 let mk_varenv (rp : rooted_prog) f cl =
     (* add variables from LASTs *)
     let last_vars = uniq_sorted 
-      (List.sort compare (Transform.extract_last_vars f)) in
+      (List.sort compare (extract_last_vars f)) in
     let last_vars = List.map
       (fun id ->
         let (_, _, ty) = List.find (fun (_, u, _) -> id = "L"^u) rp.all_vars