From 97115c5f804824c024a0c08c288889d29f743e64 Mon Sep 17 00:00:00 2001
From: Ziv Scully <ziv@mit.edu>
Date: Mon, 21 Sep 2015 16:45:59 -0400
Subject: Use new refactored urlification in Sqlcache.

---
 src/mono_util.sml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'src/mono_util.sml')

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,
-- 
cgit v1.2.3