SML portability: use LargeInt for time-ms

impls/sml/LargeInt.sml

@@ -0,0 +1,6 @@
+(* Moscow ML does not have the LargeInt structure,
+ * but its Int is 64 bit on 64 bit systems.
+ * We need 64 bit integers for the `time-ms` core function.
+ *)
+
+structure LargeInt = Int

impls/sml/Makefile

@@ -21,7 +21,7 @@ ifeq ($(sml_MODE),mosml)
 SMLC        = mosmlc
 SMLCOUTFLAG = -o
 BUILD_FILE  = %.mlb
-build_args  = -toplevel $(shell grep "\\.sml" $1)
+build_args  = LargeInt.sml -toplevel $(shell grep "\\.sml" $1)
 endif
 ifeq ($(sml_MODE),polyml)
 SMLC        = polyc

impls/sml/core.sml

@@ -140,13 +140,13 @@ val coreNs = List.concat [
       | [NIL]           => NIL
       | _ => raise Domain),
     prim "count"
-    (fn [LIST (l,_)]   => INT (length l)
-      | [VECTOR (v,_)] => INT (length v)
+    (fn [LIST (l,_)]   => INT (length l |> LargeInt.fromInt)
+      | [VECTOR (v,_)] => INT (length v |> LargeInt.fromInt)
       | [NIL]          => INT 0
       | _ => raise Domain),
     prim "nth"
-    (fn [LIST (l,_), INT n]   => (List.nth (l, n) handle Subscript => raise OutOfBounds "index out of bounds")
-      | [VECTOR (v,_), INT n] => (List.nth (v, n) handle Subscript => raise OutOfBounds "index out of bounds")
+    (fn [LIST (l,_), INT n]   => (List.nth (l, (Int.fromLarge n)) handle Subscript => raise OutOfBounds "index out of bounds")
+      | [VECTOR (v,_), INT n] => (List.nth (v, (Int.fromLarge n)) handle Subscript => raise OutOfBounds "index out of bounds")
       | _ => raise Domain),
     prim "first"
     (fn [LIST (l,_)]   => (case l of (x::_) => x | _ => NIL)
@@ -201,5 +201,5 @@ val coreNs = List.concat [
     prim "throw"
     (fn [x] => raise MalException x | _ => raise Domain),
     prim "time-ms"
-    (fn _ => INT (Time.now () |> Time.toMilliseconds |> Int.fromLarge))
+    (fn _ => INT (Time.now () |> Time.toMilliseconds))
 ]

impls/sml/printer.sml

@@ -3,7 +3,7 @@ fun prStr NIL            = "nil"
   | prStr (BOOL true)    = "true"
   | prStr (BOOL false)   = "false"
   | prStr (ATOM x)       = "#<atom> (" ^ (prStr (!x)) ^ ")"
-  | prStr (INT i)        = if i >= 0 then Int.toString i else "-" ^ (Int.toString (Int.abs i))
+  | prStr (INT i)        = if i >= 0 then LargeInt.toString i else "-" ^ (LargeInt.toString (LargeInt.abs i))
   | prStr (STRING s)     = s
   | prStr (KEYWORD s)    = ":" ^ s
   | prStr (LIST (l,_))   = "(" ^ (String.concatWith " " (map prStr l)) ^ ")" (* N.B. not tail recursive *)

impls/sml/reader.sml

@@ -111,7 +111,7 @@ fun readAtom r = case next r of
     SOME (LIT_ATOM "nil", r')     => (NIL, r')
     | SOME (LIT_ATOM "true", r')  => (BOOL true, r')
     | SOME (LIT_ATOM "false", r') => (BOOL false, r')
-    | SOME (LIT_ATOM s, r')       => (Int.fromString s |> Option.map INT
+    | SOME (LIT_ATOM s, r')       => (LargeInt.fromString s |> Option.map INT
                                      |> optIfNone (fn () => Option.filter (String.isPrefix ":") s |> Option.map (KEYWORD o (triml 1)))
                                      |> valIfNone (fn () => SYMBOL s), r')
     | SOME (LIT_STR s, r')        => (malUnescape s |> STRING, r')

impls/sml/types.sml

@@ -1,7 +1,7 @@
 datatype mal_type = NIL
                   | SYMBOL of string
                   | BOOL of bool
-                  | INT of int
+                  | INT of LargeInt.int
                   | STRING of string
                   | KEYWORD of string
                   | LIST of (mal_type list * mal_meta)