comparison src/mono_util.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
comparison
equal deleted inserted replaced
2254:44ae2254f8fb 2255:8428c534913a
312 | EClosure (n, es) => 312 | EClosure (n, es) =>
313 S.map2 (ListUtil.mapfold (mfe ctx) es, 313 S.map2 (ListUtil.mapfold (mfe ctx) es,
314 fn es' => 314 fn es' =>
315 (EClosure (n, es'), loc)) 315 (EClosure (n, es'), loc))
316 316
317 | EQuery {exps, tables, state, query, body, initial, sqlcacheInfo} => 317 | EQuery {exps, tables, state, query, body, initial} =>
318 S.bind2 (ListUtil.mapfold (fn (x, t) => 318 S.bind2 (ListUtil.mapfold (fn (x, t) =>
319 S.map2 (mft t, 319 S.map2 (mft t,
320 fn t' => (x, t'))) exps, 320 fn t' => (x, t'))) exps,
321 fn exps' => 321 fn exps' =>
322 S.bind2 (ListUtil.mapfold (fn (x, xts) => 322 S.bind2 (ListUtil.mapfold (fn (x, xts) =>
333 S.bind2 (mfe (bind (bind (ctx, RelE ("r", dummyt)), 333 S.bind2 (mfe (bind (bind (ctx, RelE ("r", dummyt)),
334 RelE ("acc", dummyt))) 334 RelE ("acc", dummyt)))
335 body, 335 body,
336 fn body' => 336 fn body' =>
337 (* ASK: is this the right thing to do? *) 337 (* ASK: is this the right thing to do? *)
338 S.bind2 (mfe ctx initial, 338 S.map2 (mfe ctx initial,
339 fn initial' => 339 fn initial' =>
340 S.map2 (mfe (bind (ctx, RelE ("queryResult", dummyt))) 340 (EQuery {exps = exps',
341 sqlcacheInfo, 341 tables = tables',
342 fn sqlcacheInfo' => 342 state = state',
343 (EQuery {exps = exps', 343 query = query',
344 tables = tables', 344 body = body',
345 state = state', 345 initial = initial'},
346 query = query', 346 loc)))))))
347 body = body',
348 initial = initial',
349 sqlcacheInfo = sqlcacheInfo},
350 loc))))))))
351 347
352 | EDml (e, fm) => 348 | EDml (e, fm) =>
353 S.map2 (mfe ctx e, 349 S.map2 (mfe ctx e,
354 fn e' => 350 fn e' =>
355 (EDml (e', fm), loc)) 351 (EDml (e', fm), loc))