hg/stx-libbasic: comparison OrdColl.st

equal deleted inserted replaced

-:0d4c08ca9da3
+:5ac1b6b43600
 OrderedCollection comment:'
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
-$Header: /cvs/stx/stx/libbasic/Attic/OrdColl.st,v 1.24 1995-05-16 17:08:13 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Attic/OrdColl.st,v 1.25 1995-05-18 15:09:50 claus Exp $
 '!
 !OrderedCollection class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libbasic/Attic/OrdColl.st,v 1.24 1995-05-16 17:08:13 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Attic/OrdColl.st,v 1.25 1995-05-18 15:09:50 claus Exp $
 "
 !
 documentation
 "
 	firstIndex := 1.
 	lastIndex := 0
 ].
 ^ anObject
-"(OrderedCollection withAll:#(1 2 3 4 5)) removeFirst; yourself"
+"
-"(SortedCollection withAll:#(5 4 3 2 1)) removeFirst; yourself"
+(OrderedCollection withAll:#(1 2 3 4 5)) removeFirst; yourself
-"(SortedCollection new) removeFirst"
+OrderedCollection new removeFirst
+(SortedCollection withAll:#(5 4 3 2 1)) removeFirst; yourself
+"
 !
 removeLast
 "remove the last element from the collection; return the element"
 	firstIndex := 1.
 	lastIndex := 0
 ].
 ^ anObject
-"(OrderedCollection withAll:#(1 2 3 4 5)) removeLast; yourself"
+"
-"(SortedCollection withAll:#(5 4 3 2 1)) removeLast; yourself"
+(OrderedCollection withAll:#(1 2 3 4 5)) removeLast; yourself
+OrderedCollection new removeLast
+(SortedCollection withAll:#(5 4 3 2 1)) removeLast; yourself
+"
+!
+removeFirst:n
+"remove the first n elements from the collection;
+return the elements in an Array"
+|mySize ret|
+mySize := self size.
+mySize < n ifTrue:[
+	"error if collection has not enough elements"
+	^ self notEnoughElementsError.
+].
+ret := Array new:n.
+ret replaceFrom:1 to:n with:contentsArray startingAt:firstIndex.
+"/
+"/ nil-out contents array, to not keep elements from being GC'd
+"/
+contentsArray from:firstIndex to:firstIndex + n - 1 put:nil.
+firstIndex := firstIndex + n.
+firstIndex > lastIndex ifTrue:[
+	"reset to avoid ever growing"
+	firstIndex := 1.
+	lastIndex := 0
+].
+^ ret
+"
+(OrderedCollection withAll:#(1 2 3 4 5)) removeFirst:2; yourself
+(OrderedCollection withAll:#(1 2 3 4 5)) removeFirst:0; yourself
+OrderedCollection new removeFirst:2
+(OrderedCollection withAll:#(1 2 3 4 5)) removeFirst:6
+(SortedCollection withAll:#(5 4 3 2 1)) removeFirst:2; yourself
+"
+!
+removeLast:n
+"remove the last n elements from the collection;
+return the elements in an Array"
+|mySize ret|
+mySize := self size.
+mySize < n ifTrue:[
+	"error if collection has not enough elements"
+	^ self notEnoughElementsError.
+].
+ret := Array new:n.
+ret replaceFrom:1 to:n with:contentsArray startingAt:lastIndex - n + 1.
+"/
+"/ nil-out contents array, to not keep elements from being GC'd
+"/
+contentsArray from:lastIndex - n + 1 to:lastIndex put:nil.
+lastIndex := lastIndex - n.
+firstIndex > lastIndex ifTrue:[
+	"reset to avoid ever growing"
+	firstIndex := 1.
+	lastIndex := 0
+].
+^ ret
+"
+(OrderedCollection withAll:#(1 2 3 4 5)) removeLast:2; yourself
+(OrderedCollection withAll:#(1 2 3 4 5)) removeLast:0; yourself
+(OrderedCollection withAll:#(1 2 3 4 5)) removeLast:6; yourself
+(SortedCollection withAll:#(5 4 3 2 1)) removeLast:2; yourself
+"
 !
 removeFromIndex:startIndex toIndex:stopIndex
 "remove the elements stored under startIndex up to and including
 the elements under stopIndex.
-return the receiver."
+Return the receiver.
+Returning the receiver here is a historic leftover - it may change.
+Please use yourself in a cascade, if you need the receivers value
+when using this method."
 |nDeleted|
+(startIndex < firstIndex
+or:[stopIndex > lastIndex]) ifTrue:[
+	^ self notEnoughElementsError
+].
 nDeleted := stopIndex - startIndex + 1.
 contentsArray
 	replaceFrom:(firstIndex + startIndex - 1)
 	to:(lastIndex - nDeleted)
 	with:contentsArray
 	lastIndex := 0
 ]
 "
 #(1 2 3 4 5 6 7 8 9) asOrderedCollection removeFromIndex:3 toIndex:6
+#(1 2 3 4 5) asOrderedCollection removeFromIndex:3 toIndex:6
 "
 !
 remove:anObject ifAbsent:exceptionBlock
 "remove the first occurrence of anObject from the collection;
 	    ^ anObject
 	].
 	index := index + 1
 ].
 ^ exceptionBlock value
+"
+#(1 2 3 4 5 6 7 8 9) asOrderedCollection remove:3 ifAbsent:'oops'
+#(1 2 3 4 5) asOrderedCollection remove:9 ifAbsent:'oops'
+"
 !
 removeAll
 "remove all elements from the collection."
 self initContents:10
+!
+removeAllSuchThat:aBlock
+"remove all elements that meet a test criteria as specified in aBlock.
+The argument, aBlock is evaluated for successive elements and all those,
+for which it returns true, are removed."
+"/ this is a q&d implementation (slow).
+"/ it should be rewritten to
+|runIndex removed element|
+removed := self species new.
+runIndex := 1.
+[runIndex <= self size] whileTrue:[
+	element := self at:runIndex.
+	(aBlock value:element) ifTrue:[
+	    removed add:element.
+	    self removeAtIndex:runIndex
+	] ifFalse:[
+	    runIndex := runIndex + 1
+	]
+].
+^ removed
+"
+|coll|
+coll := OrderedCollection withAll:(1 to:10).
+Transcript showCr:(coll removeAllSuchThat:[:el | el even]).
+Transcript showCr:coll
+"
 !
 add:anObject
 "add the argument, anObject to the end of the collection
 Return the argument, anObject."
 idx := self indexOf:oldObject.
 idx ~~ 0 ifTrue:[
 	^ self add:newObject beforeIndex:(idx + 1).
 ].
-self errorNotFound:oldObject
+self errorValueNotFound:oldObject
 "
 |c|
 c := #(4 3 2 1) asOrderedCollection.
 c add:'here' after:3.
 idx := self indexOf:oldObject.
 idx ~~ 0 ifTrue:[
 	^ self add:newObject beforeIndex:idx.
 ].
-self errorNotFound:oldObject
+self errorValueNotFound:oldObject
 "
 |c|
 c := #(4 3 2 1) asOrderedCollection.
 c add:'here' before:3.
 after:anObject
 "return the element, after anObject.
 If anObject is not in the receiver, report an error."
-^ self after:anObject ifAbsent:[self errorNotFound:anObject]
+^ self after:anObject ifAbsent:[self errorValueNotFound:anObject]
 "
 #(4 3 2 1) asOrderedCollection after:3.
 #(4 3 2 1) asOrderedCollection after:5
 #(4 3 2 1) asOrderedCollection after:1
 before:anObject
 "return the element before the argument, anObject.
 If anObject is not in the receiver, report an error."
-^ self before:anObject ifAbsent:[self errorNotFound:anObject]
+^ self before:anObject ifAbsent:[self errorValueNotFound:anObject]
 "
 #(4 3 2 1) asOrderedCollection before:3.
 #(4 3 2 1) asOrderedCollection before:4
 #(4 3 2 1) asOrderedCollection before:0

changeset 348	5ac1b6b43600
parent 345	cf2301210c47
child 349	33d5e92c4ce7