[MLton-commit] r7338

[Wesley Terpstra]

A commit too soon.


----------------------------------------------------------------------

U   mlton/trunk/package/mingw/dirs2wix.sml
U   mlton/trunk/package/mingw/files2cmp.sml
U   mlton/trunk/package/mingw/files2wix.sml

----------------------------------------------------------------------

Modified: mlton/trunk/package/mingw/dirs2wix.sml
===================================================================
--- mlton/trunk/package/mingw/dirs2wix.sml	2009-11-02 00:14:50 UTC (rev 7337)
+++ mlton/trunk/package/mingw/dirs2wix.sml	2009-11-02 00:16:23 UTC (rev 7338)
@@ -10,7 +10,7 @@
 
 fun hash (c, w) = w * 0w5746711073709751657 + Word64.fromInt (Char.ord c)
 fun alnum c = if Char.isAlphaNum c orelse c = #"." then c else #"_"
-fun trim s = if String.size s > 40 then String.sub (s, 0, 40) else s
+fun trim s = if String.size s > 40 then String.substring (s, 0, 40) else s
 fun escape s = Word64.toString (foldl hash 0w0 (explode s)) ^ "." ^ 
                trim (CharVector.map alnum (#file (OS.Path.splitDirFile s)))
 

Modified: mlton/trunk/package/mingw/files2cmp.sml
===================================================================
--- mlton/trunk/package/mingw/files2cmp.sml	2009-11-02 00:14:50 UTC (rev 7337)
+++ mlton/trunk/package/mingw/files2cmp.sml	2009-11-02 00:16:23 UTC (rev 7338)
@@ -16,7 +16,7 @@
 
 fun hash (c, w) = w * 0w5746711073709751657 + Word64.fromInt (Char.ord c)
 fun alnum c = if Char.isAlphaNum c orelse c = #"." then c else #"_"
-fun trim s = if String.size s > 40 then String.sub (s, 0, 40) else s
+fun trim s = if String.size s > 40 then String.substring (s, 0, 40) else s
 fun escape s = Word64.toString (foldl hash 0w0 (explode s)) ^ "." ^ 
                trim (CharVector.map alnum (#file (OS.Path.splitDirFile s)))
 

Modified: mlton/trunk/package/mingw/files2wix.sml
===================================================================
--- mlton/trunk/package/mingw/files2wix.sml	2009-11-02 00:14:50 UTC (rev 7337)
+++ mlton/trunk/package/mingw/files2wix.sml	2009-11-02 00:16:23 UTC (rev 7338)
@@ -8,7 +8,7 @@
 
 fun hash (c, w) = w * 0w5746711073709751657 + Word64.fromInt (Char.ord c)
 fun alnum c = if Char.isAlphaNum c orelse c = #"." then c else #"_"
-fun trim s = if String.size s > 40 then String.sub (s, 0, 40) else s
+fun trim s = if String.size s > 40 then String.substring (s, 0, 40) else s
 fun escape s = Word64.toString (foldl hash 0w0 (explode s)) ^ "." ^ 
                trim (CharVector.map alnum (#file (OS.Path.splitDirFile s)))