diff options
| author | Sidney Congard | 2022-07-13 15:56:24 +0200 |
|---|---|---|
| committer | Sidney Congard | 2022-07-13 15:56:24 +0200 |
| commit | 8f14d69ae6683e58e1387ffe38ca3612e0530465 (patch) | |
| tree | f028dcaba398cc5815875b2235dedfb167b7e912 /src/InterpreterExpressions.ml | |
| parent | eebedf86db68c240fe16cfd74af2cc462b0d9cf9 (diff) | |
Apply small changes from the PR
Diffstat (limited to '')
| -rw-r--r-- | src/InterpreterExpressions.ml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/InterpreterExpressions.ml b/src/InterpreterExpressions.ml index 04ad1b3c..4598895e 100644 --- a/src/InterpreterExpressions.ml +++ b/src/InterpreterExpressions.ml @@ -110,13 +110,13 @@ let access_rplace_reorganize (config : C.config) (expand_prim_copy : bool) ctx (** Convert an operand constant operand value to a typed value *) -let typecheck_constant_value (ty : T.ety) +let constant_to_typed_value (ty : T.ety) (cv : V.constant_value) : V.typed_value = (* Check the type while converting - we actually need some information * contained in the type *) log#ldebug (lazy - ("typecheck_constant_value:" ^ "\n- cv: " + ("constant_to_typed_value:" ^ "\n- cv: " ^ PV.constant_value_to_string cv)); match (ty, cv) with (* Scalar, boolean... *) @@ -175,7 +175,8 @@ let prepare_eval_operand_reorganize (config : C.config) (op : E.operand) : fun cf ctx -> match op with | Expressions.Constant (ty, cv) -> - typecheck_constant_value ty cv |> ignore; + (* No need to reorganize the context *) + constant_to_typed_value ty cv |> ignore; cf ctx | Expressions.Copy p -> (* Access the value *) @@ -203,7 +204,7 @@ let eval_operand_no_reorganize (config : C.config) (op : E.operand) ^ "\n- ctx:\n" ^ eval_ctx_to_string ctx ^ "\n")); (* Evaluate *) match op with - | Expressions.Constant (ty, cv) -> cf (typecheck_constant_value ty cv) ctx + | Expressions.Constant (ty, cv) -> cf (constant_to_typed_value ty cv) ctx | Expressions.Copy p -> (* Access the value *) let access = Read in |