[MLton-commit] r4740
Vesa Karvonen
vesak at mlton.org
Fri Oct 20 17:26:49 PDT 2006
Switched to emb/iso -prefixes from Emb/Iso -suffices. Prefixes seem more
consistent with the basis library style.
----------------------------------------------------------------------
U mltonlib/trunk/com/ssh/extended-basis/unstable/array.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/array.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/char.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/int-inf.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/integer.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/mk-integer-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/mk-mono-array-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/mk-mono-vector-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/mk-real-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/mk-text-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/mk-word-ext.fun
U mltonlib/trunk/com/ssh/extended-basis/unstable/mono-array.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/mono-vector.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/real.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/string.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/vector.sig
U mltonlib/trunk/com/ssh/extended-basis/unstable/vector.sml
U mltonlib/trunk/com/ssh/extended-basis/unstable/word.sig
----------------------------------------------------------------------
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/array.sig
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/array.sig 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/array.sig 2006-10-21 00:26:40 UTC (rev 4740)
@@ -19,6 +19,6 @@
(** == Isomorphisms == *)
- val listIso : ('a array, 'a list) iso
- val vectorIso : ('a array, 'a vector) iso
+ val isoList : ('a array, 'a list) iso
+ val isoVector : ('a array, 'a vector) iso
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/array.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/array.sml 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/array.sml 2006-10-21 00:26:40 UTC (rev 4740)
@@ -10,8 +10,8 @@
structure Array : ARRAY = struct
open Array
fun toList v = foldr op :: [] v
- val listIso = (toList, fromList)
+ val isoList = (toList, fromList)
val toVector = vector
fun fromVector v = tabulate (Vector.length v, fn i => Vector.sub (v, i))
- val vectorIso = (toVector, fromVector)
+ val isoVector = (toVector, fromVector)
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/char.sig
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/char.sig 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/char.sig 2006-10-21 00:26:40 UTC (rev 4740)
@@ -31,7 +31,7 @@
(** == Isomorphisms == *)
- val intIso : (char, Int.int) iso
+ val isoInt : (char, Int.int) iso
(**
* The isomorphism between characters and character codes. It always
* equals {(ord, chr)}. Note that the projection part of the
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/int-inf.sig
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/int-inf.sig 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/int-inf.sig 2006-10-21 00:26:40 UTC (rev 4740)
@@ -16,12 +16,12 @@
(** == Embeddings == *)
- val stringEmb : (int, string) emb
+ val embString : (int, string) emb
(** == Isomorphisms == *)
- val intIso : (int, Int.int) iso
- val largeIso : (int, LargeInt.int) iso
+ val isoInt : (int, Int.int) iso
+ val isoLarge : (int, LargeInt.int) iso
(** == Predicates == *)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/integer.sig
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/integer.sig 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/integer.sig 2006-10-21 00:26:40 UTC (rev 4740)
@@ -16,12 +16,12 @@
(** == Embeddings == *)
- val stringEmb : (int, string) emb
+ val embString : (int, string) emb
(** == Isomorphisms == *)
- val intIso : (int, Int.int) iso
- val largeIso : (int, LargeInt.int) iso
+ val isoInt : (int, Int.int) iso
+ val isoLarge : (int, LargeInt.int) iso
(** == Predicates == *)
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/mk-integer-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/mk-integer-ext.fun 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/mk-integer-ext.fun 2006-10-21 00:26:40 UTC (rev 4740)
@@ -9,9 +9,9 @@
*)
functor MkIntegerExt (I : INTEGER) = struct
open I
- val intIso = (toInt, fromInt)
- val largeIso = (toLarge, fromLarge)
- val stringEmb = (toString, fromString)
+ val embString = (toString, fromString)
+ val isoInt = (toInt, fromInt)
+ val isoLarge = (toLarge, fromLarge)
fun isZero i = fromInt 0 = i
fun isEven i = isZero (rem (i, fromInt 2))
val isOdd = not o isEven
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/mk-mono-array-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/mk-mono-array-ext.fun 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/mk-mono-array-ext.fun 2006-10-21 00:26:40 UTC (rev 4740)
@@ -13,13 +13,13 @@
where type vector = MonoVector.vector) = struct
open MonoArray
fun toList a = foldr op :: [] a
- val listIso = (toList, fromList)
+ val isoList = (toList, fromList)
val toVector = vector
fun fromVector v =
tabulate (MonoVector.length v, fn i => MonoVector.sub (v, i))
- val vectorIso = (toVector, fromVector)
+ val isoVector = (toVector, fromVector)
fun toPoly a = Array.tabulate (length a, fn i => sub (a, i))
fun fromPoly a = tabulate (Array.length a, fn i => Array.sub (a, i))
- val polyIso = (toPoly, fromPoly)
+ val isoPoly = (toPoly, fromPoly)
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/mk-mono-vector-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/mk-mono-vector-ext.fun 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/mk-mono-vector-ext.fun 2006-10-21 00:26:40 UTC (rev 4740)
@@ -10,9 +10,9 @@
functor MkMonoVectorExt (M : MONO_VECTOR) = struct
open M
fun toList v = foldr op :: [] v
- val listIso = (toList, fromList)
+ val isoList = (toList, fromList)
(* XXX It would be nice to avoid copying in toPoly and fromPoly *)
fun toPoly v = Vector.tabulate (length v, fn i => sub (v, i))
fun fromPoly v = tabulate (Vector.length v, fn i => Vector.sub (v, i))
- val polyIso = (toPoly, fromPoly)
+ val isoPoly = (toPoly, fromPoly)
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/mk-real-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/mk-real-ext.fun 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/mk-real-ext.fun 2006-10-21 00:26:40 UTC (rev 4740)
@@ -10,10 +10,10 @@
functor MkRealExt (R : REAL) = struct
open R
- val decimalEmb = (toDecimal, fromDecimal)
- val intIso = (toInt IEEEReal.TO_NEAREST, fromInt)
- val largeIso = (toLarge, fromLarge IEEEReal.TO_NEAREST)
- val largeIntIso = (toLargeInt IEEEReal.TO_NEAREST, fromLargeInt)
- val manExpIso = (toManExp, fromManExp)
- val stringEmb = (toString, fromString)
+ val embDecimal = (toDecimal, fromDecimal)
+ val embString = (toString, fromString)
+ val isoInt = (toInt IEEEReal.TO_NEAREST, fromInt)
+ val isoLarge = (toLarge, fromLarge IEEEReal.TO_NEAREST)
+ val isoLargeInt = (toLargeInt IEEEReal.TO_NEAREST, fromLargeInt)
+ val isoManExp = (toManExp, fromManExp)
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/mk-text-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/mk-text-ext.fun 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/mk-text-ext.fun 2006-10-21 00:26:40 UTC (rev 4740)
@@ -12,10 +12,10 @@
structure Char = struct
open Char
- val intIso = (ord, chr)
val minOrd = 0
val boundsChar = (minChar, maxChar)
val boundsOrd = (minOrd, maxOrd)
+ val isoInt = (ord, chr)
end
structure CharVector = MkMonoVectorExt (CharVector)
@@ -25,8 +25,8 @@
structure String = struct
open CharVector String
- val listIso = (explode, implode)
- val cStringEmb = (toCString, fromCString)
- val stringEmb = (toString, fromString)
+ val embCString = (toCString, fromCString)
+ val embString = (toString, fromString)
+ val isoList = (explode, implode)
end
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/mk-word-ext.fun
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/mk-word-ext.fun 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/mk-word-ext.fun 2006-10-21 00:26:40 UTC (rev 4740)
@@ -11,14 +11,14 @@
open W
val toWord = Word.fromLarge o toLarge
val fromWord = fromLarge o Word.toLarge
- val intIso = (toInt, fromInt)
- val intXIso = (toIntX, fromInt)
- val largeIso = (toLarge, fromLarge)
- val largeIntIso = (toLargeInt, fromLargeInt)
- val largeIntXIso = (toLargeIntX, fromLargeInt)
- val largeXIso = (toLargeX, fromLarge)
- val wordIso = (toWord, fromWord)
- val stringEmb = (toString, fromString)
+ val embString = (toString, fromString)
+ val isoInt = (toInt, fromInt)
+ val isoIntX = (toIntX, fromInt)
+ val isoLarge = (toLarge, fromLarge)
+ val isoLargeInt = (toLargeInt, fromLargeInt)
+ val isoLargeIntX = (toLargeIntX, fromLargeInt)
+ val isoLargeX = (toLargeX, fromLarge)
+ val isoWord = (toWord, fromWord)
fun isZero w = fromInt 0 = w
fun isEven w = isZero (andb (fromInt 1, w))
val isOdd = not o isEven
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/mono-array.sig
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/mono-array.sig 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/mono-array.sig 2006-10-21 00:26:40 UTC (rev 4740)
@@ -21,7 +21,7 @@
(** == Isomorphisms == *)
- val listIso : (array, elem list) iso
- val polyIso : (array, elem Array.array) iso
- val vectorIso : (array, vector) iso
+ val isoList : (array, elem list) iso
+ val isoPoly : (array, elem Array.array) iso
+ val isoVector : (array, vector) iso
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/mono-vector.sig
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/mono-vector.sig 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/mono-vector.sig 2006-10-21 00:26:40 UTC (rev 4740)
@@ -19,6 +19,6 @@
(** == Isomorphisms == *)
- val listIso : (vector, elem list) iso
- val polyIso : (vector, elem Vector.vector) iso
+ val isoList : (vector, elem list) iso
+ val isoPoly : (vector, elem Vector.vector) iso
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/real.sig
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/real.sig 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/real.sig 2006-10-21 00:26:40 UTC (rev 4740)
@@ -12,13 +12,13 @@
(** == Embeddings == *)
- val decimalEmb : (real, IEEEReal.decimal_approx) emb
- val stringEmb : (real, string) emb
+ val embDecimal : (real, IEEEReal.decimal_approx) emb
+ val embString : (real, string) emb
(** == Isomorphisms == *)
- val intIso : (real, Int.int) iso
- val largeIntIso : (real, LargeInt.int) iso
- val largeIso : (real, LargeReal.real) iso
- val manExpIso : (real, {man : real, exp : int}) iso
+ val isoInt : (real, Int.int) iso
+ val isoLarge : (real, LargeReal.real) iso
+ val isoLargeInt : (real, LargeInt.int) iso
+ val isoManExp : (real, {man : real, exp : int}) iso
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/string.sig
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/string.sig 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/string.sig 2006-10-21 00:26:40 UTC (rev 4740)
@@ -12,12 +12,12 @@
(** == Embeddings == *)
- val cStringEmb : (string, string) emb
- val stringEmb : (string, string) emb
+ val embCString : (string, string) emb
+ val embString : (string, string) emb
(** == Isomorphisms == *)
- val listIso : (string, char list) iso
+ val isoList : (string, char list) iso
(** == {MONO_VECTOR} == *)
@@ -36,10 +36,10 @@
val foldri : (int * elem * 'a -> 'a) -> 'a -> vector -> 'a
val fromList : elem list -> vector
val fromPoly : elem Vector.vector -> vector
+ val isoPoly : (vector, elem Vector.vector) iso
val length : vector -> int
val mapi : (int * elem -> elem) -> vector -> vector
val maxLen : int
- val polyIso : (vector, elem Vector.vector) iso
val tabulate : int * (int -> elem) -> vector
val toList : vector -> elem list
val toPoly : vector -> elem Vector.vector
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/vector.sig
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/vector.sig 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/vector.sig 2006-10-21 00:26:40 UTC (rev 4740)
@@ -16,5 +16,5 @@
(** == Isomorphisms == *)
- val listIso : ('a vector, 'a list) iso
+ val isoList : ('a vector, 'a list) iso
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/vector.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/vector.sml 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/vector.sml 2006-10-21 00:26:40 UTC (rev 4740)
@@ -10,5 +10,5 @@
structure Vector : VECTOR = struct
open Vector
fun toList v = foldr op :: [] v
- val listIso = (toList, fromList)
+ val isoList = (toList, fromList)
end
Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/word.sig
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/word.sig 2006-10-20 21:22:57 UTC (rev 4739)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/word.sig 2006-10-21 00:26:40 UTC (rev 4740)
@@ -24,17 +24,17 @@
(** == Embeddings == *)
- val stringEmb : (word, string) emb
+ val embString : (word, string) emb
(** == Isomorphisms == *)
- val intIso : (word, Int.int) iso
- val intXIso : (word, Int.int) iso
- val largeIntIso : (word, LargeInt.int) iso
- val largeIntXIso : (word, LargeInt.int) iso
- val largeIso : (word, LargeWord.word) iso
- val largeXIso : (word, LargeWord.word) iso
- val wordIso : (word, Word.word) iso
+ val isoInt : (word, Int.int) iso
+ val isoIntX : (word, Int.int) iso
+ val isoLarge : (word, LargeWord.word) iso
+ val isoLargeInt : (word, LargeInt.int) iso
+ val isoLargeIntX : (word, LargeInt.int) iso
+ val isoLargeX : (word, LargeWord.word) iso
+ val isoWord : (word, Word.word) iso
(** == Predicates == *)
More information about the MLton-commit
mailing list