[MLton-commit] r5392
Vesa Karvonen
vesak at mlton.org
Mon Mar 5 09:37:15 PST 2007
Largish reorganization in an attempt to make the SML/NJ support easier to
maintain. Some work on concept signatures.
----------------------------------------------------------------------
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-common.sml
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-mlton.sml
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-smlnj.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/bool.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/bootstrap.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/common-mono-seqs.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/common-scalars.sml
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-cstringable.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-equality.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/exn.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-int-inf-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-integer-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-array-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-array-slice-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-vector-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-vector-slice-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-real-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-text-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-word-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/ints.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-array-slices.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-arrays.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-vector-slices.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-vectors.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/reals.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/words.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/bootstrap.cm
D mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/funs.cm
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/ints.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-array-slices.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-arrays.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-vector-slices.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-vectors.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/reals.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/sigs.cm
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/unsealed.cm
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/words.sml
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/workarounds/basis-rebound.cm
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/workarounds/char.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/workarounds/sane.cm
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/workarounds/string.sig
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/workarounds/text.sig
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/workarounds/text.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/text-io.sml
D mltonlib/trunk/com/ssh/extended-basis/unstable/detail/univ-common.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.cm
U mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb
U mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.use
A mltonlib/trunk/com/ssh/extended-basis/unstable/public/concept/cased.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/concept/cstringable.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/data/option.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/export/common.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/io/text-io.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/numeric/int-inf.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/numeric/integer.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/numeric/real.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/numeric/word.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/sequence/array-slice.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/sequence/array.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/sequence/list.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/sequence/mono-array-slice.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/sequence/mono-array.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/sequence/mono-vector-slice.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/sequence/mono-vector.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/sequence/vector-slice.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/sequence/vector.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/text/char.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/text/string.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/public/text/substring.sig
----------------------------------------------------------------------
Added: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-common.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-common.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-common.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -0,0 +1,178 @@
+(* Copyright (C) 2007 SSH Communications Security, Helsinki, Finland
+ *
+ * This code is released under the MLton license, a BSD-style license.
+ * See the LICENSE file or http://mlton.org/License for details.
+ *)
+
+(*
+ * We rebind all Basis signatures, structures and functors that we are
+ * interested in to make it easier to extend them. This is mainly to make
+ * it easier to write the Compilation Manager (CM) files for SML/NJ.
+ *)
+
+signature BASIS_ARRAY = ARRAY
+signature BASIS_ARRAY2 = ARRAY2
+signature BASIS_ARRAY_SLICE = ARRAY_SLICE
+signature BASIS_BIN_IO = BIN_IO
+signature BASIS_BIT_FLAGS = BIT_FLAGS
+signature BASIS_BOOL = BOOL
+signature BASIS_BYTE = BYTE
+signature BASIS_CHAR = CHAR
+signature BASIS_COMMAND_LINE = COMMAND_LINE
+signature BASIS_DATE = DATE
+signature BASIS_GENERAL = GENERAL
+signature BASIS_GENERIC_SOCK = GENERIC_SOCK
+signature BASIS_IEEE_REAL = IEEE_REAL
+signature BASIS_IMPERATIVE_IO = IMPERATIVE_IO
+signature BASIS_INET_SOCK = INET_SOCK
+signature BASIS_INTEGER = INTEGER
+signature BASIS_INT_INF = INT_INF
+signature BASIS_IO = IO
+signature BASIS_LIST = LIST
+signature BASIS_LIST_PAIR = LIST_PAIR
+signature BASIS_MATH = MATH
+signature BASIS_MONO_ARRAY = MONO_ARRAY
+signature BASIS_MONO_ARRAY2 = MONO_ARRAY2
+signature BASIS_MONO_ARRAY_SLICE = MONO_ARRAY_SLICE
+signature BASIS_MONO_VECTOR = MONO_VECTOR
+signature BASIS_MONO_VECTOR_SLICE = MONO_VECTOR_SLICE
+signature BASIS_NET_HOST_DB = NET_HOST_DB
+signature BASIS_NET_PROT_DB = NET_PROT_DB
+signature BASIS_NET_SERV_DB = NET_SERV_DB
+signature BASIS_OPTION = OPTION
+signature BASIS_OS = OS
+signature BASIS_OS_FILE_SYS = OS_FILE_SYS
+signature BASIS_OS_IO = OS_IO
+signature BASIS_OS_PATH = OS_PATH
+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_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_PRIM_IO = PRIM_IO
+signature BASIS_REAL = REAL
+signature BASIS_SOCKET = SOCKET
+signature BASIS_STREAM_IO = STREAM_IO
+signature BASIS_STRING = STRING
+signature BASIS_STRING_CVT = STRING_CVT
+signature BASIS_SUBSTRING = SUBSTRING
+signature BASIS_TEXT = TEXT
+signature BASIS_TEXT_IO = TEXT_IO
+signature BASIS_TEXT_STREAM_IO = TEXT_STREAM_IO
+signature BASIS_TIME = TIME
+signature BASIS_TIMER = TIMER
+signature BASIS_UNIX = UNIX
+signature BASIS_UNIX_SOCK = UNIX_SOCK
+signature BASIS_VECTOR = VECTOR
+signature BASIS_VECTOR_SLICE = VECTOR_SLICE
+signature BASIS_WORD = WORD
+(* signature BASIS_WINDOWS = WINDOWS *)
+
+structure BasisArray = Array
+structure BasisArray2 = Array2
+structure BasisArraySlice = ArraySlice
+structure BasisBinIO = BinIO
+structure BasisBool = Bool
+structure BasisByte = Byte
+structure BasisChar = Char
+structure BasisCommandLine = CommandLine
+structure BasisDate = Date
+structure BasisGeneral = General
+structure BasisGenericSock = GenericSock
+structure BasisIEEEReal = IEEEReal
+structure BasisINetSock = INetSock
+structure BasisIO = IO
+structure BasisInt = Int
+structure BasisLargeInt = LargeInt
+structure BasisLargeReal = LargeReal
+structure BasisLargeWord = LargeWord
+structure BasisList = List
+structure BasisListPair = ListPair
+structure BasisNetHostDB = NetHostDB
+structure BasisNetProtDB = NetProtDB
+structure BasisNetServDB = NetServDB
+structure BasisOS = OS
+structure BasisOption = Option
+structure BasisPosition = Position
+structure BasisPosix = Posix
+structure BasisReal = Real
+structure BasisSocket = Socket
+structure BasisString = String
+structure BasisStringCvt = StringCvt
+structure BasisText = Text
+structure BasisTextIO = TextIO
+structure BasisTime = Time
+structure BasisTimer = Timer
+structure BasisUnix = Unix
+structure BasisUnixSock = UnixSock
+structure BasisVector = Vector
+structure BasisVectorSlice = VectorSlice
+structure BasisWord = Word
+structure BasisWord8 = Word8
+structure BasisWord8Array = Word8Array
+structure BasisWord8ArraySlice = Word8ArraySlice
+structure BasisWord8Vector = Word8Vector
+structure BasisWord8VectorSlice = Word8VectorSlice
+(* structure BasisWindows = Windows *)
+
+(* signature BASIS_IMPERATIVE_IO_ARG = sig *)
+(* structure StreamIO : STREAM_IO *)
+(* structure Vector : MONO_VECTOR *)
+(* structure Array : MONO_ARRAY *)
+(* sharing type StreamIO.elem *)
+(* = Vector.elem = Array.elem *)
+(* sharing type StreamIO.vector *)
+(* = Vector.vector *)
+(* = Array.vector *)
+(* end *)
+
+(* functor BasisImperativeIO (Arg : BASIS_IMPERATIVE_IO_ARG) : IMPERATIVE_IO *)
+(* = ImperativeIO (Arg) *)
+
+(* signature BASIS_PRIM_IO_ARG = sig *)
+(* structure Vector : MONO_VECTOR *)
+(* structure VectorSlice : MONO_VECTOR_SLICE *)
+(* structure Array : MONO_ARRAY *)
+(* structure ArraySlice : MONO_ARRAY_SLICE *)
+(* sharing type Vector.elem *)
+(* = VectorSlice.elem *)
+(* = Array.elem *)
+(* = ArraySlice.elem *)
+(* sharing type Vector.vector *)
+(* = VectorSlice.vector *)
+(* = Array.vector *)
+(* = ArraySlice.vector *)
+(* sharing type VectorSlice.slice *)
+(* = ArraySlice.vector_slice *)
+(* sharing type Array.array *)
+(* = ArraySlice.array *)
+(* val someElem : Vector.elem *)
+(* eqtype pos *)
+(* val compare : pos * pos -> order *)
+(* end *)
+
+(* functor BasisPrimIO (Arg : BASIS_PRIM_IO_ARG) : PRIM_IO = PrimIO (Arg) *)
+
+(* signature BASIS_STREAM_IO_ARG = sig *)
+(* structure PrimIO : PRIM_IO *)
+(* structure Vector : MONO_VECTOR *)
+(* structure Array : MONO_ARRAY *)
+(* sharing type PrimIO.elem *)
+(* = Vector.elem *)
+(* = Array.elem *)
+(* sharing type PrimIO.vector *)
+(* = Vector.vector *)
+(* = Array.vector *)
+(* sharing type PrimIO.array *)
+(* = Array.array *)
+(* val someElem : PrimIO.elem *)
+(* end *)
+
+(* functor BasisStreamIO (Arg : BASIS_STREAM_IO_ARG) : STREAM_IO = StreamIO (Arg) *)
Property changes on: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-common.sml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-mlton.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-mlton.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-mlton.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -0,0 +1,141 @@
+(* Copyright (C) 2007 SSH Communications Security, Helsinki, Finland
+ *
+ * This code is released under the MLton license, a BSD-style license.
+ * See the LICENSE file or http://mlton.org/License for details.
+ *)
+
+structure BasisBoolArray = BoolArray
+structure BasisBoolArraySlice = BoolArraySlice
+structure BasisBoolVector = BoolVector
+structure BasisBoolVector = BoolVector
+structure BasisBoolVectorSlice = BoolVectorSlice
+structure BasisFixedInt = FixedInt
+structure BasisInt1 = Int1
+structure BasisInt10 = Int10
+structure BasisInt11 = Int11
+structure BasisInt12 = Int12
+structure BasisInt13 = Int13
+structure BasisInt14 = Int14
+structure BasisInt15 = Int15
+structure BasisInt16 = Int16
+structure BasisInt16Array = Int16Array
+structure BasisInt16ArraySlice = Int16ArraySlice
+structure BasisInt16Vector = Int16Vector
+structure BasisInt16VectorSlice = Int16VectorSlice
+structure BasisInt17 = Int17
+structure BasisInt18 = Int18
+structure BasisInt19 = Int19
+structure BasisInt2 = Int2
+structure BasisInt20 = Int20
+structure BasisInt21 = Int21
+structure BasisInt22 = Int22
+structure BasisInt23 = Int23
+structure BasisInt24 = Int24
+structure BasisInt25 = Int25
+structure BasisInt26 = Int26
+structure BasisInt27 = Int27
+structure BasisInt28 = Int28
+structure BasisInt29 = Int29
+structure BasisInt3 = Int3
+structure BasisInt30 = Int30
+structure BasisInt31 = Int31
+structure BasisInt32 = Int32
+structure BasisInt32Array = Int32Array
+structure BasisInt32ArraySlice = Int32ArraySlice
+structure BasisInt32Vector = Int32Vector
+structure BasisInt32VectorSlice = Int32VectorSlice
+structure BasisInt4 = Int4
+structure BasisInt5 = Int5
+structure BasisInt6 = Int6
+structure BasisInt64 = Int64
+structure BasisInt64Array = Int64Array
+structure BasisInt64ArraySlice = Int64ArraySlice
+structure BasisInt64Vector = Int64Vector
+structure BasisInt64VectorSlice = Int64VectorSlice
+structure BasisInt7 = Int7
+structure BasisInt8 = Int8
+structure BasisInt8Array = Int8Array
+structure BasisInt8ArraySlice = Int8ArraySlice
+structure BasisInt8Vector = Int8Vector
+structure BasisInt8VectorSlice = Int8VectorSlice
+structure BasisInt9 = Int9
+structure BasisIntArray = IntArray
+structure BasisIntArraySlice = IntArraySlice
+structure BasisIntInf = IntInf
+structure BasisIntVector = IntVector
+structure BasisIntVectorSlice = IntVectorSlice
+structure BasisLargeIntArray = LargeIntArray
+structure BasisLargeIntArraySlice = LargeIntArraySlice
+structure BasisLargeIntVector = LargeIntVector
+structure BasisLargeIntVectorSlice = LargeIntVectorSlice
+structure BasisLargeRealArray = LargeRealArray
+structure BasisLargeRealArraySlice = LargeRealArraySlice
+structure BasisLargeRealVector = LargeRealVector
+structure BasisLargeRealVectorSlice = LargeRealVectorSlice
+structure BasisLargeWordArray = LargeWordArray
+structure BasisLargeWordArraySlice = LargeWordArraySlice
+structure BasisLargeWordVector = LargeWordVector
+structure BasisLargeWordVectorSlice = LargeWordVectorSlice
+structure BasisReal32 = Real32
+structure BasisReal32Array = Real32Array
+structure BasisReal32ArraySlice = Real32ArraySlice
+structure BasisReal32Vector = Real32Vector
+structure BasisReal32VectorSlice = Real32VectorSlice
+structure BasisReal64 = Real64
+structure BasisReal64Array = Real64Array
+structure BasisReal64ArraySlice = Real64ArraySlice
+structure BasisReal64Vector = Real64Vector
+structure BasisReal64VectorSlice = Real64VectorSlice
+structure BasisRealArray = RealArray
+structure BasisRealArraySlice = RealArraySlice
+structure BasisRealVector = RealVector
+structure BasisRealVectorSlice = RealVectorSlice
+structure BasisSysWord = SysWord
+structure BasisWord1 = Word1
+structure BasisWord10 = Word10
+structure BasisWord11 = Word11
+structure BasisWord12 = Word12
+structure BasisWord13 = Word13
+structure BasisWord14 = Word14
+structure BasisWord15 = Word15
+structure BasisWord16 = Word16
+structure BasisWord16Array = Word16Array
+structure BasisWord16ArraySlice = Word16ArraySlice
+structure BasisWord16Vector = Word16Vector
+structure BasisWord16VectorSlice = Word16VectorSlice
+structure BasisWord17 = Word17
+structure BasisWord18 = Word18
+structure BasisWord19 = Word19
+structure BasisWord2 = Word2
+structure BasisWord20 = Word20
+structure BasisWord21 = Word21
+structure BasisWord22 = Word22
+structure BasisWord23 = Word23
+structure BasisWord24 = Word24
+structure BasisWord25 = Word25
+structure BasisWord26 = Word26
+structure BasisWord27 = Word27
+structure BasisWord28 = Word28
+structure BasisWord29 = Word29
+structure BasisWord3 = Word3
+structure BasisWord30 = Word30
+structure BasisWord31 = Word31
+structure BasisWord32 = Word32
+structure BasisWord32Array = Word32Array
+structure BasisWord32ArraySlice = Word32ArraySlice
+structure BasisWord32Vector = Word32Vector
+structure BasisWord32VectorSlice = Word32VectorSlice
+structure BasisWord4 = Word4
+structure BasisWord5 = Word5
+structure BasisWord6 = Word6
+structure BasisWord64 = Word64
+structure BasisWord64Array = Word64Array
+structure BasisWord64ArraySlice = Word64ArraySlice
+structure BasisWord64Vector = Word64Vector
+structure BasisWord64VectorSlice = Word64VectorSlice
+structure BasisWord7 = Word7
+structure BasisWord9 = Word9
+structure BasisWordArray = WordArray
+structure BasisWordArraySlice = WordArraySlice
+structure BasisWordVector = WordVector
+structure BasisWordVectorSlice = WordVectorSlice
Property changes on: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-mlton.sml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-smlnj.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-smlnj.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-smlnj.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -0,0 +1,26 @@
+(* Copyright (C) 2007 SSH Communications Security, Helsinki, Finland
+ *
+ * This code is released under the MLton license, a BSD-style license.
+ * See the LICENSE file or http://mlton.org/License for details.
+ *)
+
+structure SMLofNJ = SMLofNJ
+
+structure BasisFixedInt = FixedInt
+structure BasisInt31 = Int31
+structure BasisInt32 = Int32
+structure BasisInt64 = Int64
+structure BasisIntInf = IntInf
+structure BasisReal64 = Real64
+structure BasisReal64Array = Real64Array
+structure BasisReal64ArraySlice = Real64ArraySlice
+structure BasisReal64Vector = Real64Vector
+structure BasisReal64VectorSlice = Real64VectorSlice
+structure BasisRealArray = RealArray
+structure BasisRealArraySlice = RealArraySlice
+structure BasisRealVector = RealVector
+structure BasisRealVectorSlice = RealVectorSlice
+structure BasisSysWord = SysWord
+structure BasisWord31 = Word31
+structure BasisWord32 = Word32
+structure BasisWord64 = Word64
Property changes on: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/basis-smlnj.sml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/bool.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/bool.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/bool.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -12,8 +12,6 @@
type scannable = t
type stringable = t
val embString = (toString, fromString)
- fun isFalse b = b = false
- fun isTrue b = b = true
val bounds = (false, true)
val compare = fn (false, true) => LESS
| (true, false) => GREATER
@@ -25,9 +23,10 @@
structure Scannable = MkScannable (Core)
structure Stringable = MkStringable (Core)
+ open Bounded
+ open Ordered
+ open Scannable
+ open Stringable
+
open Core
- Bounded
- Ordered
- Scannable
- Stringable
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/bootstrap.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/bootstrap.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/bootstrap.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -10,21 +10,26 @@
structure Exn = struct type t = exn end
structure Fn = struct type ('a, 'b) t = 'a -> 'b end
structure Unit = struct type t = unit end
-structure Bool = struct open Bool type t = bool end
-structure Char = struct open Char type t = char end
-structure Option = struct open Option type 'a t = 'a option end
-structure String = struct open String type t = string end
-structure Int = struct open Int type t = int end
-structure LargeInt = struct open LargeInt type t = int end
-structure Word = struct open Word type t = word end
-structure LargeWord = struct open LargeWord type t = word end
-structure LargeReal = struct open LargeReal type t = real end
-structure Word8Vector = struct open Word8Vector type t = vector end
-structure Array = struct open Array type 'a t = 'a array end
-structure ArraySlice = struct open ArraySlice type 'a t = 'a slice end
-structure Vector = struct open Vector type 'a t = 'a vector end
-structure VectorSlice = struct open VectorSlice type 'a t = 'a slice end
-structure List = struct open List type 'a t = 'a list end
+structure Bool = struct
+ open BasisBool
+ type t = bool
+ fun isFalse b = b = false
+ fun isTrue b = b = true
+end
+structure Char = struct open BasisChar type t = char end
+structure Option = struct open BasisOption type 'a t = 'a option end
+structure String = struct open BasisString type t = string end
+structure Int = struct open BasisInt type t = int end
+structure LargeInt = struct open BasisLargeInt type t = int end
+structure Word = struct open BasisWord type t = word end
+structure LargeWord = struct open BasisLargeWord type t = word end
+structure LargeReal = struct open BasisLargeReal type t = real end
+structure Word8Vector = struct open BasisWord8Vector type t = vector end
+structure Array = struct open BasisArray type 'a t = 'a array end
+structure ArraySlice = struct open BasisArraySlice type 'a t = 'a slice end
+structure Vector = struct open BasisVector type 'a t = 'a vector end
+structure VectorSlice = struct open BasisVectorSlice type 'a t = 'a slice end
+structure List = struct open BasisList type 'a t = 'a list end
structure Effect = struct type 'a t = 'a -> Unit.t end
structure Order = struct datatype t = datatype order end
structure Pair = struct
@@ -54,3 +59,5 @@
structure Iso = struct type ('a, 'b) t = ('a -> 'b) * ('b -> 'a) end
structure ShiftOp = struct type 'a t = 'a * Word.t -> 'a end
structure BinFn = struct type ('a, 'b) t = 'a Sq.t -> 'b end
+structure IEEEReal = BasisIEEEReal
+structure Univ = struct exception Univ end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/common-mono-seqs.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/common-mono-seqs.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/common-mono-seqs.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -6,19 +6,20 @@
(* Extended mono sequence modules common to all compilers *)
-structure Word8Vector = MkMonoVectorExt (Word8Vector)
-structure Word8VectorSlice =
- MkMonoVectorSliceExt (structure MonoVectorSlice = Word8VectorSlice)
-structure Word8Array = MkMonoArrayExt (structure MonoArray = Word8Array
- structure MonoVector = Word8Vector)
-structure Word8ArraySlice =
- MkMonoArraySliceExt (structure MonoArraySlice = Word8ArraySlice)
+structure Word8Vector : MONO_VECTOR = MkMonoVectorExt (BasisWord8Vector)
+structure Word8VectorSlice : MONO_VECTOR_SLICE =
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisWord8VectorSlice)
+structure Word8Array : MONO_ARRAY =
+ MkMonoArrayExt (structure MonoArray = BasisWord8Array
+ structure MonoVector = BasisWord8Vector)
+structure Word8ArraySlice : MONO_ARRAY_SLICE =
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisWord8ArraySlice)
-structure Text = MkTextExt (Text)
-structure Char = Text.Char
-structure CharArray = Text.CharArray
-structure CharArraySlice = Text.CharArraySlice
-structure CharVector = Text.CharVector
-structure CharVectorSlice = Text.CharVectorSlice
-structure String = Text.String
-structure Substring = Text.Substring
+structure Text : TEXT = MkTextExt (BasisText)
+structure Char : CHAR = Text.Char
+structure CharArray : MONO_ARRAY = Text.CharArray
+structure CharArraySlice : MONO_ARRAY_SLICE = Text.CharArraySlice
+structure CharVector : MONO_VECTOR = Text.CharVector
+structure CharVectorSlice : MONO_VECTOR_SLICE = Text.CharVectorSlice
+structure String : STRING = Text.String
+structure Substring : SUBSTRING = Text.Substring
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/common-scalars.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/common-scalars.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/common-scalars.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -6,13 +6,13 @@
(* Extended scalar modules common to all compilers *)
-structure Int = MkIntegerExt (Int)
-structure LargeInt = MkIntegerExt (LargeInt)
-structure Position = MkIntegerExt (Position)
+structure Int = MkIntegerExt (BasisInt)
+structure LargeInt = MkIntegerExt (BasisLargeInt)
+structure Position = MkIntegerExt (BasisPosition)
-structure LargeReal = MkRealExt (LargeReal)
-structure Real = MkRealExt (Real)
+structure LargeReal = MkRealExt (BasisLargeReal)
+structure Real = MkRealExt (BasisReal)
-structure LargeWord = MkWordExt (LargeWord)
-structure Word = MkWordExt (Word)
-structure Word8 = MkWordExt (Word8)
+structure LargeWord = MkWordExt (BasisLargeWord)
+structure Word = MkWordExt (BasisWord)
+structure Word8 = MkWordExt (BasisWord8)
Added: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-cstringable.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-cstringable.fun 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-cstringable.fun 2007-03-05 17:37:07 UTC (rev 5392)
@@ -0,0 +1,11 @@
+(* Copyright (C) 2007 SSH Communications Security, Helsinki, Finland
+ *
+ * This code is released under the MLton license, a BSD-style license.
+ * See the LICENSE file or http://mlton.org/License for details.
+ *)
+
+functor MkCStringable (Core : CSTRINGABLE_CORE) : CSTRINGABLE = struct
+ open Core
+ type cstringable_ex = cstringable
+ val (toCString, fromCString) = embCString
+end
Property changes on: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-cstringable.fun
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-equality.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-equality.fun 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-equality.fun 2007-03-05 17:37:07 UTC (rev 5392)
@@ -7,5 +7,5 @@
functor MkEquality (Core : EQUALITY_CORE) : EQUALITY = struct
open Core
type equality_ex = equality
- val != = not o ==
+ val op != = not o op ==
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/exn.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/exn.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/exn.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -6,8 +6,8 @@
structure Exn : EXN = struct
open Exn Ext.Exn
- val name = General.exnName
- val message = General.exnMessage
+ val name = BasisGeneral.exnName
+ val message = BasisGeneral.exnMessage
fun apply f x = Sum.INR (f x) handle e => Sum.INL e
fun eval th = apply th ()
fun throw e = raise e
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-int-inf-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-int-inf-ext.fun 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-int-inf-ext.fun 2007-03-05 17:37:07 UTC (rev 5392)
@@ -4,7 +4,7 @@
* See the LICENSE file or http://mlton.org/License for details.
*)
-functor MkIntInfExt (I : INT_INF) = struct
+functor MkIntInfExt (I : BASIS_INT_INF) : INT_INF = struct
local
structure E = MkIntegerExt (I)
in
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-integer-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-integer-ext.fun 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-integer-ext.fun 2007-03-05 17:37:07 UTC (rev 5392)
@@ -4,7 +4,7 @@
* See the LICENSE file or http://mlton.org/License for details.
*)
-functor MkIntegerExt (I : INTEGER) = struct
+functor MkIntegerExt (I : BASIS_INTEGER) : INTEGER = struct
open I
type t = int
val embString = (toString, fromString)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-array-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-array-ext.fun 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-array-ext.fun 2007-03-05 17:37:07 UTC (rev 5392)
@@ -4,10 +4,11 @@
* See the LICENSE file or http://mlton.org/License for details.
*)
-functor MkMonoArrayExt (structure MonoVector : MONO_VECTOR
- structure MonoArray : MONO_ARRAY
+functor MkMonoArrayExt (structure MonoVector : BASIS_MONO_VECTOR
+ structure MonoArray : BASIS_MONO_ARRAY
where type elem = MonoVector.elem
- where type vector = MonoVector.vector) = struct
+ where type vector = MonoVector.vector) :
+ MONO_ARRAY = struct
local
structure MonoArray = struct
open MonoArray
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-array-slice-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-array-slice-ext.fun 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-array-slice-ext.fun 2007-03-05 17:37:07 UTC (rev 5392)
@@ -4,7 +4,8 @@
* See the LICENSE file or http://mlton.org/License for details.
*)
-functor MkMonoArraySliceExt (structure MonoArraySlice : MONO_ARRAY_SLICE) =
+functor MkMonoArraySliceExt (structure MonoArraySlice :
+ BASIS_MONO_ARRAY_SLICE) : MONO_ARRAY_SLICE =
struct
open MonoArraySlice
type t = slice
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-vector-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-vector-ext.fun 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-vector-ext.fun 2007-03-05 17:37:07 UTC (rev 5392)
@@ -4,7 +4,7 @@
* See the LICENSE file or http://mlton.org/License for details.
*)
-functor MkMonoVectorExt (MonoVector : MONO_VECTOR) = struct
+functor MkMonoVectorExt (MonoVector : BASIS_MONO_VECTOR) : MONO_VECTOR = struct
local
structure MonoVector = struct
open MonoVector
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-vector-slice-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-vector-slice-ext.fun 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-mono-vector-slice-ext.fun 2007-03-05 17:37:07 UTC (rev 5392)
@@ -4,7 +4,8 @@
* See the LICENSE file or http://mlton.org/License for details.
*)
-functor MkMonoVectorSliceExt (structure MonoVectorSlice : MONO_VECTOR_SLICE) =
+functor MkMonoVectorSliceExt (structure MonoVectorSlice :
+ BASIS_MONO_VECTOR_SLICE) =
struct
open MonoVectorSlice
type t = slice
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-real-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-real-ext.fun 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-real-ext.fun 2007-03-05 17:37:07 UTC (rev 5392)
@@ -4,7 +4,7 @@
* See the LICENSE file or http://mlton.org/License for details.
*)
-functor MkRealExt (R : REAL) = struct
+functor MkRealExt (R : BASIS_REAL) : REAL = struct
open R
type t = real
val embDecimal = (toDecimal, fromDecimal)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-text-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-text-ext.fun 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-text-ext.fun 2007-03-05 17:37:07 UTC (rev 5392)
@@ -4,16 +4,39 @@
* See the LICENSE file or http://mlton.org/License for details.
*)
-functor MkTextExt (T : TEXT) = struct
+functor MkTextExt (T : BASIS_TEXT) : TEXT = struct
open T
- structure Char = struct
- open Char
- type t = char
- val minOrd = 0
- val boundsChar = (minChar, maxChar)
- val boundsOrd = (minOrd, maxOrd)
- val isoInt = (ord, chr)
+ structure Char : CHAR = struct
+ structure Core = struct
+ open Char
+ type t = char
+ type bounded = t
+ type cased = t
+ type cstringable = t
+ type ordered = t
+ type scannable = t
+ type stringable = t
+ val boundsChar = (minChar, maxChar)
+ val bounds = boundsChar
+ val minOrd = 0
+ val boundsOrd = (minOrd, maxOrd)
+ val isoInt = (ord, chr)
+ val embCString = (toCString, fromCString)
+ val embString = (toString, fromString)
+ end
+
+ structure Bounded = MkBounded (Core)
+ structure CStringable = MkCStringable (Core)
+ structure Ordered = MkOrdered (Core)
+ structure Stringable = MkStringable (Core)
+
+ open Bounded
+ open CStringable
+ open Ordered
+ open Stringable
+
+ open Core
end
structure CharVector = MkMonoVectorExt (CharVector)
@@ -28,15 +51,37 @@
structure CharArraySlice =
MkMonoArraySliceExt (structure MonoArraySlice = CharArraySlice)
- structure String = struct
- open CharVector String
- type t = string
- val embCString = (toCString, fromCString)
- val embString = (toString, fromString)
- val isoList = (explode, implode)
+ structure String : STRING = struct
+ structure Core = struct
+ open CharVector
+ open String
+ type t = string
+ type cased = t
+ type cstringable = t
+ type ordered = t
+ type scannable = t
+ type stringable = t
+ val toUpper = map Char.toUpper
+ val toLower = map Char.toLower
+ val embCString = (toCString, fromCString)
+ val embString = (toString, fromString)
+ val isoList = (explode, implode)
+ end
+
+ structure CStringable = MkCStringable (Core)
+ structure Ordered = MkOrdered (Core)
+ structure Scannable = MkScannable (Core)
+ structure Stringable = MkStringable (Core)
+
+ open CStringable
+ open Ordered
+ open Scannable
+ open Stringable
+
+ open Core
end
- structure Substring = struct
+ structure Substring : SUBSTRING = struct
open Substring
type t = substring
val length = size
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-word-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-word-ext.fun 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-word-ext.fun 2007-03-05 17:37:07 UTC (rev 5392)
@@ -4,39 +4,40 @@
* See the LICENSE file or http://mlton.org/License for details.
*)
-functor MkWordExt (W : WORD) = struct
+functor MkWordExt (W : BASIS_WORD) : WORD = struct
open W
type t = word
val bounds as (minWord, maxWord) = (fromInt 0, fromInt~1)
- val numBytes = Int.quot (Int.+ (wordSize, 7), 8)
+ val numBytes = BasisInt.quot (BasisInt.+ (wordSize, 7), 8)
local
fun mk fold bs =
- if numBytes <> Word8Vector.length bs then
+ if numBytes <> BasisWord8Vector.length bs then
raise Subscript
else
fold (fn (b, w) =>
- W.orb (W.<< (w, 0w8), W.fromLarge (Word8.toLarge b)))
+ W.orb (W.<< (w, 0w8), W.fromLarge (BasisWord8.toLarge b)))
(W.fromInt 0)
bs
in
- val fromBigBytes = mk Word8Vector.foldl
- val fromLittleBytes = mk Word8Vector.foldr
+ val fromBigBytes = mk BasisWord8Vector.foldl
+ val fromLittleBytes = mk BasisWord8Vector.foldr
end
- val fromWord = fromLarge o Word.toLarge
- val fromWordX = fromLarge o Word.toLargeX
+ val fromWord = fromLarge o BasisWord.toLarge
+ val fromWordX = fromLarge o BasisWord.toLargeX
local
fun mk idx w =
- Word8Vector.tabulate
+ BasisWord8Vector.tabulate
(numBytes,
fn i =>
- Word8.fromLarge
- (W.toLarge (W.>> (w, Word.* (0w8, Word.fromInt (idx i))))))
+ BasisWord8.fromLarge
+ (W.toLarge (W.>> (w, BasisWord.*
+ (0w8, BasisWord.fromInt (idx i))))))
in
- val toBigBytes = mk (fn i => Int.- (Int.- (numBytes, 1), i))
+ val toBigBytes = mk (fn i => BasisInt.- (BasisInt.- (numBytes, 1), i))
val toLittleBytes = mk (fn i => i)
end
- val toWord = Word.fromLarge o toLarge
- val toWordX = Word.fromLarge o toLargeX
+ val toWord = BasisWord.fromLarge o toLarge
+ val toWordX = BasisWord.fromLarge o toLargeX
val embString = (toString, fromString)
val isoBigBytes = (toBigBytes, fromBigBytes)
val isoInt = (toInt, fromInt)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/ints.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/ints.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/ints.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -6,41 +6,41 @@
(** == Extended {INTEGER} and {INT_INF} modules for MLton == *)
-structure FixedInt : INTEGER = MkIntegerExt (FixedInt)
+structure FixedInt : INTEGER = MkIntegerExt (BasisFixedInt)
-structure Int1 : INTEGER = MkIntegerExt (Int1)
-structure Int2 : INTEGER = MkIntegerExt (Int2)
-structure Int3 : INTEGER = MkIntegerExt (Int3)
-structure Int4 : INTEGER = MkIntegerExt (Int4)
-structure Int5 : INTEGER = MkIntegerExt (Int5)
-structure Int6 : INTEGER = MkIntegerExt (Int6)
-structure Int7 : INTEGER = MkIntegerExt (Int7)
-structure Int8 : INTEGER = MkIntegerExt (Int8)
-structure Int9 : INTEGER = MkIntegerExt (Int9)
-structure Int10 : INTEGER = MkIntegerExt (Int10)
-structure Int11 : INTEGER = MkIntegerExt (Int11)
-structure Int12 : INTEGER = MkIntegerExt (Int12)
-structure Int13 : INTEGER = MkIntegerExt (Int13)
-structure Int14 : INTEGER = MkIntegerExt (Int14)
-structure Int15 : INTEGER = MkIntegerExt (Int15)
-structure Int16 : INTEGER = MkIntegerExt (Int16)
-structure Int17 : INTEGER = MkIntegerExt (Int17)
-structure Int18 : INTEGER = MkIntegerExt (Int18)
-structure Int19 : INTEGER = MkIntegerExt (Int19)
-structure Int20 : INTEGER = MkIntegerExt (Int20)
-structure Int21 : INTEGER = MkIntegerExt (Int21)
-structure Int22 : INTEGER = MkIntegerExt (Int22)
-structure Int23 : INTEGER = MkIntegerExt (Int23)
-structure Int24 : INTEGER = MkIntegerExt (Int24)
-structure Int25 : INTEGER = MkIntegerExt (Int25)
-structure Int26 : INTEGER = MkIntegerExt (Int26)
-structure Int27 : INTEGER = MkIntegerExt (Int27)
-structure Int28 : INTEGER = MkIntegerExt (Int28)
-structure Int29 : INTEGER = MkIntegerExt (Int29)
-structure Int30 : INTEGER = MkIntegerExt (Int30)
-structure Int31 : INTEGER = MkIntegerExt (Int31)
-structure Int32 : INTEGER = MkIntegerExt (Int32)
+structure Int1 : INTEGER = MkIntegerExt (BasisInt1)
+structure Int2 : INTEGER = MkIntegerExt (BasisInt2)
+structure Int3 : INTEGER = MkIntegerExt (BasisInt3)
+structure Int4 : INTEGER = MkIntegerExt (BasisInt4)
+structure Int5 : INTEGER = MkIntegerExt (BasisInt5)
+structure Int6 : INTEGER = MkIntegerExt (BasisInt6)
+structure Int7 : INTEGER = MkIntegerExt (BasisInt7)
+structure Int8 : INTEGER = MkIntegerExt (BasisInt8)
+structure Int9 : INTEGER = MkIntegerExt (BasisInt9)
+structure Int10 : INTEGER = MkIntegerExt (BasisInt10)
+structure Int11 : INTEGER = MkIntegerExt (BasisInt11)
+structure Int12 : INTEGER = MkIntegerExt (BasisInt12)
+structure Int13 : INTEGER = MkIntegerExt (BasisInt13)
+structure Int14 : INTEGER = MkIntegerExt (BasisInt14)
+structure Int15 : INTEGER = MkIntegerExt (BasisInt15)
+structure Int16 : INTEGER = MkIntegerExt (BasisInt16)
+structure Int17 : INTEGER = MkIntegerExt (BasisInt17)
+structure Int18 : INTEGER = MkIntegerExt (BasisInt18)
+structure Int19 : INTEGER = MkIntegerExt (BasisInt19)
+structure Int20 : INTEGER = MkIntegerExt (BasisInt20)
+structure Int21 : INTEGER = MkIntegerExt (BasisInt21)
+structure Int22 : INTEGER = MkIntegerExt (BasisInt22)
+structure Int23 : INTEGER = MkIntegerExt (BasisInt23)
+structure Int24 : INTEGER = MkIntegerExt (BasisInt24)
+structure Int25 : INTEGER = MkIntegerExt (BasisInt25)
+structure Int26 : INTEGER = MkIntegerExt (BasisInt26)
+structure Int27 : INTEGER = MkIntegerExt (BasisInt27)
+structure Int28 : INTEGER = MkIntegerExt (BasisInt28)
+structure Int29 : INTEGER = MkIntegerExt (BasisInt29)
+structure Int30 : INTEGER = MkIntegerExt (BasisInt30)
+structure Int31 : INTEGER = MkIntegerExt (BasisInt31)
+structure Int32 : INTEGER = MkIntegerExt (BasisInt32)
-structure Int64 : INTEGER = MkIntegerExt (Int64)
+structure Int64 : INTEGER = MkIntegerExt (BasisInt64)
-structure IntInf : INT_INF = MkIntInfExt (IntInf)
+structure IntInf : INT_INF = MkIntInfExt (BasisIntInf)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-array-slices.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-array-slices.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-array-slices.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -7,37 +7,37 @@
(** == Extended {MONO_ARRAY_SLICE} modules for MLton == *)
structure BoolArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = BoolArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisBoolArraySlice)
structure IntArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = IntArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisIntArraySlice)
structure LargeIntArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = LargeIntArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisLargeIntArraySlice)
structure Int8ArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = Int8ArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisInt8ArraySlice)
structure Int16ArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = Int16ArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisInt16ArraySlice)
structure Int32ArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = Int32ArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisInt32ArraySlice)
structure Int64ArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = Int64ArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisInt64ArraySlice)
structure RealArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = RealArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisRealArraySlice)
structure LargeRealArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = LargeRealArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisLargeRealArraySlice)
structure Real32ArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = Real32ArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisReal32ArraySlice)
structure Real64ArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = Real64ArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisReal64ArraySlice)
structure WordArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = WordArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisWordArraySlice)
structure LargeWordArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = LargeWordArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisLargeWordArraySlice)
structure Word16ArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = Word16ArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisWord16ArraySlice)
structure Word32ArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = Word32ArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisWord32ArraySlice)
structure Word64ArraySlice : MONO_ARRAY_SLICE =
- MkMonoArraySliceExt (structure MonoArraySlice = Word64ArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisWord64ArraySlice)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-arrays.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-arrays.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-arrays.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -7,53 +7,53 @@
(** == Extended {MONO_ARRAY} modules for MLton == *)
structure BoolArray : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = BoolArray
- structure MonoVector = BoolVector)
+ MkMonoArrayExt (structure MonoArray = BasisBoolArray
+ structure MonoVector = BasisBoolVector)
structure IntArray : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = IntArray
- structure MonoVector = IntVector)
+ MkMonoArrayExt (structure MonoArray = BasisIntArray
+ structure MonoVector = BasisIntVector)
structure LargeIntArray : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = LargeIntArray
- structure MonoVector = LargeIntVector)
+ MkMonoArrayExt (structure MonoArray = BasisLargeIntArray
+ structure MonoVector = BasisLargeIntVector)
structure Int8Array : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = Int8Array
- structure MonoVector = Int8Vector)
+ MkMonoArrayExt (structure MonoArray = BasisInt8Array
+ structure MonoVector = BasisInt8Vector)
structure Int16Array : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = Int16Array
- structure MonoVector = Int16Vector)
+ MkMonoArrayExt (structure MonoArray = BasisInt16Array
+ structure MonoVector = BasisInt16Vector)
structure Int32Array : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = Int32Array
- structure MonoVector = Int32Vector)
+ MkMonoArrayExt (structure MonoArray = BasisInt32Array
+ structure MonoVector = BasisInt32Vector)
structure Int64Array : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = Int64Array
- structure MonoVector = Int64Vector)
+ MkMonoArrayExt (structure MonoArray = BasisInt64Array
+ structure MonoVector = BasisInt64Vector)
structure RealArray : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = RealArray
- structure MonoVector = RealVector)
+ MkMonoArrayExt (structure MonoArray = BasisRealArray
+ structure MonoVector = BasisRealVector)
structure LargeRealArray : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = LargeRealArray
- structure MonoVector = LargeRealVector)
+ MkMonoArrayExt (structure MonoArray = BasisLargeRealArray
+ structure MonoVector = BasisLargeRealVector)
structure Real32Array : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = Real32Array
- structure MonoVector = Real32Vector)
+ MkMonoArrayExt (structure MonoArray = BasisReal32Array
+ structure MonoVector = BasisReal32Vector)
structure Real64Array : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = Real64Array
- structure MonoVector = Real64Vector)
+ MkMonoArrayExt (structure MonoArray = BasisReal64Array
+ structure MonoVector = BasisReal64Vector)
structure WordArray : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = WordArray
- structure MonoVector = WordVector)
+ MkMonoArrayExt (structure MonoArray = BasisWordArray
+ structure MonoVector = BasisWordVector)
structure LargeWordArray : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = LargeWordArray
- structure MonoVector = LargeWordVector)
+ MkMonoArrayExt (structure MonoArray = BasisLargeWordArray
+ structure MonoVector = BasisLargeWordVector)
structure Word16Array : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = Word16Array
- structure MonoVector = Word16Vector)
+ MkMonoArrayExt (structure MonoArray = BasisWord16Array
+ structure MonoVector = BasisWord16Vector)
structure Word32Array : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = Word32Array
- structure MonoVector = Word32Vector)
+ MkMonoArrayExt (structure MonoArray = BasisWord32Array
+ structure MonoVector = BasisWord32Vector)
structure Word64Array : MONO_ARRAY =
- MkMonoArrayExt (structure MonoArray = Word64Array
- structure MonoVector = Word64Vector)
+ MkMonoArrayExt (structure MonoArray = BasisWord64Array
+ structure MonoVector = BasisWord64Vector)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-vector-slices.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-vector-slices.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-vector-slices.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -7,37 +7,37 @@
(** == Extended {MONO_VECTOR_SLICE} modules for MLton == *)
structure BoolVectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = BoolVectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisBoolVectorSlice)
structure IntVectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = IntVectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisIntVectorSlice)
structure LargeIntVectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = LargeIntVectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisLargeIntVectorSlice)
structure Int8VectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = Int8VectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisInt8VectorSlice)
structure Int16VectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = Int16VectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisInt16VectorSlice)
structure Int32VectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = Int32VectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisInt32VectorSlice)
structure Int64VectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = Int64VectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisInt64VectorSlice)
structure RealVectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = RealVectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisRealVectorSlice)
structure LargeRealVectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = LargeRealVectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisLargeRealVectorSlice)
structure Real32VectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = Real32VectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisReal32VectorSlice)
structure Real64VectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = Real64VectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisReal64VectorSlice)
structure WordVectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = WordVectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisWordVectorSlice)
structure LargeWordVectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = LargeWordVectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisLargeWordVectorSlice)
structure Word16VectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = Word16VectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisWord16VectorSlice)
structure Word32VectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = Word32VectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisWord32VectorSlice)
structure Word64VectorSlice : MONO_VECTOR_SLICE =
- MkMonoVectorSliceExt (structure MonoVectorSlice = Word64VectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisWord64VectorSlice)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-vectors.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-vectors.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/mono-vectors.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -6,22 +6,22 @@
(** == Extended {MONO_VECTOR} modules for MLton == *)
-structure BoolVector : MONO_VECTOR = MkMonoVectorExt (BoolVector)
+structure BoolVector : MONO_VECTOR = MkMonoVectorExt (BasisBoolVector)
-structure IntVector : MONO_VECTOR = MkMonoVectorExt (IntVector)
-structure LargeIntVector : MONO_VECTOR = MkMonoVectorExt (LargeIntVector)
-structure Int8Vector : MONO_VECTOR = MkMonoVectorExt (Int8Vector)
-structure Int16Vector : MONO_VECTOR = MkMonoVectorExt (Int16Vector)
-structure Int32Vector : MONO_VECTOR = MkMonoVectorExt (Int32Vector)
-structure Int64Vector : MONO_VECTOR = MkMonoVectorExt (Int64Vector)
+structure IntVector : MONO_VECTOR = MkMonoVectorExt (BasisIntVector)
+structure LargeIntVector : MONO_VECTOR = MkMonoVectorExt (BasisLargeIntVector)
+structure Int8Vector : MONO_VECTOR = MkMonoVectorExt (BasisInt8Vector)
+structure Int16Vector : MONO_VECTOR = MkMonoVectorExt (BasisInt16Vector)
+structure Int32Vector : MONO_VECTOR = MkMonoVectorExt (BasisInt32Vector)
+structure Int64Vector : MONO_VECTOR = MkMonoVectorExt (BasisInt64Vector)
-structure RealVector : MONO_VECTOR = MkMonoVectorExt (RealVector)
-structure LargeRealVector : MONO_VECTOR = MkMonoVectorExt (LargeRealVector)
-structure Real32Vector : MONO_VECTOR = MkMonoVectorExt (Real32Vector)
-structure Real64Vector : MONO_VECTOR = MkMonoVectorExt (Real64Vector)
+structure RealVector : MONO_VECTOR = MkMonoVectorExt (BasisRealVector)
+structure LargeRealVector : MONO_VECTOR = MkMonoVectorExt (BasisLargeRealVector)
+structure Real32Vector : MONO_VECTOR = MkMonoVectorExt (BasisReal32Vector)
+structure Real64Vector : MONO_VECTOR = MkMonoVectorExt (BasisReal64Vector)
-structure WordVector : MONO_VECTOR = MkMonoVectorExt (WordVector)
-structure LargeWordVector : MONO_VECTOR = MkMonoVectorExt (LargeWordVector)
-structure Word16Vector : MONO_VECTOR = MkMonoVectorExt (Word16Vector)
-structure Word32Vector : MONO_VECTOR = MkMonoVectorExt (Word32Vector)
-structure Word64Vector : MONO_VECTOR = MkMonoVectorExt (Word64Vector)
+structure WordVector : MONO_VECTOR = MkMonoVectorExt (BasisWordVector)
+structure LargeWordVector : MONO_VECTOR = MkMonoVectorExt (BasisLargeWordVector)
+structure Word16Vector : MONO_VECTOR = MkMonoVectorExt (BasisWord16Vector)
+structure Word32Vector : MONO_VECTOR = MkMonoVectorExt (BasisWord32Vector)
+structure Word64Vector : MONO_VECTOR = MkMonoVectorExt (BasisWord64Vector)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/reals.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/reals.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/reals.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -6,5 +6,5 @@
(** == Extended {REAL} modules for MLton == *)
-structure Real32 : REAL = MkRealExt (Real32)
-structure Real64 : REAL = MkRealExt (Real64)
+structure Real32 : REAL = MkRealExt (BasisReal32)
+structure Real64 : REAL = MkRealExt (BasisReal64)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/words.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/words.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mlton/words.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -6,38 +6,38 @@
(** == Extended {WORD} modules for MLton == *)
-structure SysWord : WORD = MkWordExt (SysWord)
+structure SysWord : WORD = MkWordExt (BasisSysWord)
-structure Word1 : WORD = MkWordExt (Word1)
-structure Word2 : WORD = MkWordExt (Word2)
-structure Word3 : WORD = MkWordExt (Word3)
-structure Word4 : WORD = MkWordExt (Word4)
-structure Word5 : WORD = MkWordExt (Word5)
-structure Word6 : WORD = MkWordExt (Word6)
-structure Word7 : WORD = MkWordExt (Word7)
-structure Word9 : WORD = MkWordExt (Word9)
-structure Word10 : WORD = MkWordExt (Word10)
-structure Word11 : WORD = MkWordExt (Word11)
-structure Word12 : WORD = MkWordExt (Word12)
-structure Word13 : WORD = MkWordExt (Word13)
-structure Word14 : WORD = MkWordExt (Word14)
-structure Word15 : WORD = MkWordExt (Word15)
-structure Word16 : WORD = MkWordExt (Word16)
-structure Word17 : WORD = MkWordExt (Word17)
-structure Word18 : WORD = MkWordExt (Word18)
-structure Word19 : WORD = MkWordExt (Word19)
-structure Word20 : WORD = MkWordExt (Word20)
-structure Word21 : WORD = MkWordExt (Word21)
-structure Word22 : WORD = MkWordExt (Word22)
-structure Word23 : WORD = MkWordExt (Word23)
-structure Word24 : WORD = MkWordExt (Word24)
-structure Word25 : WORD = MkWordExt (Word25)
-structure Word26 : WORD = MkWordExt (Word26)
-structure Word27 : WORD = MkWordExt (Word27)
-structure Word28 : WORD = MkWordExt (Word28)
-structure Word29 : WORD = MkWordExt (Word29)
-structure Word30 : WORD = MkWordExt (Word30)
-structure Word31 : WORD = MkWordExt (Word31)
-structure Word32 : WORD = MkWordExt (Word32)
+structure Word1 : WORD = MkWordExt (BasisWord1)
+structure Word2 : WORD = MkWordExt (BasisWord2)
+structure Word3 : WORD = MkWordExt (BasisWord3)
+structure Word4 : WORD = MkWordExt (BasisWord4)
+structure Word5 : WORD = MkWordExt (BasisWord5)
+structure Word6 : WORD = MkWordExt (BasisWord6)
+structure Word7 : WORD = MkWordExt (BasisWord7)
+structure Word9 : WORD = MkWordExt (BasisWord9)
+structure Word10 : WORD = MkWordExt (BasisWord10)
+structure Word11 : WORD = MkWordExt (BasisWord11)
+structure Word12 : WORD = MkWordExt (BasisWord12)
+structure Word13 : WORD = MkWordExt (BasisWord13)
+structure Word14 : WORD = MkWordExt (BasisWord14)
+structure Word15 : WORD = MkWordExt (BasisWord15)
+structure Word16 : WORD = MkWordExt (BasisWord16)
+structure Word17 : WORD = MkWordExt (BasisWord17)
+structure Word18 : WORD = MkWordExt (BasisWord18)
+structure Word19 : WORD = MkWordExt (BasisWord19)
+structure Word20 : WORD = MkWordExt (BasisWord20)
+structure Word21 : WORD = MkWordExt (BasisWord21)
+structure Word22 : WORD = MkWordExt (BasisWord22)
+structure Word23 : WORD = MkWordExt (BasisWord23)
+structure Word24 : WORD = MkWordExt (BasisWord24)
+structure Word25 : WORD = MkWordExt (BasisWord25)
+structure Word26 : WORD = MkWordExt (BasisWord26)
+structure Word27 : WORD = MkWordExt (BasisWord27)
+structure Word28 : WORD = MkWordExt (BasisWord28)
+structure Word29 : WORD = MkWordExt (BasisWord29)
+structure Word30 : WORD = MkWordExt (BasisWord30)
+structure Word31 : WORD = MkWordExt (BasisWord31)
+structure Word32 : WORD = MkWordExt (BasisWord32)
-structure Word64 : WORD = MkWordExt (Word64)
+structure Word64 : WORD = MkWordExt (BasisWord64)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/bootstrap.cm
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/bootstrap.cm 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/bootstrap.cm 2007-03-05 17:37:07 UTC (rev 5392)
@@ -5,9 +5,8 @@
*)
group
- library(workarounds/basis.cm)
+ library(workarounds/basis-rebound.cm)
source(-)
is
../bootstrap.sml
- ../univ-common.sml
- workarounds/basis.cm
+ workarounds/basis-rebound.cm
Deleted: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/funs.cm
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/funs.cm 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/funs.cm 2007-03-05 17:37:07 UTC (rev 5392)
@@ -1,22 +0,0 @@
-(* Copyright (C) 2006 SSH Communications Security, Helsinki, Finland
- *
- * This code is released under the MLton license, a BSD-style license.
- * See the LICENSE file or http://mlton.org/License for details.
- *)
-
-group
- group(bootstrap.cm)
- source(-)
-is
- ../mk-int-inf-ext.fun
- ../mk-integer-ext.fun
- ../mk-mono-array-ext.fun
- ../mk-mono-array-slice-ext.fun
- ../mk-mono-seq-common-ext.fun
- ../mk-mono-vector-ext.fun
- ../mk-mono-vector-slice-ext.fun
- ../mk-real-ext.fun
- ../mk-seq-common-ext.fun
- ../mk-text-ext.fun
- ../mk-word-ext.fun
- bootstrap.cm
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/ints.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/ints.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/ints.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -6,11 +6,11 @@
(** == Extended {INTEGER} and {INT_INF} modules for SML/NJ == *)
-structure FixedInt = MkIntegerExt (FixedInt)
+structure FixedInt = MkIntegerExt (BasisFixedInt)
-structure Int31 = MkIntegerExt (Int31)
-structure Int32 = MkIntegerExt (Int32)
+structure Int31 = MkIntegerExt (BasisInt31)
+structure Int32 = MkIntegerExt (BasisInt32)
-structure Int64 = MkIntegerExt (Int64)
+structure Int64 = MkIntegerExt (BasisInt64)
-structure IntInf = MkIntInfExt (IntInf)
+structure IntInf = MkIntInfExt (BasisIntInf)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-array-slices.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-array-slices.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-array-slices.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -7,6 +7,6 @@
(** == Extended {MONO_ARRAY_SLICE} modules for SML/NJ == *)
structure RealArraySlice =
- MkMonoArraySliceExt (structure MonoArraySlice = RealArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisRealArraySlice)
structure Real64ArraySlice =
- MkMonoArraySliceExt (structure MonoArraySlice = Real64ArraySlice)
+ MkMonoArraySliceExt (structure MonoArraySlice = BasisReal64ArraySlice)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-arrays.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-arrays.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-arrays.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -7,8 +7,8 @@
(** == Extended {MONO_ARRAY} modules for SML/NJ == *)
structure RealArray =
- MkMonoArrayExt (structure MonoArray = RealArray
- structure MonoVector = RealVector)
+ MkMonoArrayExt (structure MonoArray = BasisRealArray
+ structure MonoVector = BasisRealVector)
structure Real64Array =
- MkMonoArrayExt (structure MonoArray = Real64Array
- structure MonoVector = Real64Vector)
+ MkMonoArrayExt (structure MonoArray = BasisReal64Array
+ structure MonoVector = BasisReal64Vector)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-vector-slices.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-vector-slices.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-vector-slices.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -7,6 +7,6 @@
(** == Extended {MONO_VECTOR_SLICE} modules for SML/NJ == *)
structure RealVectorSlice =
- MkMonoVectorSliceExt (structure MonoVectorSlice = RealVectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisRealVectorSlice)
structure Real64VectorSlice =
- MkMonoVectorSliceExt (structure MonoVectorSlice = Real64VectorSlice)
+ MkMonoVectorSliceExt (structure MonoVectorSlice = BasisReal64VectorSlice)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-vectors.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-vectors.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/mono-vectors.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -6,5 +6,5 @@
(** == Extended {MONO_VECTOR} modules for SML/NJ == *)
-structure RealVector = MkMonoVectorExt (RealVector)
-structure Real64Vector = MkMonoVectorExt (Real64Vector)
+structure RealVector = MkMonoVectorExt (BasisRealVector)
+structure Real64Vector = MkMonoVectorExt (BasisReal64Vector)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/reals.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/reals.sml 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/reals.sml 2007-03-05 17:37:07 UTC (rev 5392)
@@ -6,4 +6,4 @@
(** == Extended {REAL} modules for SML/NJ == *)
-structure Real64 = MkRealExt (Real64)
+structure Real64 = MkRealExt (BasisReal64)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/sigs.cm
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/sigs.cm 2007-03-05 12:33:58 UTC (rev 5391)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/sigs.cm 2007-03-05 17:37:07 UTC (rev 5392)
@@ -5,12 +5,13 @@
*)
group
- group(funs.cm)
+ group(bootstrap.cm)
source(-)
is
../../public/basic.sig
../../public/concept/bitwise.sig
../../public/concept/bounded.sig
+ ../../public/concept/cased.sig
../../public/concept/cstringable.sig
../../public/concept/equality.sig
../../public/concept/flags.sig
@@ -31,6 +32,7 @@
../../public/data/sq.sig
../../public/data/sum.sig
../../public/data/unit.sig
+ ../../public/data/univ.sig
../../public/exit.sig
../../public/fn/bin-fn.sig
../../public/fn/bin-op.sig
@@ -45,6 +47,7 @@
../../public/generic/emb.sig
../../public/generic/fix.sig
../../public/generic/iso.sig
+ ../../public/generic/tie.sig
../../public/io/text-io.sig
../../public/numeric/int-inf.sig
../../public/numeric/integer.sig
@@ -68,4 +71,4 @@
../../public/void.sig
../../public/with.sig
../../public/writer.sig
- funs.cm
+ bootstrap.cm
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/unsealed.cm
======================================
More information about the MLton-commit
mailing list