Mercurial > urweb
diff src/sqlcache.sml @ 2239:f70a91f7810d
Add limited support for parsing SQL arithmetic.
| author | Ziv Scully <ziv@mit.edu> |
|---|---|
| date | Tue, 07 Jul 2015 00:07:24 -0700 |
| parents | e79ef5792c8b |
| children | 88cc0f44c940 |
line wrap: on
line diff
--- a/src/sqlcache.sml Mon Jul 06 01:31:04 2015 -0700 +++ b/src/sqlcache.sml Tue Jul 07 00:07:24 2015 -0700 @@ -410,15 +410,13 @@ 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