From 09b5839acfe26561fa87c89168133fc93c1083cc Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Sat, 7 Jan 2012 15:56:22 -0500 Subject: First part of changes to avoid depending on C function call argument order of evaluation (omitting normal Ur function calls, so far) --- src/tag.sml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/tag.sml') diff --git a/src/tag.sml b/src/tag.sml index 26c23586..6037cb17 100644 --- a/src/tag.sml +++ b/src/tag.sml @@ -170,22 +170,22 @@ fun exp env (e, s) = end | _ => (e, s)) - | EFfiApp ("Basis", "url", [(ERel 0, _)]) => (e, s) + | EFfiApp ("Basis", "url", [((ERel 0, _), _)]) => (e, s) - | EFfiApp ("Basis", "url", [e]) => + | EFfiApp ("Basis", "url", [(e, t)]) => let val (e, s) = tagIt (e, Link, "Url", s) in - (EFfiApp ("Basis", "url", [e]), s) + (EFfiApp ("Basis", "url", [(e, t)]), s) end - | EFfiApp ("Basis", "effectfulUrl", [(ERel 0, _)]) => (e, s) + | EFfiApp ("Basis", "effectfulUrl", [((ERel 0, _), _)]) => (e, s) - | EFfiApp ("Basis", "effectfulUrl", [e]) => + | EFfiApp ("Basis", "effectfulUrl", [(e, t)]) => let val (e, s) = tagIt (e, Extern ReadCookieWrite, "Url", s) in - (EFfiApp ("Basis", "url", [e]), s) + (EFfiApp ("Basis", "url", [(e, t)]), s) end | EApp ((ENamed n, _), e') => @@ -193,11 +193,11 @@ fun exp env (e, s) = val (_, _, eo, _) = E.lookupENamed env n in case eo of - SOME (EAbs (_, _, _, (EFfiApp ("Basis", "url", [(ERel 0, _)]), _)), _) => + SOME (EAbs (_, _, _, (EFfiApp ("Basis", "url", [((ERel 0, _), t)]), _)), _) => let val (e, s) = tagIt (e', Link, "Url", s) in - (EFfiApp ("Basis", "url", [e]), s) + (EFfiApp ("Basis", "url", [(e, t)]), s) end | _ => (e, s) end -- cgit v1.2.3