From ec241ca38b763d29ab6ac51a601f9930bf47c5ea Mon Sep 17 00:00:00 2001
From: Son Ho
Date: Tue, 23 Nov 2021 23:04:02 +0100
Subject: Implement eval_operand

---
 src/Interpreter.ml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/Interpreter.ml b/src/Interpreter.ml
index 52e744ac..541e70d1 100644
--- a/src/Interpreter.ml
+++ b/src/Interpreter.ml
@@ -1228,7 +1228,7 @@ let constant_value_to_typed_value (ctx : eval_ctx) (ty : ety)
   | _, Unit | _, ConstantAdt _ | _, ConstantValue _ ->
       failwith "Improperly typed constant value"
 
-(*let eval_operand (config : config) (ctx : eval_ctx) (op : operand) :
+let eval_operand (config : config) (ctx : eval_ctx) (op : operand) :
     eval_ctx * typed_value =
   match op with
   | Expressions.Constant (ty, cv) ->
@@ -1240,7 +1240,7 @@ let constant_value_to_typed_value (ctx : eval_ctx) (ty : ety)
       let env1 = update_env_along_read_place config access p ctx.env in
       let env2 = collect_borrows_at_place config access p env1 in
       match read_place config access p env2 with
-      | Err _ -> failwith "Unreachable"
+      | Error _ -> failwith "Unreachable"
       | Ok v ->
           (* Copy the value *)
           assert (not (bottom_in_value v));
@@ -1252,14 +1252,16 @@ let constant_value_to_typed_value (ctx : eval_ctx) (ty : ety)
       let env1 = update_env_along_read_place config access p ctx.env in
       let env2 = collect_borrows_at_place config access p env1 in
       match read_place config access p env2 with
-      | Err _ -> failwith "Unreachable"
-      | Ok v ->
+      | Error _ -> failwith "Unreachable"
+      | Ok v -> (
           (* Move the value *)
           assert (not (bottom_in_value v));
           let bottom = { value = Bottom; ty = v.ty } in
-          let env3 = write_place config bottom p env2 in
-          let ctx3 = { ctx with env = env3 } in
-          (ctx3, v))*)
+          match write_place config bottom p env2 with
+          | Error _ -> failwith "Unreachable"
+          | Ok env3 ->
+              let ctx3 = { ctx with env = env3 } in
+              (ctx3, v)))
 
 (*
 let rec update_env_along_read_place (config : config) (access : access_kind)
-- 
cgit v1.2.3