b0f1696b1307 — Chris Cannam 6 years ago
Minor fixes we lost earlier
2 files changed, 7 insertions(+), 7 deletions(-)

M bitmapped-vector.sml
M list-trie-map-fn.sml
M bitmapped-vector.sml +1 -1
@@ 42,7 42,7 @@ structure BitWord32 :> BIT_VECTOR = stru
     exception UnsupportedLength
 
     fun new n = if n = 32
-                then 0w0
+                then Word32.fromInt 0
                 else raise UnsupportedLength
 
     fun length _ = 32

          
M list-trie-map-fn.sml +6 -6
@@ 124,15 124,15 @@ functor ListTrieMapFn (M : LIST_TRIE_NOD
         rev (foldliPrefixMatch (fn (k, v, acc) => (k, v) :: acc) [] (trie, e))
 
     fun foldliPatternMatch f acc (node, p) =
-        let fun fold' (acc, pfx, NODE (NONE, _), []) = acc
-              | fold' (acc, pfx, NODE (SOME v, _), []) = f (rev pfx, v, acc)
-              | fold' (acc, pfx, NODE (_, vec), NONE::xs) =
-                M.foldli (fn (x, n, acc) => fold' (acc, x :: pfx, n, xs))
+        let fun fold' (acc, rpfx, NODE (NONE, _), []) = acc
+              | fold' (acc, rpfx, NODE (SOME v, _), []) = f (rev rpfx, v, acc)
+              | fold' (acc, rpfx, NODE (_, vec), NONE::xs) =
+                M.foldli (fn (x, n, acc) => fold' (acc, x :: rpfx, n, xs))
                          acc vec
-              | fold' (acc, pfx, NODE (_, vec), (SOME x)::xs) =
+              | fold' (acc, rpfx, NODE (_, vec), (SOME x)::xs) =
                 case M.find (vec, x) of
                     NONE => acc
-                  | SOME nsub => fold' (acc, x :: pfx, nsub, xs)
+                  | SOME nsub => fold' (acc, x :: rpfx, nsub, xs)
         in
             fold' (acc, [], node, p)
         end