[MLton-commit] r6086
Vesa Karvonen
vesak at mlton.org
Thu Oct 25 04:10:35 PDT 2007
Work towards getting the lib to compile with MLKit (again). Both MLton
and SML/NJ compile the lib. Currently MLKit (4.3.2) gives:
[reading source file: detail/data/bool.sml]
detail/data/bool.sml, line 7, column 15:
structure Bool : BOOL = struct
^^^^^^
Error in signature matching involving datatype `bool'
(The value environment specified in the signature
clashes with the value environment in the structure.)
Stopping compilation of MLB-file due to errors.
----------------------------------------------------------------------
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/common/basis.sml
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/basis.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/extensions.mlb
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/pervasive.mlb
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlton/basis.sml
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlton/pervasive.mlb
U mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb
----------------------------------------------------------------------
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-10-25 09:40:28 UTC (rev 6085)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/common/basis.sml 2007-10-25 11:10:34 UTC (rev 6086)
@@ -21,10 +21,10 @@
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_GENERIC_SOCK = GENERIC_SOCK*)
+(*signature BASIS_IEEE_REAL = IEEE_REAL*)
signature BASIS_IMPERATIVE_IO = IMPERATIVE_IO
-signature BASIS_INET_SOCK = INET_SOCK
+(*signature BASIS_INET_SOCK = INET_SOCK*)
signature BASIS_INTEGER = INTEGER
signature BASIS_INT_INF = INT_INF
signature BASIS_IO = IO
@@ -32,13 +32,13 @@
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_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_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
@@ -52,13 +52,13 @@
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_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_PRIM_IO = PRIM_IO*)
signature BASIS_REAL = REAL
-signature BASIS_SOCKET = SOCKET
+(*signature BASIS_SOCKET = SOCKET*)
signature BASIS_STREAM_IO = STREAM_IO
signature BASIS_STRING = STRING
signature BASIS_STRING_CVT = STRING_CVT
@@ -68,8 +68,8 @@
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_UNIX = UNIX*)
+(*signature BASIS_UNIX_SOCK = UNIX_SOCK*)
signature BASIS_VECTOR = VECTOR
signature BASIS_VECTOR_SLICE = VECTOR_SLICE
signature BASIS_WORD = WORD
@@ -87,9 +87,9 @@
structure BasisDate = Date
structure BasisFixedInt = FixedInt
structure BasisGeneral = General
-structure BasisGenericSock = GenericSock
+(*structure BasisGenericSock = GenericSock*)
structure BasisIEEEReal = IEEEReal
-structure BasisINetSock = INetSock
+(*structure BasisINetSock = INetSock*)
structure BasisIO = IO
structure BasisInt = Int
structure BasisLargeInt = LargeInt
@@ -97,15 +97,15 @@
structure BasisLargeWord = LargeWord
structure BasisList = List
structure BasisListPair = ListPair
-structure BasisNetHostDB = NetHostDB
-structure BasisNetProtDB = NetProtDB
-structure BasisNetServDB = NetServDB
+(*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 BasisSocket = Socket*)
structure BasisString = String
structure BasisStringCvt = StringCvt
structure BasisSubstring = Substring
@@ -113,8 +113,8 @@
structure BasisTextIO = TextIO
structure BasisTime = Time
structure BasisTimer = Timer
-structure BasisUnix = Unix
-structure BasisUnixSock = UnixSock
+(*structure BasisUnix = Unix*)
+(*structure BasisUnixSock = UnixSock*)
structure BasisVector = Vector
structure BasisVectorSlice = VectorSlice
structure BasisWord = Word
Copied: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/basis.sml (from rev 6080, 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-10-24 12:29:43 UTC (rev 6080)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/basis.sml 2007-10-25 11:10:34 UTC (rev 6086)
@@ -0,0 +1,13 @@
+(* 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 BasisInt31 = Int31
+structure BasisInt32 = Int32
+structure BasisIntInf = IntInf
+structure BasisReal64 = Real64
+structure BasisSysWord = SysWord
+structure BasisWord31 = Word31
+structure BasisWord32 = Word32
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/extensions.mlb
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/extensions.mlb 2007-10-25 09:40:28 UTC (rev 6085)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/extensions.mlb 2007-10-25 11:10:34 UTC (rev 6086)
@@ -7,5 +7,5 @@
local
$(SML_LIB)/basis/basis.mlb
in
- ../../detail/common/ext.sml
+ ../common/ext.sml
end
Added: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/pervasive.mlb
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/pervasive.mlb 2007-10-25 09:40:28 UTC (rev 6085)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/pervasive.mlb 2007-10-25 11:10:34 UTC (rev 6086)
@@ -0,0 +1,7 @@
+(* Copyright (C) 2006-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.
+ *)
+
+$(SML_LIB)/basis/basis.mlb
Property changes on: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlkit/pervasive.mlb
___________________________________________________________________
Name: svn:eol-style
+ native
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-10-25 09:40:28 UTC (rev 6085)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlton/basis.sml 2007-10-25 11:10:34 UTC (rev 6086)
@@ -7,7 +7,6 @@
structure BasisBoolArray = BoolArray
structure BasisBoolArraySlice = BoolArraySlice
structure BasisBoolVector = BoolVector
-structure BasisBoolVector = BoolVector
structure BasisBoolVectorSlice = BoolVectorSlice
structure BasisInt1 = Int1
structure BasisInt10 = Int10
Added: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlton/pervasive.mlb
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlton/pervasive.mlb 2007-10-25 09:40:28 UTC (rev 6085)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlton/pervasive.mlb 2007-10-25 11:10:34 UTC (rev 6086)
@@ -0,0 +1,7 @@
+(* 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.
+ *)
+
+$(SML_LIB)/basis/pervasive.mlb
Property changes on: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/mlton/pervasive.mlb
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb 2007-10-25 09:40:28 UTC (rev 6085)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb 2007-10-25 11:10:34 UTC (rev 6086)
@@ -23,11 +23,14 @@
local
local
$(SML_LIB)/basis/basis.mlb
+
+ (* Workarounds (if any). *)
+ detail/ml/$(SML_COMPILER)/workarounds.mlb
in
detail/ml/common/basis.sml
detail/ml/$(SML_COMPILER)/basis.sml
end
- $(SML_LIB)/basis/pervasive.mlb
+ detail/ml/$(SML_COMPILER)/pervasive.mlb
in
ann
"forceUsed"
@@ -35,9 +38,6 @@
"warnUnused true"
in
local
- (* Workarounds (if any). *)
- detail/ml/$(SML_COMPILER)/workarounds.mlb
-
(* Minimal modules for bootstrapping. *)
ann "warnUnused false" in
detail/bootstrap.sml
More information about the MLton-commit
mailing list