From 03b7950e3639899de788cac8824a0e7f4be8a0bd Mon Sep 17 00:00:00 2001
From: Ziv Scully <ziv@mit.edu>
Date: Tue, 7 Jul 2015 00:07:24 -0700
Subject: Add limited support for parsing SQL arithmetic.

---
 src/sqlcache.sml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/sqlcache.sml')

diff --git a/src/sqlcache.sml b/src/sqlcache.sml
index d5f6c1c0..5f737ac5 100644
--- a/src/sqlcache.sml
+++ b/src/sqlcache.sml
@@ -410,15 +410,13 @@ structure ConflictMaps = struct
         List.foldr (fn (SOME eqs, SOME acc) => SOME (IM.unionWith #1 (eqs, acc)) | _ => NONE)
                    (SOME IM.empty)
 
+    val simplify =
+        map TS.listItems
+        o removeRedundant (fn (x, y) => TS.isSubset (y, x))
+        o map (fn xs => TS.addList (TS.empty, xs))
+
     fun dnf (fQuery, fDml) =
-        let
-            val simplify =
-                map TS.listItems
-                o removeRedundant (fn (x, y) => TS.isSubset (y, x))
-                o map (fn xs => TS.addList (TS.empty, xs))
-        in
-            normalize simplify negateCmp Disj (Combo (Conj, [markQuery fQuery, markDml fDml]))
-        end
+        normalize simplify negateCmp Disj (Combo (Conj, [markQuery fQuery, markDml fDml]))
 
     val conflictMaps = List.mapPartial (mergeEqs o map eqsOfClass o equivClasses) o dnf
 
-- 
cgit v1.2.3