comparison src/jscomp.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
comparison
equal deleted inserted replaced
2254:44ae2254f8fb 2255:8428c534913a
1176 val (es, st) = ListUtil.foldlMap (exp outer) st es 1176 val (es, st) = ListUtil.foldlMap (exp outer) st es
1177 in 1177 in
1178 ((EClosure (n, es), loc), st) 1178 ((EClosure (n, es), loc), st)
1179 end 1179 end
1180 1180
1181 | EQuery {exps, tables, state, query, body, initial, sqlcacheInfo} => 1181 | EQuery {exps, tables, state, query, body, initial} =>
1182 let 1182 let
1183 val row = exps @ map (fn (x, xts) => (x, (TRecord xts, loc))) tables 1183 val row = exps @ map (fn (x, xts) => (x, (TRecord xts, loc))) tables
1184 val row = ListMergeSort.sort (fn ((x, _), (y, _)) => String.compare (x, y) = GREATER) row 1184 val row = ListMergeSort.sort (fn ((x, _), (y, _)) => String.compare (x, y) = GREATER) row
1185 val row = (TRecord row, loc) 1185 val row = (TRecord row, loc)
1186 1186
1187 val (query, st) = exp outer (query, st) 1187 val (query, st) = exp outer (query, st)
1188 val (body, st) = exp (state :: row :: outer) (body, st) 1188 val (body, st) = exp (state :: row :: outer) (body, st)
1189 val (initial, st) = exp outer (initial, st) 1189 val (initial, st) = exp outer (initial, st)
1190 in 1190 in
1191 ((EQuery {exps = exps, tables = tables, state = state, 1191 ((EQuery {exps = exps, tables = tables, state = state,
1192 query = query, body = body, initial = initial, 1192 query = query, body = body, initial = initial}, loc), st)
1193 sqlcacheInfo = sqlcacheInfo}, loc), st)
1194 end 1193 end
1195 | EDml (e, mode) => 1194 | EDml (e, mode) =>
1196 let 1195 let
1197 val (e, st) = exp outer (e, st) 1196 val (e, st) = exp outer (e, st)
1198 in 1197 in