[MLton-commit] r6759
Matthew Fluet
fluet at mlton.org
Tue Aug 19 15:15:34 PDT 2008
Renaming.
----------------------------------------------------------------------
U mlton/trunk/basis-library/arrays-and-vectors/array.sml
U mlton/trunk/basis-library/arrays-and-vectors/sequence.fun
U mlton/trunk/basis-library/arrays-and-vectors/sequence.sig
U mlton/trunk/basis-library/arrays-and-vectors/slice.sig
----------------------------------------------------------------------
Modified: mlton/trunk/basis-library/arrays-and-vectors/array.sml
===================================================================
--- mlton/trunk/basis-library/arrays-and-vectors/array.sml 2008-08-19 22:15:28 UTC (rev 6758)
+++ mlton/trunk/basis-library/arrays-and-vectors/array.sml 2008-08-19 22:15:33 UTC (rev 6759)
@@ -1,4 +1,4 @@
-(* Copyright (C) 1999-2007 Henry Cejtin, Matthew Fluet, Suresh
+(* Copyright (C) 1999-2008 Henry Cejtin, Matthew Fluet, Suresh
* Jagannathan, and Stephen Weeks.
* Copyright (C) 1997-2000 NEC Research Institute.
*
@@ -29,11 +29,11 @@
struct
open Slice
fun update' (arr, i, x) =
- updateMk' Primitive.Array.updateUnsafe (arr, i, x)
+ update'Mk Primitive.Array.updateUnsafe (arr, i, x)
fun update (arr, i, x) =
updateMk Primitive.Array.updateUnsafe (arr, i, x)
fun unsafeUpdate' (arr, i, x) =
- unsafeUpdateMk' Primitive.Array.updateUnsafe (arr, i, x)
+ unsafeUpdate'Mk Primitive.Array.updateUnsafe (arr, i, x)
fun unsafeUpdate (arr, i, x) =
unsafeUpdateMk Primitive.Array.updateUnsafe (arr, i, x)
fun vector sl = create Vector.tabulate' (fn x => x) sl
@@ -82,9 +82,9 @@
val array' = new'
val array = new
- (* fun update' (arr, i, x) = updateMk' Primitive.Array.updateUnsafe (arr, i, x) *)
+ (* fun update' (arr, i, x) = update'Mk Primitive.Array.updateUnsafe (arr, i, x) *)
fun update (arr, i, x) = updateMk Primitive.Array.updateUnsafe (arr, i, x)
- fun unsafeUpdate' (arr, i, x) = unsafeUpdateMk' Primitive.Array.updateUnsafe (arr, i, x)
+ fun unsafeUpdate' (arr, i, x) = unsafeUpdate'Mk Primitive.Array.updateUnsafe (arr, i, x)
fun unsafeUpdate (arr, i, x) = unsafeUpdateMk Primitive.Array.updateUnsafe (arr, i, x)
end
structure ArraySlice: ARRAY_SLICE_EXTRA = Array.ArraySlice
Modified: mlton/trunk/basis-library/arrays-and-vectors/sequence.fun
===================================================================
--- mlton/trunk/basis-library/arrays-and-vectors/sequence.fun 2008-08-19 22:15:28 UTC (rev 6758)
+++ mlton/trunk/basis-library/arrays-and-vectors/sequence.fun 2008-08-19 22:15:33 UTC (rev 6759)
@@ -261,14 +261,14 @@
sub' (sl, i)
end
else unsafeSub (sl, i)
- fun unsafeUpdateMk' updateUnsafe (T {seq, start, ...}, i, x) =
+ fun unsafeUpdate'Mk updateUnsafe (T {seq, start, ...}, i, x) =
updateUnsafe (seq, start +? i, x)
fun unsafeUpdateMk updateUnsafe (sl, i, x) =
- unsafeUpdateMk' updateUnsafe (sl, SeqIndex.fromIntUnsafe i, x)
- fun updateMk' updateUnsafe (sl as T {len, ...}, i, x) =
+ (unsafeUpdate'Mk updateUnsafe) (sl, SeqIndex.fromIntUnsafe i, x)
+ fun update'Mk updateUnsafe (sl as T {len, ...}, i, x) =
if Primitive.Controls.safe andalso geu (i, len)
then raise Subscript
- else unsafeUpdateMk' updateUnsafe (sl, i, x)
+ else (unsafeUpdate'Mk updateUnsafe) (sl, i, x)
fun updateMk updateUnsafe (sl, i, x) =
if Primitive.Controls.safe
then let
@@ -276,9 +276,9 @@
(SeqIndex.fromInt i)
handle Overflow => raise Subscript
in
- updateMk' updateUnsafe (sl, i, x)
+ (update'Mk updateUnsafe) (sl, i, x)
end
- else unsafeUpdateMk updateUnsafe (sl, i, x)
+ else (unsafeUpdateMk updateUnsafe) (sl, i, x)
fun full (seq: 'a sequence) : 'a slice =
T {seq = seq, start = 0, len = S.length seq}
fun unsafeSubslice' (T {seq, start, len}, start', len') =
@@ -676,14 +676,14 @@
fun sub' (seq, i) = Slice.sub' (Slice.full seq, i)
fun unsafeSub (seq, i) = Slice.unsafeSub (Slice.full seq, i)
fun unsafeSub' (seq, i) = Slice.unsafeSub' (Slice.full seq, i)
- fun updateMk updateUnsafe (seq, i, x) =
+ fun updateMk updateUnsafe (seq, i, x) =
Slice.updateMk updateUnsafe (Slice.full seq, i, x)
- fun updateMk' updateUnsafe (seq, i, x) =
- Slice.updateMk' updateUnsafe (Slice.full seq, i, x)
- fun unsafeUpdateMk updateUnsafe (seq, i, x) =
+ fun update'Mk updateUnsafe (seq, i, x) =
+ Slice.update'Mk updateUnsafe (Slice.full seq, i, x)
+ fun unsafeUpdateMk updateUnsafe (seq, i, x) =
Slice.unsafeUpdateMk updateUnsafe (Slice.full seq, i, x)
- fun unsafeUpdateMk' updateUnsafe (seq, i, x) =
- Slice.unsafeUpdateMk' updateUnsafe (Slice.full seq, i, x)
+ fun unsafeUpdate'Mk updateUnsafe (seq, i, x) =
+ Slice.unsafeUpdate'Mk updateUnsafe (Slice.full seq, i, x)
fun append seqs = make2 Slice.append seqs
fun concat seqs = Slice.concat (List.map Slice.full seqs)
fun appi' f = make (Slice.appi' f)
Modified: mlton/trunk/basis-library/arrays-and-vectors/sequence.sig
===================================================================
--- mlton/trunk/basis-library/arrays-and-vectors/sequence.sig 2008-08-19 22:15:28 UTC (rev 6758)
+++ mlton/trunk/basis-library/arrays-and-vectors/sequence.sig 2008-08-19 22:15:33 UTC (rev 6759)
@@ -1,4 +1,4 @@
-(* Copyright (C) 1999-2007 Henry Cejtin, Matthew Fluet, Suresh
+(* Copyright (C) 1999-2008 Henry Cejtin, Matthew Fluet, Suresh
* Jagannathan, and Stephen Weeks.
* Copyright (C) 1997-2000 NEC Research Institute.
*
@@ -24,14 +24,14 @@
val sub: 'a sequence * int -> 'a elt
val unsafeSub': 'a sequence * SeqIndex.int -> 'a elt
val unsafeSub: 'a sequence * int -> 'a elt
- (* updateMk',updateMk,unsafeUpdateMk',unsafeUpdateMk:
+ (* update'Mk,updateMk,unsafeUpdate'Mk,unsafeUpdateMk:
* ('a sequence * SeqIndex.int * 'a elt -> unit) should be an unsafe update.
*)
- val updateMk': ('a sequence * SeqIndex.int * 'a elt -> unit) ->
+ val update'Mk: ('a sequence * SeqIndex.int * 'a elt -> unit) ->
('a sequence * SeqIndex.int * 'a elt) -> unit
val updateMk: ('a sequence * SeqIndex.int * 'a elt -> unit) ->
('a sequence * int * 'a elt) -> unit
- val unsafeUpdateMk': ('a sequence * SeqIndex.int * 'a elt -> unit) ->
+ val unsafeUpdate'Mk: ('a sequence * SeqIndex.int * 'a elt -> unit) ->
('a sequence * SeqIndex.int * 'a elt) -> unit
val unsafeUpdateMk: ('a sequence * SeqIndex.int * 'a elt -> unit) ->
('a sequence * int * 'a elt) -> unit
Modified: mlton/trunk/basis-library/arrays-and-vectors/slice.sig
===================================================================
--- mlton/trunk/basis-library/arrays-and-vectors/slice.sig 2008-08-19 22:15:28 UTC (rev 6758)
+++ mlton/trunk/basis-library/arrays-and-vectors/slice.sig 2008-08-19 22:15:33 UTC (rev 6759)
@@ -1,4 +1,4 @@
-(* Copyright (C) 1999-2007 Henry Cejtin, Matthew Fluet, Suresh
+(* Copyright (C) 1999-2008 Henry Cejtin, Matthew Fluet, Suresh
* Jagannathan, and Stephen Weeks.
* Copyright (C) 1997-2000 NEC Research Institute.
*
@@ -17,14 +17,14 @@
val sub: 'a slice * int -> 'a elt
val unsafeSub': 'a slice * SeqIndex.int -> 'a elt
val unsafeSub: 'a slice * int -> 'a elt
- (* updateMk',updateMk,unsafeUpdateMk',unsafeUpdateMk:
+ (* update'Mk,updateMk,unsafeUpdate'Mk,unsafeUpdateMk:
* ('a sequence * SeqIndex.int * 'a elt -> unit) should be an unsafe update.
*)
- val updateMk': ('a sequence * SeqIndex.int * 'a elt -> unit) ->
+ val update'Mk: ('a sequence * SeqIndex.int * 'a elt -> unit) ->
('a slice * SeqIndex.int * 'a elt) -> unit
val updateMk: ('a sequence * SeqIndex.int * 'a elt -> unit) ->
('a slice * int * 'a elt) -> unit
- val unsafeUpdateMk': ('a sequence * SeqIndex.int * 'a elt -> unit) ->
+ val unsafeUpdate'Mk: ('a sequence * SeqIndex.int * 'a elt -> unit) ->
('a slice * SeqIndex.int * 'a elt) -> unit
val unsafeUpdateMk: ('a sequence * SeqIndex.int * 'a elt -> unit) ->
('a slice * int * 'a elt) -> unit
More information about the MLton-commit
mailing list