Mercurial > urweb
diff src/sql.sml @ 2211:ef766ef6e242
Merge.
| author | Ziv Scully <ziv@mit.edu> |
|---|---|
| date | Sat, 13 Sep 2014 19:16:07 -0400 |
| parents | 0ca11d57c175 4d64af730e35 |
| children | 365727ff68f4 |
line wrap: on
line diff
--- a/src/sql.sml Sat May 31 22:23:25 2014 -0400 +++ b/src/sql.sml Sat Sep 13 19:16:07 2014 -0400 @@ -47,7 +47,7 @@ fun chunkify e = case #1 e of - EPrim (Prim.String s) => [String s] + EPrim (Prim.String (_, s)) => [String s] | EStrcat (e1, e2) => let val chs1 = chunkify e1 @@ -248,7 +248,7 @@ (Option.map Prim.Int o Int64.fromString)) (opt (const "::int8"))) #1, wrap (follow (opt (const "E")) (follow string (opt (const "::text")))) - (Prim.String o #1 o #2)] + ((fn s => Prim.String (Prim.Normal, s)) o #1 o #2)] fun known' chs = case chs of @@ -263,9 +263,9 @@ else NONE | Exp (ECase (e, [((PCon (_, PConFfi {mod = "Basis", con = "True", ...}, NONE), _), - (EPrim (Prim.String "TRUE"), _)), + (EPrim (Prim.String (Prim.Normal, "TRUE")), _)), ((PCon (_, PConFfi {mod = "Basis", con = "False", ...}, NONE), _), - (EPrim (Prim.String "FALSE"), _))], _), _) :: chs => + (EPrim (Prim.String (Prim.Normal, "FALSE")), _))], _), _) :: chs => SOME (e, chs) | _ => NONE