diff options
| author |  Ziv Scully <ziv@mit.edu> | 2014-09-13 19:16:07 -0400 |
|---|---|---|
| committer | Ziv Scully <ziv@mit.edu> | 2014-09-13 19:16:07 -0400 |
| commit | a7bfe57a2a355c5362d33e993394aa0bac300360 (patch) | |
| tree | 1f81b256828f90ff34656d7d8fe703ce13d22e48 /src/sql.sml | |
| parent | 6b6635f390cc072971dcc7b37af00bca21c48364 (diff) | |
| parent | 5d2d4930568267b0e205ece3d4908cdc7ff715a1 (diff) | |
Merge.
Diffstat (limited to 'src/sql.sml')
| -rw-r--r-- | src/sql.sml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sql.sml b/src/sql.sml index 11df715c..8d245660 100644 --- a/src/sql.sml +++ b/src/sql.sml @@ -47,7 +47,7 @@ datatype chunk = 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 @@ val prim = (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 @@ fun sqlify chs = 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 |