[MLton-commit] r5394
Vesa Karvonen
vesak at mlton.org
Mon Mar 5 21:50:35 PST 2007
Move concept functors from detail/ to detail/concept/.
----------------------------------------------------------------------
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-monad.fun
A mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-word-flags.fun
D mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-monad.fun
D mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-word-flags.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/bootstrap.cm
U mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/unsealed.cm
U mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb
----------------------------------------------------------------------
Copied: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-monad.fun (from rev 5393, mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-monad.fun)
Copied: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/concept/mk-word-flags.fun (from rev 5393, mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-word-flags.fun)
Deleted: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-monad.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-monad.fun 2007-03-05 18:23:49 UTC (rev 5393)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-monad.fun 2007-03-06 05:50:34 UTC (rev 5394)
@@ -1,26 +0,0 @@
-(* 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 MkMonad (MonadCore : MONAD_CORE) : MONAD = struct
- infix >> >>& >>* >>= >>@
- open MonadCore
- type 'a func = 'a monad
- fun map f aM = aM >>= return o f
- type 'a monad_ex = 'a monad
- fun aM >>* bM = aM >>= (fn a => bM >>= Fn.<\ (a, return))
- fun fM >>@ aM = map Fn.\> (fM >>* aM)
- fun aM >>& bM = map Product.& (aM >>* bM)
- fun aM >> bM = map #2 (aM >>* bM)
- fun seq [] = return []
- | seq (xM::xMs) = map op :: (xM >>* seq xMs)
-end
-
-functor MkMonadP (MonadPCore : MONADP_CORE) : MONADP = struct
- structure Monad = MkMonad (MonadPCore)
- open Monad MonadPCore
- type 'a monadp_ex = 'a monad
- fun sum [] = zero | sum [x] = x | sum (x::xs) = plus (x, sum xs)
-end
Deleted: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-word-flags.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-word-flags.fun 2007-03-05 18:23:49 UTC (rev 5393)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/mk-word-flags.fun 2007-03-06 05:50:34 UTC (rev 5394)
@@ -1,20 +0,0 @@
-(* 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 MkWordFlags (Arg : WORD) : FLAGS = struct
- open Arg
- type flags = t
- type flags_word = t
- val toWord = Fn.id
- val fromWord = Fn.id
- val isoWord = Iso.id
- val (none, all) = bounds
- val flags = foldl orb none
- val intersect = foldl andb all
- fun clear (f1, f2) = andb (notb f1, f2)
- fun allSet (f1, f2) = f1 = andb (f1, f2)
- fun anySet (f1, f2) = none <> andb (f1, f2)
-end
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 18:23:49 UTC (rev 5393)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/bootstrap.cm 2007-03-06 05:50:34 UTC (rev 5394)
@@ -8,5 +8,5 @@
library(workarounds/basis-rebound.cm)
source(-)
is
- ../bootstrap.sml
+ ../../detail/bootstrap.sml
workarounds/basis-rebound.cm
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/unsealed.cm
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/unsealed.cm 2007-03-05 18:23:49 UTC (rev 5393)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/smlnj/unsealed.cm 2007-03-06 05:50:34 UTC (rev 5394)
@@ -8,70 +8,70 @@
group(sigs.cm)
source(-)
is
- ../basic.sml
- ../effect.sml
- ../fn.sml
- ../pair.sml
- ../product.sml
- ../sq.sml
- ../sum.sml
- ../tie.sml
- ../exn.sml
+ ../../detail/array-slice.sml
+ ../../detail/array.sml
+ ../../detail/basic.sml
+ ../../detail/bin-fn.sml
+ ../../detail/bin-op.sml
+ ../../detail/bin-pr.sml
+ ../../detail/bool.sml
+ ../../detail/buffer.sml
+ ../../detail/cmp.sml
+ ../../detail/common-mono-seqs.sml
+ ../../detail/common-scalars.sml
+ ../../detail/concept/mk-bounded.fun
+ ../../detail/concept/mk-cstringable.fun
+ ../../detail/concept/mk-equality.fun
+ ../../detail/concept/mk-monad.fun
+ ../../detail/concept/mk-ordered.fun
+ ../../detail/concept/mk-scannable.fun
+ ../../detail/concept/mk-stringable.fun
+ ../../detail/concept/mk-word-flags.fun
+ ../../detail/effect.sml
+ ../../detail/emb.sml
+ ../../detail/exit.sml
+ ../../detail/exn.sml
+ ../../detail/fix.sml
+ ../../detail/fn.sml
+ ../../detail/iso.sml
+ ../../detail/list.sml
+ ../../detail/mk-int-inf-ext.fun
+ ../../detail/mk-integer-ext.fun
+ ../../detail/mk-mono-array-ext.fun
+ ../../detail/mk-mono-array-slice-ext.fun
+ ../../detail/mk-mono-seq-common-ext.fun
+ ../../detail/mk-mono-vector-ext.fun
+ ../../detail/mk-mono-vector-slice-ext.fun
+ ../../detail/mk-real-ext.fun
+ ../../detail/mk-seq-common-ext.fun
+ ../../detail/mk-text-ext.fun
+ ../../detail/mk-word-ext.fun
+ ../../detail/option.sml
+ ../../detail/order.sml
+ ../../detail/pair.sml
+ ../../detail/product.sml
+ ../../detail/promise.sml
+ ../../detail/reader.sml
+ ../../detail/ref.sml
+ ../../detail/smlnj/ints.sml
+ ../../detail/smlnj/mono-array-slices.sml
+ ../../detail/smlnj/mono-arrays.sml
+ ../../detail/smlnj/mono-vector-slices.sml
+ ../../detail/smlnj/mono-vectors.sml
+ ../../detail/smlnj/reals.sml
+ ../../detail/smlnj/words.sml
+ ../../detail/sq.sml
+ ../../detail/sum.sml
+ ../../detail/text-io.sml
+ ../../detail/thunk.sml
+ ../../detail/tie.sml
+ ../../detail/un-op.sml
+ ../../detail/un-pr.sml
+ ../../detail/univ-exn.sml
+ ../../detail/vector-slice.sml
+ ../../detail/vector.sml
+ ../../detail/with.sml
+ ../../detail/writer.sml
+ ../../public/lazy/promise.sig
ext.sml
- ../order.sml
- ../array-slice.sml
- ../array.sml
- ../bin-fn.sml
- ../bin-op.sml
- ../bin-pr.sml
- ../bool.sml
- ../buffer.sml
- ../cmp.sml
- ../common-mono-seqs.sml
- ../common-scalars.sml
- ../concept/mk-bounded.fun
- ../concept/mk-cstringable.fun
- ../concept/mk-equality.fun
- ../concept/mk-ordered.fun
- ../concept/mk-scannable.fun
- ../concept/mk-stringable.fun
- ../emb.sml
- ../exit.sml
- ../fix.sml
- ../iso.sml
- ../list.sml
- ../mk-int-inf-ext.fun
- ../mk-integer-ext.fun
- ../mk-monad.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
- ../mk-word-flags.fun
- ../option.sml
- ../promise.sml
- ../reader.sml
- ../ref.sml
- ../smlnj/ints.sml
- ../smlnj/mono-array-slices.sml
- ../smlnj/mono-arrays.sml
- ../smlnj/mono-vector-slices.sml
- ../smlnj/mono-vectors.sml
- ../smlnj/reals.sml
- ../smlnj/words.sml
- ../text-io.sml
- ../thunk.sml
- ../un-op.sml
- ../un-pr.sml
- ../univ-exn.sml
- ../vector-slice.sml
- ../vector.sml
- ../with.sml
- ../writer.sml
- ../../public/lazy/promise.sig
sigs.cm
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb 2007-03-05 18:23:49 UTC (rev 5393)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb 2007-03-06 05:50:34 UTC (rev 5394)
@@ -160,7 +160,7 @@
detail/product.sml
(* MkMonad *)
- detail/mk-monad.fun
+ detail/concept/mk-monad.fun
(* With *)
public/with.sig
@@ -269,7 +269,7 @@
detail/text-io.sml
(* MkWordFlags *)
- detail/mk-word-flags.fun
+ detail/concept/mk-word-flags.fun
in
public/export/$(SML_COMPILER).sml
public/export/common.sml
More information about the MLton-commit
mailing list