hg/stx-libbasic: comparison Collection.st

equal deleted inserted replaced

-:2aa6ef1820fe
+:03660093fe98
 Kludges around the stupid definition of OrderedCollection>>new:"
 ^ self withSize:n
 ! !
 !Collection class methodsFor:'Signal constants'!
 emptyCollectionSignal
 "return the signal used to report non-allowed operation on empty collections"
 True is returned for Collection here; false for subclasses.
 Abstract subclasses must redefine again."
 ^ self == Collection
 ! !
 !Collection methodsFor:'*ST2JS-compatibility'!
 inlineDo: aBlock
 	^ self do: aBlock
 ^ self keysAndValuesDo:[:key :index |
 aTwoArgBlock value:index value:key
 ].
 ! !
 !Collection methodsFor:'accessing'!
 anElement
 "return any element from the collection,
 !
 asIdentitySet
 "return a new IdentitySet with the receiver collections elements"
-^ self addAllNonNilElementsTo:(IdentitySet new:self size)
+^ self addAllTo:(IdentitySet new:self size)
 !
 asIntegerArray
 "return a new IntegerArray with the collection's elements
 (which must convert to 32bit integers in the range 0..16rFFFFFFFF)."
 asLongIntegerArray
 "return a new LongIntegerArray with the collections elements
 (which must convert to 64bit integers in the range 0..16rFFFFFFFFFFFFFFFF)."
 ^ self asIntegerArray:LongIntegerArray
+!
+asNewArray
+"return a new Array with the receiver collections elements"
+^ self asArray
+!
+asNewDictionary
+"return a new Dictionary with the receiver collections elements"
+^ self asDictionary
+!
+asNewIdentitySet
+"return a new IdentitySet with the receiver collections elements"
+^ self asIdentitySet
+!
+asNewOrderedCollection
+"return a new OrderedCollection with the receiver collections elements"
+^ self asOrderedCollection
+!
+asNewSet
+"return a new Set with the receiver collections elements"
+^ self asSet
 !
 asOrderedCollection
 "return a new OrderedCollection with the receiver collections elements"
 select:selectBlock thenCollect:collectBlock
 "combination of select followed by collect.
 May be redefined by some subclasses for optimal performance
 (avoiding the creation of intermediate garbage)"
+"/  We do not do this now, since some classes reimplement select or collect....
+"/    ^ self select:selectBlock thenCollect:collectBlock as:self species
 ^ (self select:selectBlock) collect:collectBlock
 "
 #(1 2 3 4 5 6 7) select:[:i | i even] thenCollect:[:i | i * 2]
 "
+!
+select:selectBlock thenCollect:collectBlock as:aCollectionClass
+"return a new collection with all elements from the receiver, for which
+the argument selectBlock evaluates to true.
+Process the elements throgh collectBlock before adding."
+|newCollection|
+newCollection := aCollectionClass new.
+self do:[:each |
+(selectBlock value:each) ifTrue:[newCollection add:(collectBlock value:each)].
+].
+^ newCollection
+"
+#(1 2 3 4) select:[:e | e odd] thenCollect:[:e| e*e] as:OrderedCollection
+(1 to:10) select:[:e | e even] thenCollect:[:e| e*e] as:IdentitySet
+"
+"Created: / 07-08-2010 / 16:26:15 / cg"
 !
 select:selectBlock thenDo:doBlock
 "combination of select followed by do
 Avoids the creation of intermediate garbage"
 "
 ! !
 !Collection methodsFor:'testing'!
+allElementsHaveTheIdenticalValue
+"true if all elements of the receiver have the same value"
+^ self identicalValuesComputedBy:[:el | el]
+"
+#(1 2 3 5 6 7 8 9) allElementsHaveTheIdenticalValue
+#(1 1 1 1 1 1) allElementsHaveTheIdenticalValue
+#(1 1 1.0 1.0 1) allElementsHaveTheIdenticalValue
+#(1 1 1.0 1.0 1) allElementsHaveTheSameValue
+"
+!
 allElementsHaveTheSameValue
 "true if all elements of the receiver have the same value"
 ^ self sameValuesComputedBy:[:el | el]
 size. However, some have more space preallocated to allow
 for faster adding of elements.
 Not used by the system; added for ST-80 compatibility."
 ^ self size
+!
+identicalValuesComputedBy:aBlock
+"true if aBlock answers the same value for all elements of the receiver"
+|first valueForFirstElement|
+first := true.
+self do:[:each |
+first ifTrue:[
+first := false.
+valueForFirstElement := aBlock value:each.
+] ifFalse:[
+valueForFirstElement == (aBlock value:each) ifFalse:[
+^ false.
+].
+].
+].
+^ true
+"
+#(1 2 3 5 6 7 8 9) sameValuesComputedBy:[:el | el even]
+#(1 1 1 1 1 1) sameValuesComputedBy:[:el | el even]
+#(1 1 1.0 1.0 1) sameValuesComputedBy:[:el | el even]
+#(1 3 3 15 1) sameValuesComputedBy:[:el | el even]
+"
+"Created: / 21-12-2011 / 15:59:19 / cg"
 !
 includes:anElement
 "return true, if an object equal to the argument, anObject is in the list.
 This compares using #= (i.e. it does not look for the object itself,
 ! !
 !Collection class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Collection.st,v 1.295 2013-03-26 16:09:26 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Collection.st,v 1.297 2013-03-28 23:14:55 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/Collection.st,v 1.295 2013-03-26 16:09:26 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Collection.st,v 1.297 2013-03-28 23:14:55 stefan Exp $'
 ! !
 Collection initialize!

branch	jv
changeset 18043	03660093fe98
parent 18040	a11a12546f23
parent 14996	d0c96a4314bd
child 18045	c0c600e0d3b3