[MLton-commit] r6126

Vesa Karvonen vesak at mlton.org
Tue Nov 6 02:59:27 PST 2007


Updated to compile with a patched Poly/ML.
----------------------------------------------------------------------

U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/common/basis.sml
U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/basis.sml
U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlton/basis.sml
A   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/basis.sml
U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/extensions.use
A   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/univ.sml
U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/workarounds.use
U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/basis.sml
U   mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.use

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

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/common/basis.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/common/basis.sml	2007-11-06 10:58:18 UTC (rev 6125)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/common/basis.sml	2007-11-06 10:59:26 UTC (rev 6126)
@@ -11,10 +11,10 @@
  *)
 
 signature BASIS_ARRAY = ARRAY
-signature BASIS_ARRAY2 = ARRAY2
+(*signature BASIS_ARRAY2 = ARRAY2*)
 signature BASIS_ARRAY_SLICE = ARRAY_SLICE
 signature BASIS_BIN_IO = BIN_IO
-signature BASIS_BIT_FLAGS = BIT_FLAGS
+(*signature BASIS_BIT_FLAGS = BIT_FLAGS*)
 signature BASIS_BOOL = BOOL
 signature BASIS_BYTE = BYTE
 signature BASIS_CHAR = CHAR
@@ -47,15 +47,15 @@
 signature BASIS_OS_PROCESS = OS_PROCESS
 signature BASIS_PACK_REAL = PACK_REAL
 signature BASIS_PACK_WORD = PACK_WORD
-signature BASIS_POSIX = POSIX
-signature BASIS_POSIX_ERROR = POSIX_ERROR
-signature BASIS_POSIX_FILE_SYS = POSIX_FILE_SYS
-signature BASIS_POSIX_IO = POSIX_IO
-signature BASIS_POSIX_PROCESS = POSIX_PROCESS
+(*signature BASIS_POSIX = POSIX*)
+(*signature BASIS_POSIX_ERROR = POSIX_ERROR*)
+(*signature BASIS_POSIX_FILE_SYS = POSIX_FILE_SYS*)
+(*signature BASIS_POSIX_IO = POSIX_IO*)
+(*signature BASIS_POSIX_PROCESS = POSIX_PROCESS*)
 (*signature BASIS_POSIX_PROC_ENV = POSIX_PROC_ENV*)
-signature BASIS_POSIX_SIGNAL = POSIX_SIGNAL
-signature BASIS_POSIX_SYS_DB = POSIX_SYS_DB
-signature BASIS_POSIX_TTY = POSIX_TTY
+(*signature BASIS_POSIX_SIGNAL = POSIX_SIGNAL*)
+(*signature BASIS_POSIX_SYS_DB = POSIX_SYS_DB*)
+(*signature BASIS_POSIX_TTY = POSIX_TTY*)
 (*signature BASIS_PRIM_IO = PRIM_IO*)
 signature BASIS_REAL = REAL
 (*signature BASIS_SOCKET = SOCKET*)
@@ -76,7 +76,7 @@
 (* signature BASIS_WINDOWS = WINDOWS *)
 
 structure BasisArray = Array
-structure BasisArray2 = Array2
+(*structure BasisArray2 = Array2*)
 structure BasisArraySlice = ArraySlice
 structure BasisBinIO = BinIO
 structure BasisBool = Bool
@@ -85,7 +85,6 @@
 structure BasisCharVector = CharVector
 structure BasisCommandLine = CommandLine
 structure BasisDate = Date
-structure BasisFixedInt = FixedInt
 structure BasisGeneral = General
 (*structure BasisGenericSock = GenericSock*)
 structure BasisIEEEReal = IEEEReal
@@ -103,7 +102,7 @@
 structure BasisOS = OS
 structure BasisOption = Option
 structure BasisPosition = Position
-structure BasisPosix = Posix
+(*structure BasisPosix = Posix*)
 structure BasisReal = Real
 (*structure BasisSocket = Socket*)
 structure BasisString = String

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/basis.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/basis.sml	2007-11-06 10:58:18 UTC (rev 6125)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/basis.sml	2007-11-06 10:59:26 UTC (rev 6126)
@@ -4,6 +4,7 @@
  * See the LICENSE file or http://mlton.org/License for details.
  *)
 
+structure BasisFixedInt = FixedInt
 structure BasisInt31 = Int31
 structure BasisInt32 = Int32
 structure BasisIntInf = IntInf

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlton/basis.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlton/basis.sml	2007-11-06 10:58:18 UTC (rev 6125)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlton/basis.sml	2007-11-06 10:59:26 UTC (rev 6126)
@@ -8,6 +8,7 @@
 structure BasisBoolArraySlice = BoolArraySlice
 structure BasisBoolVector = BoolVector
 structure BasisBoolVectorSlice = BoolVectorSlice
+structure BasisFixedInt = FixedInt
 structure BasisInt1 = Int1
 structure BasisInt10 = Int10
 structure BasisInt11 = Int11

Added: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/basis.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/basis.sml	2007-11-06 10:58:18 UTC (rev 6125)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/basis.sml	2007-11-06 10:59:26 UTC (rev 6126)
@@ -0,0 +1,7 @@
+(* Copyright (C) 2007 Vesa Karvonen
+ *
+ * This code is released under the MLton license, a BSD-style license.
+ * See the LICENSE file or http://mlton.org/License for details.
+ *)
+
+structure BasisFixedInt = Int (* XXX This is a workaround! *)


Property changes on: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/basis.sml
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/extensions.use
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/extensions.use	2007-11-06 10:58:18 UTC (rev 6125)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/extensions.use	2007-11-06 10:59:26 UTC (rev 6126)
@@ -6,4 +6,4 @@
 
 val () =
     app use
-        ["detail/common/ext.sml"]
+        ["detail/ml/common/ext.sml"]

Added: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/univ.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/univ.sml	2007-11-06 10:58:18 UTC (rev 6125)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/univ.sml	2007-11-06 10:59:26 UTC (rev 6126)
@@ -0,0 +1,7 @@
+(* Copyright (C) 2007 Vesa Karvonen
+ *
+ * This code is released under the MLton license, a BSD-style license.
+ * See the LICENSE file or http://mlton.org/License for details.
+ *)
+
+structure Univ :> UNIV = UnivExn


Property changes on: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/univ.sml
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/workarounds.use
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/workarounds.use	2007-11-06 10:58:18 UTC (rev 6125)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/polyml/workarounds.use	2007-11-06 10:59:26 UTC (rev 6126)
@@ -4,12 +4,4 @@
  * See the LICENSE file or http://mlton.org/License for details.
  *)
 
-val () =
-    app (fn file => use ("detail/polyml/workarounds/"^file))
-        ["mk-real-sane.fun",
-         "real.sig",
-         "reals.sml"]
-
-val () =
-    app PolyML.Compiler.forgetFunctor
-        ["MkRealSane"]
+(* None *)

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/basis.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/basis.sml	2007-11-06 10:58:18 UTC (rev 6125)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/basis.sml	2007-11-06 10:59:26 UTC (rev 6126)
@@ -6,6 +6,7 @@
 
 structure SMLofNJ = SMLofNJ
 
+structure BasisFixedInt = FixedInt
 structure BasisInt31 = Int31
 structure BasisInt32 = Int32
 structure BasisInt64 = Int64

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.use
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.use	2007-11-06 10:58:18 UTC (rev 6125)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.use	2007-11-06 10:59:26 UTC (rev 6126)
@@ -11,9 +11,11 @@
         | NONE => raise Fail "The SML_COMPILER env var isn't defined"
 in
    app use
-       ["detail/"^compiler^"/workarounds.use",
+       ["detail/ml/"^compiler^"/workarounds.use",
+        "detail/ml/common/basis.sml",
+        "detail/ml/"^compiler^"/basis.sml",
         "detail/bootstrap.sml",
-        "detail/"^compiler^"/extensions.use",
+        "detail/ml/"^compiler^"/extensions.use",
         "public/concept/bitwise.sig",
         "public/concept/bounded.sig",
         "public/concept/cased.sig",
@@ -21,80 +23,117 @@
         "public/concept/equality.sig",
         "public/concept/flags.sig",
         "public/concept/func.sig",
+        "public/concept/intable.sig",
+        "public/concept/largeable.sig",
         "public/concept/monad.sig",
         "public/concept/ordered.sig",
         "public/concept/scannable.sig",
+        "public/concept/shiftable.sig",
         "public/concept/signed.sig",
         "public/concept/stringable.sig",
+        "public/concept/t.sig",
+        "public/concept/wordable.sig",
+        "public/concept/formattable.sig",
         "detail/concept/mk-bounded.fun",
-        "detail/concept/mk-cstringable.fun",
         "detail/concept/mk-equality.fun",
         "detail/concept/mk-scannable.fun",
         "detail/concept/mk-stringable.fun",
-        "public/void.sig",
-        "public/fn/fn.sig", "detail/fn.sml",
-        "public/basic.sig", "detail/basic.sml",
+        "detail/concept/mk-cstringable.fun",
+        "public/data/void.sig",
+        "public/fn/fn.sig",
+        "detail/fn/fn.sml",
+        "public/basic.sig",
+        "detail/basic.sml",
         "public/data/unit.sig",
-        "public/data/sq.sig", "detail/sq.sml",
-        "public/fn/bin-fn.sig", "detail/bin-fn.sml",
-        "public/fn/un-op.sig", "detail/un-op.sml",
-        "public/fn/thunk.sig", "detail/thunk.sml",
-        "public/data/univ.sig", "detail/univ-common.sml", "detail/univ-exn.sml",
-        "public/fn/bin-op.sig", "detail/bin-op.sml",
-        "public/fn/effect.sig", "detail/effect.sml",
-        "public/generic/fix.sig", "detail/fix.sml",
-        "public/fn/un-pr.sig", "detail/un-pr.sml",
-        "public/data/order.sig", "detail/order.sml",
-        "public/fn/bin-pr.sig", "detail/bin-pr.sml",
-        "public/fn/cmp.sig", "detail/cmp.sml",
+        "public/data/sq.sig",
+        "detail/data/sq.sml",
+        "public/fn/bin-fn.sig",
+        "detail/fn/bin-fn.sml",
+        "public/fn/un-op.sig",
+        "detail/fn/un-op.sml",
+        "public/fn/thunk.sig",
+        "detail/fn/thunk.sml",
+        "public/data/univ.sig",
+        "detail/data/univ-ref.sml",
+        "detail/data/univ-exn.sml",
+        "detail/ml/"^compiler^"/univ.sml",
+        "public/fn/bin-op.sig",
+        "detail/fn/bin-op.sml",
+        "public/fn/effect.sig",
+        "detail/fn/effect.sml",
+        "public/generic/fix.sig",
+        "detail/generic/fix.sml",
+        "public/fn/un-pr.sig",
+        "detail/fn/un-pr.sml",
+        "public/data/order.sig",
+        "detail/data/order.sml",
+        "public/fn/bin-pr.sig",
+        "detail/fn/bin-pr.sml",
+        "public/fn/cmp.sig",
+        "detail/fn/cmp.sml",
         "detail/concept/mk-ordered.fun",
-        "public/data/ref.sig", "detail/ref.sml",
-        "public/data/bool.sig", "detail/bool.sml",
+        "public/data/ref.sig",
+        "detail/data/ref.sml",
+        "public/data/bool.sig",
+        "detail/data/bool.sml",
         "public/data/product-type.sig",
         "public/data/pair.sig",
-        "detail/pair.sml",
+        "detail/data/pair.sml",
         "public/data/product.sig",
-        "detail/product.sml",
-        "detail/mk-monad.fun",
-        "public/with.sig", "detail/with.sml",
-        "public/data/sum.sig", "detail/sum.sml",
-        "public/data/exn.sig", "detail/exn.sml",
-        "public/generic/emb.sig", "detail/emb.sml",
-        "public/generic/iso.sig", "detail/iso.sml",
-        "public/generic/tie.sig", "detail/tie.sml",
-        "detail/mk-seq-common-ext.fun",
+        "detail/data/product.sml",
+        "public/fold/fold.sig",
+        "detail/fold/fold.sml",
+        "detail/concept/mk-monad.fun",
+        "public/control/with.sig",
+        "detail/control/with.sml",
+        "public/data/sum.sig",
+        "detail/data/sum.sml",
+        "public/control/exn.sig",
+        "detail/control/exn.sml",
+        "public/generic/emb.sig",
+        "detail/generic/emb.sml",
+        "public/generic/iso.sig",
+        "detail/generic/iso.sml",
+        "public/generic/tie.sig",
+        "detail/generic/tie.sml",
         "public/sequence/array.sig",
-        "detail/array.sml",
         "public/sequence/array-slice.sig",
-        "detail/array-slice.sml",
         "public/sequence/vector.sig",
-        "detail/vector.sml",
         "public/sequence/vector-slice.sig",
-        "detail/vector-slice.sml",
-        "public/data/option.sig", "detail/option.sml",
-        "public/sequence/list.sig", "detail/list.sml",
-        "public/sequence/buffer.sig", "detail/buffer.sml",
-        "public/reader.sig", "detail/reader.sml",
-        "public/writer.sig", "detail/writer.sml",
-        "public/exit.sig", "detail/exit.sml",
-        "detail/mk-integer-ext.fun",
-        "detail/mk-int-inf-ext.fun",
-        "detail/mk-real-ext.fun",
-        "detail/mk-word-ext.fun",
+        "detail/sequence/mk-seq-common-ext.fun",
+        "detail/sequence/array.sml",
+        "detail/sequence/array-slice.sml",
+        "detail/sequence/vector.sml",
+        "detail/sequence/vector-slice.sml",
+        "public/data/option.sig",
+        "detail/data/option.sml",
+        "public/numeric/integer.sig",
         "public/numeric/int-inf.sig",
-        "public/numeric/integer.sig",
         "public/numeric/real.sig",
         "public/numeric/word.sig",
-        "detail/common-scalars.sml",
-        "detail/"^compiler^"/ints.sml",
-        "detail/"^compiler^"/reals.sml",
-        "detail/"^compiler^"/words.sml",
-        "detail/mk-mono-seq-common-ext.fun",
-        "detail/mk-mono-vector-ext.fun",
-        "detail/mk-mono-vector-slice-ext.fun",
-        "detail/mk-mono-array-ext.fun",
-        "detail/mk-mono-array-slice-ext.fun",
-        "detail/mk-text-ext.fun",
+        "detail/numeric/mk-integer-ext.fun",
+        "detail/numeric/mk-int-inf-ext.fun",
+        "detail/numeric/mk-real-ext.fun",
+        "detail/numeric/mk-word-ext.fun",
+        "detail/ml/common/scalars.sml",
+        "detail/ml/"^compiler^"/ints.sml",
+        "detail/ml/"^compiler^"/reals.sml",
+        "detail/ml/"^compiler^"/words.sml",
+        "public/sequence/list.sig",
+        "detail/sequence/list.sml",
+        "public/sequence/buffer.sig",
+        "detail/sequence/mk-buffer-common.fun",
+        "detail/sequence/buffer.sml",
+        "public/sequence/resizable-array.sig",
+        "detail/sequence/resizable-array.sml",
+        "public/io/reader.sig",
+        "detail/io/reader.sml",
+        "public/io/writer.sig",
+        "detail/io/writer.sml",
+        "public/io/ios-monad.sig",
+        "detail/io/ios-monad.sml",
+        "public/control/exit.sig",
+        "detail/control/exit.sml",
         "public/sequence/mono-vector.sig",
         "public/sequence/mono-vector-slice.sig",
         "public/sequence/mono-array.sig",
@@ -103,17 +142,27 @@
         "public/text/string.sig",
         "public/text/substring.sig",
         "public/text/text.sig",
-        "detail/common-mono-seqs.sml",
-        "detail/"^compiler^"/mono-vectors.sml",
-        "detail/"^compiler^"/mono-vector-slices.sml",
-        "detail/"^compiler^"/mono-arrays.sml",
-        "detail/"^compiler^"/mono-array-slices.sml",
-        "detail/"^compiler^"/texts.sml",
-        "public/lazy/promise.sig", "detail/promise.sml",
+        "detail/sequence/mk-mono-seq-common-ext.fun",
+        "detail/sequence/mk-mono-vector-ext.fun",
+        "detail/sequence/mk-mono-vector-slice-ext.fun",
+        "detail/sequence/mk-mono-array-ext.fun",
+        "detail/sequence/mk-mono-array-slice-ext.fun",
+        "detail/text/mk-text-ext.fun",
+        "detail/ml/common/mono-seqs.sml",
+        "detail/ml/"^compiler^"/mono-vectors.sml",
+        "detail/ml/"^compiler^"/mono-vector-slices.sml",
+        "detail/ml/"^compiler^"/mono-arrays.sml",
+        "detail/ml/"^compiler^"/mono-array-slices.sml",
+        "detail/ml/"^compiler^"/texts.sml",
+        "public/sequence/stream.sig",
+        "detail/sequence/stream.sml",
+        "public/lazy/lazy.sig",
+        "detail/lazy/lazy.sml",
         "public/fn/shift-op.sig",
-        "public/io/text-io.sig", "detail/text-io.sml",
-        "detail/mk-word-flags.fun",
-        "detail/"^compiler^"/forget.use",
+        "public/io/text-io.sig",
+        "detail/io/text-io.sml",
+        "detail/concept/mk-word-flags.fun",
+        "detail/ml/"^compiler^"/forget.use",
         "public/export/"^compiler^".sml",
         "public/export/common.sml",
         "public/export/top-level.sml",




More information about the MLton-commit mailing list