diff src/iflow.sml @ 2255:8428c534913a

Use new refactored urlification in Sqlcache.
author Ziv Scully <ziv@mit.edu>
date Mon, 21 Sep 2015 16:45:59 -0400
parents e843a04499d4
children 6fb9232ade99
line wrap: on
line diff
--- a/src/iflow.sml	Mon Sep 21 16:07:35 2015 -0400
+++ b/src/iflow.sml	Mon Sep 21 16:45:59 2015 -0400
@@ -1870,15 +1870,14 @@
                                         case e of
                                             EDml (e, fm) =>
                                             nameSubexps (fn (_, e') => (EDml (e', fm), #2 e)) e
-                                          | EQuery {exps, tables, state, query, body, initial, sqlcacheInfo} =>
+                                          | EQuery {exps, tables, state, query, body, initial} =>
                                             nameSubexps (fn (liftBy, e') =>
                                                             (EQuery {exps = exps,
                                                                      tables = tables,
                                                                      state = state,
                                                                      query = e',
                                                                      body = mliftExpInExp liftBy 2 body,
-                                                                     initial = mliftExpInExp liftBy 0 initial,
-                                                                     sqlcacheInfo = sqlcacheInfo},
+                                                                     initial = mliftExpInExp liftBy 0 initial},
                                                              #2 query)) query
                                           | _ => e,
                                      decl = fn d => d}
@@ -2071,12 +2070,11 @@
                           | ESeq (e1, e2) => (ESeq (doExp env e1, doExp env e2), loc)
                           | ELet (x, t, e1, e2) => (ELet (x, t, doExp env e1, doExp (Unknown :: env) e2), loc)
                           | EClosure (n, es) => (EClosure (n, map (doExp env) es), loc)
-                          | EQuery {exps, tables, state, query, body, initial, sqlcacheInfo} =>
+                          | EQuery {exps, tables, state, query, body, initial} =>
                             (EQuery {exps = exps, tables = tables, state = state,
                                      query = doExp env query,
                                      body = doExp (Unknown :: Unknown :: env) body,
-                                     initial = doExp env initial,
-                                     sqlcacheInfo = sqlcacheInfo}, loc)
+                                     initial = doExp env initial}, loc)
                           | EDml (e1, mode) =>
                             (case parse dml e1 of
                                  NONE => ()