Mercurial > urweb

diff src/monoize.sml @ 2261:f81f1930c5d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix SQL-parsing and declaration-ordering bugs.
author Ziv Scully <ziv@mit.edu>
date Wed, 30 Sep 2015 00:33:52 -0400
parents 6f2ea4ed573a
children bbcf9ba9b39a
line wrap: on
line diff
--- a/src/monoize.sml	Mon Sep 28 22:16:51 2015 -0400
+++ b/src/monoize.sml	Wed Sep 30 00:33:52 2015 -0400
@@ -4344,12 +4344,14 @@
                             val (nullable, notNullable) = calcClientish xts
 
                             fun cond (x, v) =
-                                (L'.EStrcat (str (Settings.mangleSql x
-                                                  ^ (case v of
-                                                         Client => ""
-                                                       | Channel => " >> 32")
-                                                  ^ " = "),
-                                             target), loc)
+                                (L'.EStrcat ((L'.EStrcat (str ("(("
+                                                               ^ Settings.mangleSql x
+                                                               ^ (case v of
+                                                                      Client => ""
+                                                                    | Channel => " >> 32")
+                                                               ^ ") = "),
+                                                          target), loc),
+                                             str ")"), loc)
 
                             val e =
                                 foldl (fn ((x, v), e) =>
@@ -4490,7 +4492,7 @@
         pvars := RM.empty;
         pvarDefs := [];
         pvarOldDefs := [];
-        MonoFooify.canonicalFm := Fm.empty (MonoUtil.File.maxName monoFile);
+        MonoFooify.canonicalFm := Fm.empty (MonoUtil.File.maxName monoFile + 1);
         monoFile
     end