From 6ef1bf7e2f1b7a0067169bf71860671f8b3f6bca Mon Sep 17 00:00:00 2001
From: Son Ho
Date: Thu, 6 Jan 2022 11:20:38 +0100
Subject: Cleanup and reorganize

---
 src/ValuesUtils.ml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/ValuesUtils.ml')

diff --git a/src/ValuesUtils.ml b/src/ValuesUtils.ml
index 488de15d..4a503a65 100644
--- a/src/ValuesUtils.ml
+++ b/src/ValuesUtils.ml
@@ -1,8 +1,14 @@
-module T = Types
 open TypesUtils
+open Types
 open Values
 
 let mk_unit_value : typed_value =
   { value = Adt { variant_id = None; field_values = [] }; ty = mk_unit_ty }
 
-let mk_typed_value (ty : T.ety) (value : value) : typed_value = { value; ty }
+let mk_typed_value (ty : ety) (value : value) : typed_value = { value; ty }
+
+(** Box a value *)
+let mk_box_value (v : typed_value) : typed_value =
+  let box_ty = mk_box_ty v.ty in
+  let box_v = Adt { variant_id = None; field_values = [ v ] } in
+  mk_typed_value box_ty box_v
-- 
cgit v1.2.3


From 3cadf01e5b67af4ec91f2de3c32e119cd90c678c Mon Sep 17 00:00:00 2001
From: Son Ho
Date: Thu, 6 Jan 2022 11:27:46 +0100
Subject: Move more definitions and do more cleanup

---
 src/ValuesUtils.ml | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'src/ValuesUtils.ml')

diff --git a/src/ValuesUtils.ml b/src/ValuesUtils.ml
index 4a503a65..f4a10287 100644
--- a/src/ValuesUtils.ml
+++ b/src/ValuesUtils.ml
@@ -1,3 +1,4 @@
+open Utils
 open TypesUtils
 open Types
 open Values
@@ -12,3 +13,48 @@ let mk_box_value (v : typed_value) : typed_value =
   let box_ty = mk_box_ty v.ty in
   let box_v = Adt { variant_id = None; field_values = [ v ] } in
   mk_typed_value box_ty box_v
+
+(** Check if a value contains a borrow *)
+let borrows_in_value (v : typed_value) : bool =
+  let obj =
+    object
+      inherit [_] iter_typed_value
+
+      method! visit_borrow_content _env _ = raise Found
+    end
+  in
+  (* We use exceptions *)
+  try
+    obj#visit_typed_value () v;
+    false
+  with Found -> true
+
+(** Check if a value contains inactivated mutable borrows *)
+let inactivated_in_value (v : typed_value) : bool =
+  let obj =
+    object
+      inherit [_] iter_typed_value
+
+      method! visit_InactivatedMutBorrow _env _ = raise Found
+    end
+  in
+  (* We use exceptions *)
+  try
+    obj#visit_typed_value () v;
+    false
+  with Found -> true
+
+(** Check if a value contains a loan *)
+let loans_in_value (v : typed_value) : bool =
+  let obj =
+    object
+      inherit [_] iter_typed_value
+
+      method! visit_loan_content _env _ = raise Found
+    end
+  in
+  (* We use exceptions *)
+  try
+    obj#visit_typed_value () v;
+    false
+  with Found -> true
-- 
cgit v1.2.3