Ur/Web: src/jscomp.sml comparison

comparison src/jscomp.sml @ 2221:278e10629ba1

Basic field-resolution invalidation.

author	Ziv Scully <ziv@mit.edu>
date	Sat, 29 Nov 2014 03:37:59 -0500
parents	4d64af730e35
children	e10881cd92da

comparison

equal deleted inserted replaced

-:794017f378de
+:278e10629ba1
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 (EApp ((ENamed n', loc),
 (EField ((ERel 0, loc), "2"), loc)), loc),
 str loc "}"])],
 {disc = t, result = s}), loc)
 val body = (EAbs ("x", t, s, body), loc)
 val st = {decls = ("jsify", n', (TFun (t, s), loc),
 body, "jsify") :: #decls st,
 script = #script st,
 included = #included st,
 injectors = #injectors st,
 val (e, st) = jsExp mode [] (e, st)
 val e = deStrcat 0 e
 val e = String.translate (fn #"'" => "\\'"
 | #"\\" => "\\\\"
 | ch => String.str ch) e
 val sc = "urfuncs[" ^ Int.toString n ^ "] = {c:\"t\",f:'"
 ^ e ^ "'};\n"
 in
 (*Print.prefaces "jsify'" [("old", MonoPrint.p_exp MonoEnv.empty old),
 ("new", MonoPrint.p_exp MonoEnv.empty new)];*)
 end
 | EField (e', x) => seek (e', x :: xs)
 | _ => default ()
 in
 seek (e', [x])
 end
 | ECase (e', pes, _) =>
 let
 val (e', st) = jsE inner (e', st)
 | _ => ();
 (e, st))
 | ERel _ => (e, st)
 | ENamed _ => (e, st)
 | ECon (_, _, NONE) => (e, st)
 | ECon (dk, pc, SOME e) =>
 let
 val (e, st) = exp outer (e, st)
 in
 ((ECon (dk, pc, SOME e), loc), st)
 end
 val (e1, st) = exp outer (e1, st)
 val (e2, st) = exp outer (e2, st)
 in
 ((EBinop (bi, s, e1, e2), loc), st)
 end
 | ERecord xets =>
 let
 val (xets, st) = ListUtil.foldlMap (fn ((x, e, t), st) =>
 let
 val (e, st) = exp outer (e, st)
 val (es, st) = ListUtil.foldlMap (exp outer) st es
 in
 ((EClosure (n, es), loc), st)
 end
-| EQuery {exps, tables, state, query, body, initial} =>
+| EQuery {exps, tables, state, query, body, initial, sqlcacheInfo} =>
 let
 val row = exps @ map (fn (x, xts) => (x, (TRecord xts, loc))) tables
 val row = ListMergeSort.sort (fn ((x, _), (y, _)) => String.compare (x, y) = GREATER) row
 val row = (TRecord row, loc)
 val (query, st) = exp outer (query, st)
 val (body, st) = exp (state :: row :: outer) (body, st)
 val (initial, st) = exp outer (initial, st)
 in
 ((EQuery {exps = exps, tables = tables, state = state,
-query = query, body = body, initial = initial}, loc), st)
+query = query, body = body, initial = initial,
+sqlcacheInfo = sqlcacheInfo}, loc), st)
 end
 | EDml (e, mode) =>
 let
 val (e, st) = exp outer (e, st)
 in
 let
 val (e, st) = exp outer (e, st)
 in
 ((ESignalSource e, loc), st)
 end
 | EServerCall (e1, t, ef, fm) =>
 let
 val (e1, st) = exp outer (e1, st)
 in
 ((EServerCall (e1, t, ef, fm), loc), st)

Mercurial > urweb

comparison src/jscomp.sml @ 2221:278e10629ba1