[MLton-commit] r5588

[Vesa Karvonen]

SML/NJ support.

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

U   mltonlib/trunk/com/ssh/generic/unstable/detail/generics.sml
U   mltonlib/trunk/com/ssh/generic/unstable/detail/lifting.sml
A   mltonlib/trunk/com/ssh/generic/unstable/detail/ml/
A   mltonlib/trunk/com/ssh/generic/unstable/detail/ml/smlnj/
A   mltonlib/trunk/com/ssh/generic/unstable/detail/ml/smlnj/unsealed.cm
U   mltonlib/trunk/com/ssh/generic/unstable/detail/pair-generics.fun
U   mltonlib/trunk/com/ssh/generic/unstable/detail/sml-syntax.sml
A   mltonlib/trunk/com/ssh/generic/unstable/lib.cm
U   mltonlib/trunk/com/ssh/generic/unstable/public/generic.sig

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

Modified: mltonlib/trunk/com/ssh/generic/unstable/detail/generics.sml
===================================================================
--- mltonlib/trunk/com/ssh/generic/unstable/detail/generics.sml	2007-06-06 07:01:42 UTC (rev 5587)
+++ mltonlib/trunk/com/ssh/generic/unstable/detail/generics.sml	2007-06-06 07:10:13 UTC (rev 5588)
@@ -5,6 +5,10 @@
  *)
 
 structure Generics :> GENERICS = struct
+   (* <-- SML/NJ workaround *)
+   open Basic Fn
+   (* SML/NJ workaround --> *)
+
    structure Label = struct
       type t = String.t
       val toString = id

Modified: mltonlib/trunk/com/ssh/generic/unstable/detail/lifting.sml
===================================================================
--- mltonlib/trunk/com/ssh/generic/unstable/detail/lifting.sml	2007-06-06 07:01:42 UTC (rev 5587)
+++ mltonlib/trunk/com/ssh/generic/unstable/detail/lifting.sml	2007-06-06 07:10:13 UTC (rev 5588)
@@ -5,6 +5,11 @@
  *)
 
 structure Lifting :> LIFTING = struct
+   (* <-- SML/NJ workaround *)
+   open Fn
+   infixr 4 />
+   (* SML/NJ workaround --> *)
+
    datatype ('t, 'u) t = IN of {get : 'u -> 't, update : 't UnOp.t -> 'u UnOp.t}
    fun out (IN t) = t
 

Added: mltonlib/trunk/com/ssh/generic/unstable/detail/ml/smlnj/unsealed.cm
===================================================================
--- mltonlib/trunk/com/ssh/generic/unstable/detail/ml/smlnj/unsealed.cm	2007-06-06 07:01:42 UTC (rev 5587)
+++ mltonlib/trunk/com/ssh/generic/unstable/detail/ml/smlnj/unsealed.cm	2007-06-06 07:10:13 UTC (rev 5588)
@@ -0,0 +1,17 @@
+(* 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.
+ *)
+
+group is
+   ../../generics.sml
+   ../../lifting.sml
+   ../../pair-generics.fun
+   ../../sml-syntax.sml
+   ../../../public/generic-index.sig
+   ../../../public/generic-lifting.sig
+   ../../../public/generic.sig
+   ../../../public/generics.sig
+   ../../../public/lifting.sig
+   ../../../../../extended-basis/unstable/basis.cm

Modified: mltonlib/trunk/com/ssh/generic/unstable/detail/pair-generics.fun
===================================================================
--- mltonlib/trunk/com/ssh/generic/unstable/detail/pair-generics.fun	2007-06-06 07:01:42 UTC (rev 5587)
+++ mltonlib/trunk/com/ssh/generic/unstable/detail/pair-generics.fun	2007-06-06 07:10:13 UTC (rev 5588)
@@ -63,7 +63,7 @@
    val largeWord = (F.largeWord, S.largeWord)
 
    val word8  = (F.word8,  S.word8)
-   val word16 = (F.word16, S.word16)
+(* val word16 = (F.word16, S.word16) (* Word16 not provided by SML/NJ *) *)
    val word32 = (F.word32, S.word32)
    val word64 = (F.word64, S.word64)
 end

Modified: mltonlib/trunk/com/ssh/generic/unstable/detail/sml-syntax.sml
===================================================================
--- mltonlib/trunk/com/ssh/generic/unstable/detail/sml-syntax.sml	2007-06-06 07:01:42 UTC (rev 5587)
+++ mltonlib/trunk/com/ssh/generic/unstable/detail/sml-syntax.sml	2007-06-06 07:10:13 UTC (rev 5588)
@@ -16,6 +16,14 @@
    val isLongId     : String.t UnPr.t
    val isNumLabel   : String.t UnPr.t
 end = struct
+   (* <-- SML/NJ workaround *)
+   open Fn UnPr
+   infix  4 <\
+   infixr 4 />
+   infix  2 andAlso
+   infix  1 orElse
+   (* SML/NJ workaround --> *)
+
    structure C = Char and L = List and S = String
    val isSym = C.contains "!%&$#+-/:<=>?@\\~`^|*"
    val isntEmpty = 0 <\ op < o size

Added: mltonlib/trunk/com/ssh/generic/unstable/lib.cm
===================================================================
--- mltonlib/trunk/com/ssh/generic/unstable/lib.cm	2007-06-06 07:01:42 UTC (rev 5587)
+++ mltonlib/trunk/com/ssh/generic/unstable/lib.cm	2007-06-06 07:10:13 UTC (rev 5588)
@@ -0,0 +1,12 @@
+(* 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.
+ *)
+
+library
+   source(-)
+is
+   detail/ml/smlnj/unsealed.cm
+   public/export.sml
+   ../../extended-basis/unstable/basis.cm

Modified: mltonlib/trunk/com/ssh/generic/unstable/public/generic.sig
===================================================================
--- mltonlib/trunk/com/ssh/generic/unstable/public/generic.sig	2007-06-06 07:01:42 UTC (rev 5587)
+++ mltonlib/trunk/com/ssh/generic/unstable/public/generic.sig	2007-06-06 07:10:13 UTC (rev 5588)
@@ -110,7 +110,7 @@
    (** == SUPPORT FOR BINARY DATA == *)
 
    val word8  : Word8.t  Index.t
-   val word16 : Word16.t Index.t
+(* val word16 : Word16.t Index.t (* Word16 not provided by SML/NJ *) *)
    val word32 : Word32.t Index.t
    val word64 : Word64.t Index.t