From 543a7ba61425250f90630f576f17c669ff80c6bd Mon Sep 17 00:00:00 2001
From: Jon French
Date: Fri, 28 Jun 2019 11:11:56 +0100
Subject: ToFromInterp backend: always wrap typ arg values in a function, fixes
 option types in riscv

---
 src/toFromInterp_backend.ml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/toFromInterp_backend.ml b/src/toFromInterp_backend.ml
index fad45412..49739c30 100644
--- a/src/toFromInterp_backend.ml
+++ b/src/toFromInterp_backend.ml
@@ -95,7 +95,7 @@ let frominterp_typedef (TD_aux (td_aux, (l, _))) =
     | _ -> string ("NEXP(" ^ string_of_nexp nexp ^ ")")
   in
   let rec fromValueTypArg (A_aux (a_aux, _)) = match a_aux with
-    | A_typ typ -> fromValueTyp typ ""
+    | A_typ typ -> parens ((string "fun v -> ") ^^ parens (fromValueTyp typ "v"))
     | A_nexp nexp -> fromValueNexp nexp
     | A_order order -> string ("Order_" ^ (string_of_order order))
     | A_bool _ -> parens (string "boolFromInterpValue")
@@ -250,7 +250,7 @@ let tointerp_typedef (TD_aux (td_aux, (l, _))) =
     | _ -> string ("NEXP(" ^ string_of_nexp nexp ^ ")")
   in
   let rec toValueTypArg (A_aux (a_aux, _)) = match a_aux with
-    | A_typ typ -> toValueTyp typ ""
+    | A_typ typ -> parens ((string "fun v -> ") ^^ parens (toValueTyp typ "v"))
     | A_nexp nexp -> toValueNexp nexp
     | A_order order -> string ("Order_" ^ (string_of_order order))
     | A_bool _ -> parens (string "boolToInterpValue") 
-- 
cgit v1.2.3