Mercurial > urweb

comparison 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
comparison
equal deleted inserted replaced
2260:03b10c7fab9a 2261:f81f1930c5d6
4342 L.CRecord (_, xts) => 4342 L.CRecord (_, xts) =>
4343 let 4343 let
4344 val (nullable, notNullable) = calcClientish xts 4344 val (nullable, notNullable) = calcClientish xts
4345 4345
4346 fun cond (x, v) = 4346 fun cond (x, v) =
4347 (L'.EStrcat (str (Settings.mangleSql x 4347 (L'.EStrcat ((L'.EStrcat (str ("(("
4348 ^ (case v of 4348 ^ Settings.mangleSql x
4349 Client => "" 4349 ^ (case v of
4350 | Channel => " >> 32") 4350 Client => ""
4351 ^ " = "), 4351 | Channel => " >> 32")
4352 target), loc) 4352 ^ ") = "),
4353 target), loc),
4354 str ")"), loc)
4353 4355
4354 val e = 4356 val e =
4355 foldl (fn ((x, v), e) => 4357 foldl (fn ((x, v), e) =>
4356 (L'.ESeq ( 4358 (L'.ESeq (
4357 (L'.EDml ((L'.EStrcat ( 4359 (L'.EDml ((L'.EStrcat (
4488 val monoFile = (rev ds, []) 4490 val monoFile = (rev ds, [])
4489 in 4491 in
4490 pvars := RM.empty; 4492 pvars := RM.empty;
4491 pvarDefs := []; 4493 pvarDefs := [];
4492 pvarOldDefs := []; 4494 pvarOldDefs := [];
4493 MonoFooify.canonicalFm := Fm.empty (MonoUtil.File.maxName monoFile); 4495 MonoFooify.canonicalFm := Fm.empty (MonoUtil.File.maxName monoFile + 1);
4494 monoFile 4496 monoFile
4495 end 4497 end
4496 4498
4497 end 4499 end