Menu
▾
▴
[MLton-commit] r4346
|
From: Matthew F. <fl...@ml...> - 2006-02-04 21:18:32
|
Merge trunk revisions 4290:4345 into x86_64 branch
----------------------------------------------------------------------
U mlton/branches/on-20050822-x86_64-branch/benchmark/main.sml
U mlton/branches/on-20050822-x86_64-branch/lib/basis-stubs/basis-2002.sml
U mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs/sources.cm
U mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/other.sml
U mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/pervasive.sml
U mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/sources.cm
U mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/substring.sml
U mlton/branches/on-20050822-x86_64-branch/mlton/elaborate/elaborate-env.fun
----------------------------------------------------------------------
Modified: mlton/branches/on-20050822-x86_64-branch/benchmark/main.sml
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/benchmark/main.sml 2006-02-05 05:10:42 UTC (rev 4345)
+++ mlton/branches/on-20050822-x86_64-branch/benchmark/main.sml 2006-02-05 05:18:28 UTC (rev 4346)
@@ -267,7 +267,7 @@
(fn e =>
let
val originalDbase = "/usr/lib/poly/ML_dbase"
- val poly = "poly"
+ val poly = "/usr/bin/poly"
in File.withTemp
(fn dbase =>
let
@@ -286,7 +286,7 @@
withInput
(input, fn () =>
timeIt (Explicit {args = [dbase],
- com = "poly"})))
+ com = poly})))
val after = File.size dbase
in
if original = after
Modified: mlton/branches/on-20050822-x86_64-branch/lib/basis-stubs/basis-2002.sml
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/lib/basis-stubs/basis-2002.sml 2006-02-05 05:10:42 UTC (rev 4345)
+++ mlton/branches/on-20050822-x86_64-branch/lib/basis-stubs/basis-2002.sml 2006-02-05 05:18:28 UTC (rev 4346)
@@ -31,8 +31,6 @@
structure Math = Math
structure OS = OS
structure Option = Option
- structure Pack32Big = Pack32Big
- structure Pack32Little = Pack32Little
structure Position = Position
structure Posix = Posix
structure Real = Real
Modified: mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs/sources.cm
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs/sources.cm 2006-02-05 05:10:42 UTC (rev 4345)
+++ mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs/sources.cm 2006-02-05 05:18:28 UTC (rev 4346)
@@ -39,8 +39,6 @@
structure MLton
structure OS
structure Option
-structure Pack32Big
-structure Pack32Little
structure Position
structure Posix
structure Real
Modified: mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/other.sml
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/other.sml 2006-02-05 05:10:42 UTC (rev 4345)
+++ mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/other.sml 2006-02-05 05:18:28 UTC (rev 4346)
@@ -15,8 +15,6 @@
structure ListPair = ListPair
structure Math = Math
structure Option = Option
-structure Pack32Big = Pack32Big
-structure Pack32Little = Pack32Little
structure SML90 = SML90
structure SMLofNJ = SMLofNJ
structure Unix = Unix
Modified: mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/pervasive.sml
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/pervasive.sml 2006-02-05 05:10:42 UTC (rev 4345)
+++ mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/pervasive.sml 2006-02-05 05:18:28 UTC (rev 4346)
@@ -32,8 +32,6 @@
structure Math = Math
structure Option = Option
structure OS = OS
- structure Pack32Big = Pack32Big
- structure Pack32Little = Pack32Little
structure Position = Position
structure Posix = Posix
structure Real = Real
Modified: mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/sources.cm
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/sources.cm 2006-02-05 05:10:42 UTC (rev 4345)
+++ mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/sources.cm 2006-02-05 05:18:28 UTC (rev 4346)
@@ -41,8 +41,6 @@
structure MLton
structure OS
structure Option
-structure Pack32Big
-structure Pack32Little
structure Position
structure Posix
structure Real
Modified: mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/substring.sml
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/substring.sml 2006-02-05 05:10:42 UTC (rev 4345)
+++ mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs-in-smlnj/substring.sml 2006-02-05 05:18:28 UTC (rev 4346)
@@ -10,8 +10,6 @@
struct
open OpenInt32 Substring
- val full = all
-
fun base ss =
let val (s, i, j) = Substring.base ss
in (s, fromInt i, fromInt j)
Modified: mlton/branches/on-20050822-x86_64-branch/mlton/elaborate/elaborate-env.fun
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/mlton/elaborate/elaborate-env.fun 2006-02-05 05:10:42 UTC (rev 4345)
+++ mlton/branches/on-20050822-x86_64-branch/mlton/elaborate/elaborate-env.fun 2006-02-05 05:18:28 UTC (rev 4346)
@@ -3155,10 +3155,11 @@
fun loop cs =
case cs of
[] => Error.bug "ElaborateEnv.functorClosure: missing firstTycon"
- | c :: cs =>
- if Tycon.equals (c, firstTycon)
- then cs
- else loop cs
+ | c :: cs' =>
+ if Tycon.equals (c, firstTycon) then
+ cs
+ else
+ loop cs'
in
loop (!allTycons)
end
|
