[MLton-commit] r6643

[Matthew Fluet]

Updates from trunk to compile with more recent trunk builds
----------------------------------------------------------------------

U   mlton/branches/shared-heap-multicore/Makefile
U   mlton/branches/shared-heap-multicore/lib/mlton/basic/int-inf.sig
U   mlton/branches/shared-heap-multicore/lib/mlton/basic/int.sml
U   mlton/branches/shared-heap-multicore/lib/mlton/basic/integer.sig
U   mlton/branches/shared-heap-multicore/lib/mlton/basic/process.sml

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

Modified: mlton/branches/shared-heap-multicore/Makefile
===================================================================
--- mlton/branches/shared-heap-multicore/Makefile	2008-06-05 05:12:53 UTC (rev 6642)
+++ mlton/branches/shared-heap-multicore/Makefile	2008-06-05 19:39:00 UTC (rev 6643)
@@ -17,7 +17,7 @@
 INC := $(LIB)/include
 COMP := $(SRC)/mlton
 RUN := $(SRC)/runtime
-MLTON := $(BIN)/multimlton
+MLTON := $(BIN)/mlton
 AOUT := mlton-compile
 ifeq (mingw, $(TARGET_OS))
 EXE := .exe
@@ -102,7 +102,7 @@
 
 .PHONY: compiler
 compiler:
-	$(MAKE) -C "$(COMP)" MLTON=$(MLTON)
+	$(MAKE) -C "$(COMP)"
 	$(CP) "$(COMP)/$(AOUT)$(EXE)" "$(LIB)/"
 
 .PHONY: constants

Modified: mlton/branches/shared-heap-multicore/lib/mlton/basic/int-inf.sig
===================================================================
--- mlton/branches/shared-heap-multicore/lib/mlton/basic/int-inf.sig	2008-06-05 05:12:53 UTC (rev 6642)
+++ mlton/branches/shared-heap-multicore/lib/mlton/basic/int-inf.sig	2008-06-05 19:39:00 UTC (rev 6643)
@@ -14,7 +14,7 @@
 
       val andb: t * t -> t
       val hash: t -> word
-      val log2: t -> int
+      val log2: t -> Int.t
       val maxPow2ThatDivides: t -> word
       val notb: t -> t
       val orb: t * t -> t

Modified: mlton/branches/shared-heap-multicore/lib/mlton/basic/int.sml
===================================================================
--- mlton/branches/shared-heap-multicore/lib/mlton/basic/int.sml	2008-06-05 05:12:53 UTC (rev 6642)
+++ mlton/branches/shared-heap-multicore/lib/mlton/basic/int.sml	2008-06-05 19:39:00 UTC (rev 6643)
@@ -9,8 +9,6 @@
    sig
       include INTEGER
 
-      type int
-
       val maxInt: t
       val minInt: t
       val roundDownToPowerOfTwo: t -> t

Modified: mlton/branches/shared-heap-multicore/lib/mlton/basic/integer.sig
===================================================================
--- mlton/branches/shared-heap-multicore/lib/mlton/basic/integer.sig	2008-06-05 05:12:53 UTC (rev 6642)
+++ mlton/branches/shared-heap-multicore/lib/mlton/basic/integer.sig	2008-06-05 19:39:00 UTC (rev 6643)
@@ -48,6 +48,7 @@
 signature INTEGER =
    sig
       include EUCLIDEAN_RING
+      type int = t
 
       val < : t * t -> bool
       val <= : t * t -> bool

Modified: mlton/branches/shared-heap-multicore/lib/mlton/basic/process.sml
===================================================================
--- mlton/branches/shared-heap-multicore/lib/mlton/basic/process.sml	2008-06-05 05:12:53 UTC (rev 6642)
+++ mlton/branches/shared-heap-multicore/lib/mlton/basic/process.sml	2008-06-05 19:39:00 UTC (rev 6643)
@@ -1,4 +1,4 @@
-(* Copyright (C) 1999-2005 Henry Cejtin, Matthew Fluet, Suresh
+(* Copyright (C) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh
  *    Jagannathan, and Stephen Weeks.
  *
  * MLton is released under a BSD-style license.
@@ -18,11 +18,9 @@
    let
       val status = OS.Process.system s
    in
-      if status = OS.Process.success
+      if OS.Process.isSuccess status
          then ()
-      else if status = OS.Process.failure
-              then Error.bug (concat ["Process.system: command failed: ", s])
-           else Error.bug (concat ["Process.system: strange return: ", s])
+      else Error.bug (concat ["Process.system: command failed: ", s])
    end
 
 structure Command =