Mercurial > urweb

diff src/sqlcache.sml @ 2240:88cc0f44c940

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename C functions and remove functors nested inside modules.
author Ziv Scully <ziv@mit.edu>
date Sun, 19 Jul 2015 19:03:11 -0700
parents f70a91f7810d
children da7d026d1a94
line wrap: on
line diff
--- a/src/sqlcache.sml	Tue Jul 07 00:07:24 2015 -0700
+++ b/src/sqlcache.sml	Sun Jul 19 19:03:11 2015 -0700
@@ -207,7 +207,7 @@
 
 (* SQL analysis. *)
 
-structure CmpKey : ORD_KEY = struct
+structure CmpKey = struct
 
     type ord_key = Sql.cmp
 
@@ -247,34 +247,6 @@
 end
 *)
 
-functor OptionKeyFn (K : ORD_KEY) : ORD_KEY = struct
-
-    type ord_key = K.ord_key option
-
-    val compare =
-     fn (NONE, NONE) => EQUAL
-      | (NONE, _) => LESS
-      | (_, NONE) => GREATER
-      | (SOME x, SOME y) => K.compare (x, y)
-
-end
-
-functor TripleKeyFn (structure I : ORD_KEY
-                     structure J : ORD_KEY
-                     structure K : ORD_KEY)
-        : ORD_KEY where type ord_key = I.ord_key * J.ord_key * K.ord_key = struct
-
-    type ord_key = I.ord_key * J.ord_key * K.ord_key
-
-    fun compare ((i1, j1, k1), (i2, j2, k2)) =
-        case I.compare (i1, i2) of
-            EQUAL => (case J.compare (j1, j2) of
-                          EQUAL => K.compare (k1, k2)
-                        | ord => ord)
-          | ord => ord
-
-end
-
 val rec chooseTwos : 'a list -> ('a * 'a) list =
  fn [] => []
   | x :: ys => map (fn y => (x, y)) ys @ chooseTwos ys