Smlnj 110 bootstrap

src/basis.mlp

@@ -282,8 +282,8 @@ basis.mlp 306 7
       win_nt/windows.sml
     I386/Linux 18 1
       Library 0 0
-      win_nt/__os_exit.sml
-      win_nt/os_exit.sml
+      unix/__os_exit.sml
+      unix/os_exit.sml
       unix/platform_specific_exports.sml
       unix/__os.sml
       unix/__os_file_sys.sml

src/basis/__char_array.sml

@@ -117,9 +117,10 @@ structure CharArray : MONO_ARRAY =
       (ignore(check_size (length l));
        A (MLWorks.Internal.ByteArray.arrayoflist (cast l)))
 
-    val length   : array -> int                     = cast(MLWorks.Internal.ByteArray.length)
-    val sub      : (array * int) -> elem            = cast(MLWorks.Internal.ByteArray.sub)
-    val update   : (array * int * elem) -> unit     = cast(MLWorks.Internal.ByteArray.update)
+    fun length (A ba) : int = MLWorks.Internal.ByteArray.length ba
+    fun sub (A ba, i:int) : elem = cast(MLWorks.Internal.ByteArray.sub (ba, i))
+    fun update (A ba, i:int, x:elem) : unit =
+	MLWorks.Internal.ByteArray.update (ba, i, cast x)
 
     val extract  : (array * int * int option ) -> vector =
       fn (A a,i,len) =>
@@ -130,7 +131,7 @@ structure CharArray : MONO_ARRAY =
           | NONE => MLWorks.Internal.ByteArray.length a - i
       in 
         if i >= 0 andalso len >= 0 andalso i + len <= MLWorks.Internal.ByteArray.length a
-          then cast(MLWorks.Internal.ByteArray.substring (a,i,len))
+          then MLWorks.Internal.ByteArray.substring (a,i,len)
         else raise Subscript
       end
 

src/basis/__timer.sml

@@ -113,7 +113,7 @@ structure Timer : TIMER =
 
     fun totalRealTimer() = TOTAL
 
-    val startTime = env "Time.start"
+    val startTime : unit -> Time.time = env "Time.start"
 
     fun checkRealTimer arg =
       let

src/basis/__word8_array.sml

@@ -101,20 +101,24 @@ structure Word8Array : MONO_ARRAY =
     fun check_size n =
       if n < 0 orelse n > maxLen then raise Size else n
 
+    val cast = MLWorks.Internal.Value.cast
+
     fun array (i: int, e: elem) : array =
-      A (MLWorks.Internal.ByteArray.array (check_size i, MLWorks.Internal.Value.cast e))
+      A (MLWorks.Internal.ByteArray.array (check_size i, cast e))
 
     fun tabulate (i : int, f : int -> elem) : array =
-      A (MLWorks.Internal.ByteArray.tabulate (check_size i,MLWorks.Internal.Value.cast f))
+      A (MLWorks.Internal.ByteArray.tabulate (check_size i,cast f))
 
     (* uses toplevel List.length which is overridden afterwords *)
     fun fromList (l : elem list) : array =
       (ignore(check_size (length l));
-       A (MLWorks.Internal.ByteArray.arrayoflist (MLWorks.Internal.Value.cast l)))
+       A (MLWorks.Internal.ByteArray.arrayoflist (cast l)))
+
 
-    val length   : array -> int                     = MLWorks.Internal.Value.cast(MLWorks.Internal.ByteArray.length) 
-    val sub      : (array * int) -> elem            = MLWorks.Internal.Value.cast(MLWorks.Internal.ByteArray.sub)
-    val update   : (array * int * elem) -> unit     = MLWorks.Internal.Value.cast(MLWorks.Internal.ByteArray.update)
+    fun length (A ba) : int = MLWorks.Internal.ByteArray.length ba
+    fun sub (A ba, i:int) : elem = cast(MLWorks.Internal.ByteArray.sub (ba, i))
+    fun update (A ba, i:int, x:elem) : unit =
+	MLWorks.Internal.ByteArray.update (ba, i, cast x)
 
     val extract  : (array * int * int option ) -> vector =
       fn (A a,i,len) =>
@@ -125,7 +129,7 @@ structure Word8Array : MONO_ARRAY =
           | NONE => MLWorks.Internal.ByteArray.length a - i
       in 
         if i >= 0 andalso len >= 0 andalso i + len <= MLWorks.Internal.ByteArray.length a
-          then MLWorks.Internal.Value.cast(MLWorks.Internal.ByteArray.substring (a,i,len))
+        then cast (MLWorks.Internal.ByteArray.substring (a,i,len))
         else raise Subscript
       end
 

src/basis/_stream_io.sml

@@ -497,7 +497,7 @@ functor StreamIO(structure PrimIO : PRIM_IO
       }
 
 
-    val openStreams = ref []
+    val openStreams = ref ([]:outstream list)
 
     fun addOpenStream (s as Out{name,...}) =
           (openStreams := s :: !openStreams; s)
@@ -511,7 +511,8 @@ functor StreamIO(structure PrimIO : PRIM_IO
     fun handler(Out{name,...},function, cause) =
                      raise IO.Io{name=name,function=function,cause=cause}
 
-    val exit_function_key = ref NONE (* Handle to exit function if installed *)
+    (* Handle to exit function if installed *)
+    val exit_function_key = ref (NONE:MLWorks.Internal.Exit.key option)
 
     fun mkOutstream(w, mode) =
         let val s =
@@ -657,7 +658,9 @@ functor StreamIO(structure PrimIO : PRIM_IO
           val blen = Array.length data
           val p = !pos
 	  fun copy offset =
-	    (Array.copyVec {src=s, si=0, len=SOME slen, dst=data, di=offset};
+	    ((if slen = 0 then ()
+	      else Array.copyVec {src=s, si=0, len=SOME slen,
+				  dst=data, di=offset});
              pos := offset + slen)
         in if p+slen < blen
              then copy p

src/batch.mlp

@@ -28,7 +28,7 @@ batch.mlp 661 7
     main/link_support.sml
     main/object_output.sml
     rts/gen/__implicit.sml
-    rts/gen/__objectfile.sml
+    main/__objectfile.sml
     rts/gen/__tags.sml
     rts/gen/implicit.sml
     rts/gen/objectfile.sml

src/lambda/_lambda.sml

@@ -888,13 +888,13 @@ struct
   val dummy_var = new_LVar()
   val dummy_varexp = LambdaTypes.VAR dummy_var
 
-  val env_reduce =
-    Lists.reducel
-    (fn (env, (env', _, _)) => Environ.augment_env(env, env'))
+  fun env_reduce (init, list) =
+      Lists.reducel (fn (env, (env', _, _)) => Environ.augment_env(env, env'))
+		    (init, list)
 
-  val denv_reduce =
-    Lists.reducel
-    (fn (env, (_, env',_)) => Environ.augment_denv(env, env'))
+  fun denv_reduce (init, list) =
+      Lists.reducel (fn (env, (_, env',_)) => Environ.augment_denv(env, env'))
+		    (init, list)
 
   fun env_from_list env_le_list =
     env_reduce(Environ.empty_env, env_le_list)

src/lambda/_lambdaflow.sml

@@ -75,7 +75,12 @@ functor LambdaFlow (structure SimpleUtils : SIMPLEUTILS
                     structure RuntimeEnv : RUNTIMEENV
                     structure MachSpec : MACHSPEC
 
+                    (* D: FIXME: apparently a SMLNJ bug that prevents
+                       this Compilation continues without it, tho.
+                       Not sure if it causes problems later.
                     sharing LambdaPrint.LambdaTypes = SimpleUtils.LambdaTypes
+		     *)
+
                     sharing type SimpleUtils.LambdaTypes.FunInfo = 
                       RuntimeEnv.FunInfo
                       ) : LAMBDAFLOW =

src/main/__encapsulate.sml

@@ -154,8 +154,8 @@ require "../lambda/__environtypes";
 require "../main/__pervasives";
 require "../main/__info";
 require "../main/__code_module";
-require "../rts/gen/__objectfile";
 require "../debugger/__debugger_types";
+require "__objectfile";
 require "__enc_sub";
 require "_encapsulate";
 

src/main/__objectfile.sml

@@ -0,0 +1,20 @@
+(* __objectfile.sml the structure *)
+(*
+ * Object file opcodes
+ * Originally generated from rts/src/objectfile.h, but copied
+ * here to represent the output of the current compiler source,
+ * which is *not* necessarily what the runtime system can load.
+ *
+ * Copyright 2013 Ravenbrook Limited
+ *)
+
+structure ObjectFile_ =
+struct
+  val GOOD_MAGIC = 450783256
+  val HEADER_SIZE = 36
+  val OBJECT_FILE_VERSION = 20
+  val OPCODE_CODESET = 0
+  val OPCODE_REAL = 1
+  val OPCODE_STRING = 2
+  val OPCODE_EXTERNAL = 3
+end;

src/main/_project.sml

@@ -1073,7 +1073,7 @@ struct
   fun mark_visited (v, m) = NewMap.define (v, m, false)
   fun mark_compiled (v, m) = NewMap.define (v, m, true)
 
-  val empty_map = NewMap.empty (ModuleId.lt, ModuleId.eq)
+  val empty_map : StatusMap = NewMap.empty (ModuleId.lt, ModuleId.eq)
   val visited_pervasives = mark_compiled (empty_map, Io.pervasive_library_id)
 
   fun no_targets (error_info, location) projectName = 

src/main/_toplevel.sml

@@ -1167,7 +1167,8 @@ struct
   val empty_env =
     CB(Parser.empty_pB, Basis.empty_basis, Environ.empty_top_env)
 
-  val empty_string_map = NewMap.empty (op < : string * string -> bool, op =)
+  val empty_string_map : (string, (string * int * int)) NewMap.map =
+      NewMap.empty (op < : string * string -> bool, op =)
 
   val empty_debug_info = Debugger_Types.empty_information