From c4aba7a0befd9988ae032c5532790e5fabb321b9 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Tue, 9 Apr 2019 15:33:45 -0400 Subject: Urlify unit values as underscores, to avoid confusing parser --- src/cjr_print.sml | 2 +- src/mono_fooify.sml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cjr_print.sml b/src/cjr_print.sml index d7416616..5ef891db 100644 --- a/src/cjr_print.sml +++ b/src/cjr_print.sml @@ -952,7 +952,7 @@ fun unurlify fromClient env (t, loc) = newline, string ":", space, - string ("(uw_error(ctx, FATAL, \"Error unurlifying list: %s\", request), NULL))));"), + string ("(uw_error(ctx, FATAL, \"Error unurlifying list: %s\", *request), NULL))));"), newline], string "}", newline, diff --git a/src/mono_fooify.sml b/src/mono_fooify.sml index e64207cd..9cb14400 100644 --- a/src/mono_fooify.sml +++ b/src/mono_fooify.sml @@ -165,12 +165,12 @@ fun fooifyExpWithExceptions fk lookupENamed lookupDatatype = end | _ => case t of - TFfi ("Basis", "unit") => ((EPrim (Prim.String (Prim.Normal, "")), loc), fm) + TFfi ("Basis", "unit") => ((EPrim (Prim.String (Prim.Normal, "_")), loc), fm) | TFfi (m, x) => (if Settings.mayClientToServer (m, x) then ((EFfiApp (m, fk2s fk ^ "ify" ^ capitalize x, [(e, tAll)]), loc), fm) else raise CantPass (fm, tAll)) - | TRecord [] => ((EPrim (Prim.String (Prim.Normal, "")), loc), fm) + | TRecord [] => ((EPrim (Prim.String (Prim.Normal, "_")), loc), fm) | TRecord ((x, t) :: xts) => let val (se, fm) = fooify fm ((EField (e, x), loc), t) -- cgit v1.2.3