diff options
| author |  Ziv Scully <ziv@mit.edu> | 2015-09-21 16:45:59 -0400 |
|---|---|---|
| committer | Ziv Scully <ziv@mit.edu> | 2015-09-21 16:45:59 -0400 |
| commit | 97115c5f804824c024a0c08c288889d29f743e64 (patch) | |
| tree | 751344ca31d2f79493c53ea4c1bd00b22f1082cc /src/mono_util.sml | |
| parent | 59c69b0cebc215599acc25906bd0366af03abf0c (diff) | |
Use new refactored urlification in Sqlcache.
Diffstat (limited to 'src/mono_util.sml')
| -rw-r--r-- | src/mono_util.sml | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/mono_util.sml b/src/mono_util.sml index ba10ad32..5d7eb164 100644 --- a/src/mono_util.sml +++ b/src/mono_util.sml @@ -314,7 +314,7 @@ fun mapfoldB {typ = fc, exp = fe, bind} = fn es' => (EClosure (n, es'), loc)) - | EQuery {exps, tables, state, query, body, initial, sqlcacheInfo} => + | EQuery {exps, tables, state, query, body, initial} => S.bind2 (ListUtil.mapfold (fn (x, t) => S.map2 (mft t, fn t' => (x, t'))) exps, @@ -335,19 +335,15 @@ fun mapfoldB {typ = fc, exp = fe, bind} = body, fn body' => (* ASK: is this the right thing to do? *) - S.bind2 (mfe ctx initial, + S.map2 (mfe ctx initial, fn initial' => - S.map2 (mfe (bind (ctx, RelE ("queryResult", dummyt))) - sqlcacheInfo, - fn sqlcacheInfo' => - (EQuery {exps = exps', - tables = tables', - state = state', - query = query', - body = body', - initial = initial', - sqlcacheInfo = sqlcacheInfo}, - loc)))))))) + (EQuery {exps = exps', + tables = tables', + state = state', + query = query', + body = body', + initial = initial'}, + loc))))))) | EDml (e, fm) => S.map2 (mfe ctx e, |