Squeak-dev February 2010

squeak-dev@lists.squeakfoundation.org

89 participants
595 discussions

Smalltalk meetup
by Alexander Lazarević 02 Feb '10

02 Feb '10

Please join us on the 18th of February for a first Cologne Smalltalk User Meetup. Anyone interested in Smalltalk is invited, regardless if you only recently discovered the magic of doing things the Smalltalk way, are a die hard VM-Hacker, want to share your experience on web-development in Seaside or like to chit-chat while enjoying a Kölsch. We're gonna meet at 7pm at Vision Factory GmbH Sömmeringstr. 75 50823 Köln (across the yard at the rear house) Please send a short notice to laza(a)blobworks.com if you are planning to attend.

2 2

The Trunk: CollectionsTests-ar.137.mcz
by commits＠source.squeak.org 02 Feb '10

02 Feb '10

Andreas Raab uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-ar.137.mcz ==================== Summary ==================== Name: CollectionsTests-ar.137 Author: ar Time: 1 February 2010, 9:44:54.528 pm UUID: 22c99a94-361b-f54f-83f8-4fcf0d126d36 Ancestors: CollectionsTests-ar.136 Fixes a typo in SetWithNilTest. =============== Diff against CollectionsTests-ar.136 =============== Item was changed: ----- Method: SetWithNilTest>>runSetWithNilTestOf: (in category 'tests') ----- runSetWithNilTestOf: newSet "Run the common tests for the given set class" self shouldnt:[newSet value add: nil] raise: Error. self shouldnt:[newSet value addAll: #(nil nil nil)] raise: Error. self assert: (newSet value add: nil; yourself) size = 1. self assert: (newSet value addAll: #(nil nil nil); yourself) size = 1. self assert: ((newSet value add: nil; yourself) includes: nil). self assert: ((newSet value addAll: #(nil nil nil); yourself) includes: nil). self assert: (newSet value add: nil; yourself) anyOne = nil. self assert: ((newSet value add: nil; yourself) remove: nil) == nil. self assert: ((newSet value add: nil; yourself) remove: nil; yourself) isEmpty. self assert: (newSet value addAll: #(1 nil foo); yourself) size = 3. self assert: ((newSet value addAll: #(1 nil foo); yourself) remove: nil; yourself) size = 2. + self assert: ((newSet value add: nil; yourself) collect:[:x| x]) = (newSet value add: nil; yourself). - self assert: ((newSet value add: nil; yourself) collect:[:x| x]) = (PluggableSet with: nil). self assert: ((newSet value add: nil; yourself) collect:[:x| x] as: Array) = #(nil). self deny: ((newSet value) includes: nil). self deny: ((newSet value add: 3; yourself) includes: nil). self deny: ((newSet value add: 3; remove: 3; yourself) includes: nil). !

1 0

The Trunk: CollectionsTests-ar.136.mcz
by commits＠source.squeak.org 02 Feb '10

02 Feb '10

Andreas Raab uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-ar.136.mcz ==================== Summary ==================== Name: CollectionsTests-ar.136 Author: ar Time: 1 February 2010, 9:40:49.176 pm UUID: 61a558f8-21ec-514b-a5e1-9746868ed130 Ancestors: CollectionsTests-ar.135 More tests, including KeyedSet and WeakSet. =============== Diff against CollectionsTests-ar.135 =============== Item was changed: ----- Method: SetWithNilTest>>testIdentitySetWithNil (in category 'tests') ----- testIdentitySetWithNil + self runSetWithNilTestOf: [IdentitySet new]! - self shouldnt:[IdentitySet with: nil] raise: Error. - self shouldnt:[IdentitySet withAll: #(nil nil nil)] raise: Error. - - self assert: (IdentitySet with: nil) size = 1. - self assert: (IdentitySet withAll: #(nil nil nil)) size = 1. - - self assert: (IdentitySet with: nil) anyOne = nil. - self assert: ((IdentitySet with: nil) remove: nil) == nil. - self assert: ((IdentitySet with: nil) remove: nil; yourself) isEmpty. - - self assert: (IdentitySet withAll: #(1 nil foo)) size = 3. - self assert: ((IdentitySet withAll: #(1 nil foo)) remove: nil; yourself) size = 2. - - self assert: ((IdentitySet with: nil) collect:[:x| x]) = (IdentitySet with: nil). - self assert: ((IdentitySet with: nil) collect:[:x| x] as: Array) = #(nil). - ! Item was changed: ----- Method: SetWithNilTest>>testKeyedSetWithNil (in category 'tests') ----- testKeyedSetWithNil + | set | + self runSetWithNilTestOf: [KeyedSet keyBlock:[:o| o]]. + set := KeyedSet keyBlock:[:o| o]. + set add: nil. + self assert: (set at: nil) == nil. - self should:[KeyedSet with: nil] raise: Error. ! Item was changed: ----- Method: SetWithNilTest>>testWeakSetWithNil (in category 'tests') ----- testWeakSetWithNil + | set | + self runSetWithNilTestOf: [WeakSet new]. + "Ensure that GCed entries don't count" + set := WeakSet with: Object new. + Smalltalk garbageCollect. + set do:[:x| self assert: false]. "test for de facto emptyness" + self deny: (set includes: nil). + set add: nil. + self assert: (set includes: nil). + set remove: nil. + self deny: (set includes: nil).! - self should:[WeakSet with: nil] raise: Error. - ! Item was added: + ----- Method: SetWithNilTest>>testKeyedIdentitySetWithNil (in category 'tests') ----- + testKeyedIdentitySetWithNil + | set | + self runSetWithNilTestOf: [KeyedIdentitySet keyBlock:[:o| o]]. + set := KeyedIdentitySet keyBlock:[:o| o]. + set add: nil. + self assert: (set at: nil) == nil. + ! Item was changed: ----- Method: SetWithNilTest>>testSetWithNil (in category 'tests') ----- testSetWithNil + self runSetWithNilTestOf: [Set new]! - self shouldnt:[Set with: nil] raise: Error. - self shouldnt:[Set withAll: #(nil nil nil)] raise: Error. - - self assert: (Set with: nil) size = 1. - self assert: (Set withAll: #(nil nil nil)) size = 1. - - self assert: (Set with: nil) anyOne = nil. - self assert: ((Set with: nil) remove: nil) == nil. - self assert: ((Set with: nil) remove: nil; yourself) isEmpty. - - self assert: (Set withAll: #(1 nil foo)) size = 3. - self assert: ((Set withAll: #(1 nil foo)) remove: nil; yourself) size = 2. - - self assert: ((Set with: nil) collect:[:x| x]) = (Set with: nil). - self assert: ((Set with: nil) collect:[:x| x] as: Array) = #(nil). - ! Item was changed: ----- Method: SetWithNilTest>>testPluggableSetWithNil (in category 'tests') ----- testPluggableSetWithNil + self runSetWithNilTestOf: [PluggableSet new]! - self shouldnt:[PluggableSet with: nil] raise: Error. - self shouldnt:[PluggableSet withAll: #(nil nil nil)] raise: Error. - - self assert: (PluggableSet with: nil) size = 1. - self assert: (PluggableSet withAll: #(nil nil nil)) size = 1. - - self assert: (PluggableSet with: nil) anyOne = nil. - self assert: ((PluggableSet with: nil) remove: nil) == nil. - self assert: ((PluggableSet with: nil) remove: nil; yourself) isEmpty. - - self assert: (PluggableSet withAll: #(1 nil foo)) size = 3. - self assert: ((PluggableSet withAll: #(1 nil foo)) remove: nil; yourself) size = 2. - - self assert: ((PluggableSet with: nil) collect:[:x| x]) = (PluggableSet with: nil). - self assert: ((PluggableSet with: nil) collect:[:x| x] as: Array) = #(nil). - ! Item was added: + ----- Method: SetWithNilTest>>runSetWithNilTestOf: (in category 'tests') ----- + runSetWithNilTestOf: newSet + "Run the common tests for the given set class" + self shouldnt:[newSet value add: nil] raise: Error. + self shouldnt:[newSet value addAll: #(nil nil nil)] raise: Error. + + self assert: (newSet value add: nil; yourself) size = 1. + self assert: (newSet value addAll: #(nil nil nil); yourself) size = 1. + + self assert: ((newSet value add: nil; yourself) includes: nil). + self assert: ((newSet value addAll: #(nil nil nil); yourself) includes: nil). + + self assert: (newSet value add: nil; yourself) anyOne = nil. + self assert: ((newSet value add: nil; yourself) remove: nil) == nil. + self assert: ((newSet value add: nil; yourself) remove: nil; yourself) isEmpty. + + self assert: (newSet value addAll: #(1 nil foo); yourself) size = 3. + self assert: ((newSet value addAll: #(1 nil foo); yourself) remove: nil; yourself) size = 2. + + self assert: ((newSet value add: nil; yourself) collect:[:x| x]) = (PluggableSet with: nil). + self assert: ((newSet value add: nil; yourself) collect:[:x| x] as: Array) = #(nil). + + self deny: ((newSet value) includes: nil). + self deny: ((newSet value add: 3; yourself) includes: nil). + self deny: ((newSet value add: 3; remove: 3; yourself) includes: nil). + !

1 0

The Trunk: Collections-ar.289.mcz
by commits＠source.squeak.org 02 Feb '10

02 Feb '10

Andreas Raab uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ar.289.mcz ==================== Summary ==================== Name: Collections-ar.289 Author: ar Time: 1 February 2010, 9:38:20.103 pm UUID: 87822d82-f84f-c743-be96-cb1c4e3c9df2 Ancestors: Collections-ar.288 Complete Set with nil support by providing proper modifications to KeyedSet and WeakSet. =============== Diff against Collections-ar.288 =============== Item was changed: ----- Method: WeakSet>>noCheckNoGrowFillFrom: (in category 'private') ----- noCheckNoGrowFillFrom: anArray "Add the elements of anArray except nils and flag to me assuming that I don't contain any of them, they are unique and I have more free space than they require." tally := 0. 1 to: anArray size do: [ :index | (anArray at: index) ifNotNil: [ :object | object == flag ifFalse: [ array + at: (self scanForEmptySlotFor: object enclosedSetElement) - at: (self scanForEmptySlotFor: object) put: object. tally := tally + 1 ] ] ]! Item was changed: ----- Method: KeyedIdentitySet>>scanFor: (in category 'private') ----- scanFor: anObject "Scan the key array for the first slot containing either a nil (indicating an empty slot) or an element that matches anObject. Answer the index of that slot or raise an error if no slot is found. This method will be overridden in various subclasses that have different interpretations for matching elements." | index start | index := start := anObject scaledIdentityHash \\ array size + 1. [ | element | + ((element := array at: index) == nil or: [ (keyBlock value: element enclosedSetElement) == anObject ]) - ((element := array at: index) == nil or: [ (keyBlock value: element) == anObject ]) ifTrue: [ ^index ]. (index := index \\ array size + 1) = start ] whileFalse. self errorNoFreeSpace! Item was changed: ----- Method: KeyedSet>>scanFor: (in category 'private') ----- scanFor: anObject "Scan the key array for the first slot containing either a nil (indicating an empty slot) or an element that matches anObject. Answer the index of that slot or raise an error if no slot is found. This method will be overridden in various subclasses that have different interpretations for matching elements." | index start | index := start := anObject hash \\ array size + 1. [ | element | + ((element := array at: index) == nil or: [ (keyBlock value: element enclosedSetElement) = anObject ]) - ((element := array at: index) == nil or: [ (keyBlock value: element) = anObject ]) ifTrue: [ ^index ]. (index := index \\ array size + 1) = start ] whileFalse. self errorNoFreeSpace! Item was changed: ----- Method: KeyedSet>>member: (in category 'adding') ----- member: newObject "Include newObject as one of the receiver's elements, if already exists just return it" | index | - newObject ifNil: [self error: 'Sets cannot meaningfully contain nil as an element']. index := self scanFor: (keyBlock value: newObject). + (array at: index) ifNotNil: [ :element | ^element enclosedSetElement]. + self atNewIndex: index put: newObject asSetElement. - (array at: index) ifNotNil: [ :element | ^element ]. - self atNewIndex: index put: newObject. ^ newObject! Item was changed: ----- Method: WeakSet>>add: (in category 'adding') ----- add: newObject "Include newObject as one of the receiver's elements, but only if not already present. Answer newObject" | index element | - newObject ifNil: [self error: 'Sets cannot meaningfully contain nil as an element']. index := self scanFor: newObject. ((element := array at: index) == flag or: [ element == nil ]) + ifTrue: [self atNewIndex: index put: newObject asSetElement]. - ifTrue: [self atNewIndex: index put: newObject]. ^newObject! Item was changed: ----- Method: KeyedSet>>noCheckAdd: (in category 'private') ----- noCheckAdd: anObject self deprecated: 'This method should not be used anymore.'. + array at: (self scanFor: (keyBlock value: anObject)) put: anObject asSetElement. - array at: (self scanFor: (keyBlock value: anObject)) put: anObject. tally := tally + 1! Item was changed: ----- Method: WeakSet>>fixCollisionsFrom: (in category 'private') ----- fixCollisionsFrom: start "The element at start has been removed and replaced by flag. This method moves forward from there, relocating any entries that had been placed below due to collisions with this one." | element index | index := start. [ (element := array at: (index := index \\ array size + 1)) == flag ] whileFalse: [ | newIndex | + (newIndex := self scanFor: element enclosedSetElement) = index ifFalse: [ - (newIndex := self scanFor: element) = index ifFalse: [ array swap: index with: newIndex ] ] ! Item was changed: ----- Method: KeyedSet>>at:ifAbsent: (in category 'accessing') ----- at: key ifAbsent: aBlock "Answer the value associated with the key or, if key isn't found, answer the result of evaluating aBlock." + ^(array at: (self scanFor: key)) ifNil: [ aBlock value ] ifNotNil:[:obj| obj enclosedSetElement]! - ^(array at: (self scanFor: key)) ifNil: [ aBlock value ]! Item was changed: ----- Method: WeakSet>>scanForLoadedSymbol: (in category 'private') ----- scanForLoadedSymbol: anObject "Scan the key array for the first slot containing either a nil (indicating an empty slot) or an element that matches anObject. Answer the index of that slot or zero if no slot is found. This method will be overridden in various subclasses that have different interpretations for matching elements" | element start finish | start := (anObject hash \\ array size) + 1. finish := array size. "Search from (hash mod size) to the end." start to: finish do: + [:index | ((element := array at: index) == flag or: [element enclosedSetElement asString = anObject asString]) - [:index | ((element := array at: index) == flag or: [element asString = anObject asString]) ifTrue: [^ index ]]. "Search from 1 to where we started." 1 to: start-1 do: + [:index | ((element := array at: index) == flag or: [element enclosedSetElement asString = anObject asString]) - [:index | ((element := array at: index) == flag or: [element asString = anObject asString]) ifTrue: [^ index ]]. ^ 0 "No match AND no empty slot"! Item was changed: ----- Method: WeakSet>>do:after: (in category 'public') ----- do: aBlock after: anElement | startIndex | tally = 0 ifTrue: [ ^self ]. startIndex := anElement ifNil: [ 0 ] ifNotNil: [ self scanFor: anElement ]. startIndex + 1 to: array size do: [ :index | (array at: index) ifNotNil: [ :object | object == flag ifFalse: [ + aBlock value: object enclosedSetElement] ] ]! - aBlock value: object ] ] ]! Item was changed: ----- Method: WeakSet>>scanFor: (in category 'private') ----- scanFor: anObject "Scan the key array for the first slot containing either flag (indicating an empty slot) or an element that matches anObject. Answer the index of that slot or raise an error if no slot is found. This method will be overridden in various subclasses that have different interpretations for matching elements." | index start | index := start := anObject hash \\ array size + 1. [ | element | + ((element := array at: index) == flag or: [ element enclosedSetElement = anObject ]) - ((element := array at: index) == flag or: [ element = anObject ]) ifTrue: [ ^index ]. (index := index \\ array size + 1) = start ] whileFalse. self errorNoFreeSpace! Item was changed: ----- Method: KeyedSet>>removeKey:ifAbsent: (in category 'removing') ----- removeKey: key ifAbsent: aBlock | index obj | index := self scanFor: key. (obj := array at: index) == nil ifTrue: [ ^ aBlock value ]. array at: index put: nil. tally := tally - 1. self fixCollisionsFrom: index. + ^ obj enclosedSetElement! - ^ obj! Item was changed: ----- Method: KeyedSet>>noCheckNoGrowFillFrom: (in category 'private') ----- noCheckNoGrowFillFrom: anArray "Add the elements of anArray except nils to me assuming that I don't contain any of them, they are unique and I have more free space than they require." 1 to: anArray size do: [ :index | (anArray at: index) ifNotNil: [ :object | array + at: (self scanForEmptySlotFor: (keyBlock value: object enclosedSetElement)) - at: (self scanForEmptySlotFor: (keyBlock value: object)) put: object ] ]! Item was changed: ----- Method: KeyedSet>>add: (in category 'adding') ----- add: newObject "Include newObject as one of the receiver's elements, but only if not already present. Answer newObject." | index | - newObject ifNil: [self error: 'Sets cannot meaningfully contain nil as an element']. index := self scanFor: (keyBlock value: newObject). + (array at: index) ifNil: [self atNewIndex: index put: newObject asSetElement]. - (array at: index) ifNil: [self atNewIndex: index put: newObject]. ^ newObject! Item was changed: ----- Method: KeyedSet>>fixCollisionsFrom: (in category 'private') ----- fixCollisionsFrom: start "The element at start has been removed and replaced by nil. This method moves forward from there, relocating any entries that had been placed below due to collisions with this one." | element index | index := start. [ (element := array at: (index := index \\ array size + 1)) == nil ] whileFalse: [ | newIndex | + (newIndex := self scanFor: (keyBlock value: element enclosedSetElement)) = index ifFalse: [ - (newIndex := self scanFor: (keyBlock value: element)) = index ifFalse: [ array swap: index with: newIndex ] ]! Item was changed: ----- Method: WeakSet>>do: (in category 'enumerating') ----- do: aBlock tally = 0 ifTrue: [ ^self ]. 1 to: array size do: [ :index | (array at: index) ifNotNil: [ :object | object == flag ifFalse: [ + aBlock value: object enclosedSetElement] ] ]! - aBlock value: object ] ] ]! Item was changed: ----- Method: WeakSet>>like: (in category 'accessing') ----- like: anObject "Answer an object in the receiver that is equal to anObject, nil if no such object is found. Relies heavily on hash properties" | element | ^(element := array at: (self scanFor: anObject)) == flag + ifFalse: [ element enclosedSetElement]! - ifFalse: [ element ]! Item was changed: ----- Method: WeakSet>>collect: (in category 'enumerating') ----- collect: aBlock | newSet | newSet := self species new: self size. tally = 0 ifTrue: [ ^newSet ]. 1 to: array size do: [ :index | (array at: index) ifNotNil: [ :object | object == flag ifFalse: [ + newSet add: (aBlock value: object enclosedSetElement) ] ] ]. - newSet add: (aBlock value: object) ] ] ]. ^newSet!

1 0

The Trunk: Collections-ar.288.mcz
by commits＠source.squeak.org 02 Feb '10

02 Feb '10

Andreas Raab uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ar.288.mcz ==================== Summary ==================== Name: Collections-ar.288 Author: ar Time: 1 February 2010, 8:25:27.355 pm UUID: 50bb9e1d-6487-fa4a-b39b-72d5e7290090 Ancestors: Collections-ar.287 Sets with nil: Merge code from http://bugs.squeak.org/view.php?id=7413 before it rots even more. =============== Diff against Collections-ar.287 =============== Item was changed: ----- Method: IdentitySet>>scanFor: (in category 'private') ----- scanFor: anObject "Scan the key array for the first slot containing either a nil (indicating an empty slot) or an element that matches anObject. Answer the index of that slot or raise an error if no slot is found. This method will be overridden in various subclasses that have different interpretations for matching elements." | index start | index := start := anObject scaledIdentityHash \\ array size + 1. [ | element | + ((element := array at: index) == nil or: [ element enclosedSetElement == anObject ]) - ((element := array at: index) == nil or: [ element == anObject ]) ifTrue: [ ^index ]. (index := index \\ array size + 1) = start ] whileFalse. self errorNoFreeSpace! Item was changed: ----- Method: Set>>noCheckNoGrowFillFrom: (in category 'private') ----- noCheckNoGrowFillFrom: anArray "Add the elements of anArray except nils to me assuming that I don't contain any of them, they are unique and I have more free space than they require." 1 to: anArray size do: [ :index | (anArray at: index) ifNotNil: [ :object | array + at: (self scanForEmptySlotFor: object enclosedSetElement) - at: (self scanForEmptySlotFor: object) put: object ] ]! Item was changed: ----- Method: Set>>add: (in category 'adding') ----- add: newObject "Include newObject as one of the receiver's elements, but only if not already present. Answer newObject." | index | - newObject ifNil: [self error: 'Sets cannot meaningfully contain nil as an element']. index := self scanFor: newObject. + (array at: index) ifNil: [self atNewIndex: index put: newObject asSetElement]. - (array at: index) ifNil: [self atNewIndex: index put: newObject]. ^ newObject! Item was changed: ----- Method: Set>>fixCollisionsFrom: (in category 'private') ----- fixCollisionsFrom: start "The element at start has been removed and replaced by nil. This method moves forward from there, relocating any entries that had been placed below due to collisions with this one." | element index | index := start. [ (element := array at: (index := index \\ array size + 1)) == nil ] whileFalse: [ | newIndex | + (newIndex := self scanFor: element enclosedSetElement) = index ifFalse: [ - (newIndex := self scanFor: element) = index ifFalse: [ array swap: index with: newIndex ] ]! Item was changed: ----- Method: Set>>like: (in category 'accessing') ----- like: anObject "Answer an object in the receiver that is equal to anObject, nil if no such object is found. Relies heavily on hash properties" + ^(array at: (self scanFor: anObject)) ifNotNil:[:obj| obj enclosedSetElement]! - ^array at: (self scanFor: anObject)! Item was added: + ----- Method: SetElement classSide>>initialize (in category 'class initialization') ----- + initialize + NilElement := self with: nil. + ! Item was added: + ----- Method: SetElement>>enclosedSetElement: (in category 'accessing') ----- + enclosedSetElement: anObject + enclosedElement := anObject! Item was changed: ----- Method: Set>>scanFor: (in category 'private') ----- scanFor: anObject "Scan the key array for the first slot containing either a nil (indicating an empty slot) or an element that matches anObject. Answer the index of that slot or raise an error if no slot is found. This method will be overridden in various subclasses that have different interpretations for matching elements." | index start | index := start := anObject hash \\ array size + 1. [ | element | + ((element := array at: index) == nil or: [ element enclosedSetElement = anObject ]) - ((element := array at: index) == nil or: [ element = anObject ]) ifTrue: [ ^index ]. (index := index \\ array size + 1) = start ] whileFalse. self errorNoFreeSpace! Item was added: + ----- Method: Set>>like:ifAbsent: (in category 'accessing') ----- + like: anObject ifAbsent: aBlock + "Answer an object in the receiver that is equal to anObject, + or evaluate the block if not found. Relies heavily on hash properties" + | element | + element := array at: (self scanFor: anObject). + ^ element ifNil: [ aBlock value ] ifNotNil: [ element enclosedSetElement ]! Item was added: + ----- Method: SetElement>>= (in category 'comparing') ----- + = anObject + ^ anObject class = self class and: [ enclosedElement = anObject enclosedSetElement ] + ! Item was added: + ----- Method: SetElement>>hash (in category 'comparing') ----- + hash + ^ enclosedElement hash + ! Item was changed: ----- Method: PluggableSet>>scanFor: (in category 'private') ----- scanFor: anObject "Scan the key array for the first slot containing either a nil (indicating an empty slot) or an element that matches anObject. Answer the index of that slot or raise an error if no slot is found. This method will be overridden in various subclasses that have different interpretations for matching elements." | index start | index := start := (hashBlock ifNil: [ anObject hash ] ifNotNil: [ hashBlock value: anObject ]) \\ array size + 1. [ | element | ((element := array at: index) == nil or: [ equalBlock + ifNil: [ element enclosedSetElement = anObject ] + ifNotNil: [ equalBlock value: element enclosedSetElement value: anObject ] ]) - ifNil: [ element = anObject ] - ifNotNil: [ equalBlock value: element value: anObject ] ]) ifTrue: [ ^index ]. (index := index \\ array size + 1) = start ] whileFalse. self errorNoFreeSpace! Item was added: + ----- Method: SetElement>>asSetElement (in category 'converting') ----- + asSetElement + "A receiver has to be included into a set, as a distinct object. + We need to wrap receiver in own turn, otherwise #enclosedSetElement will return wrong object for that set" + ^ SetElement with: self! Item was added: + ----- Method: SetElement classSide>>withNil (in category 'accessing') ----- + withNil + ^ NilElement + ! Item was added: + ----- Method: SetElement>>enclosedSetElement (in category 'accessing') ----- + enclosedSetElement + ^ enclosedElement! Item was changed: ----- Method: Set>>do: (in category 'enumerating') ----- do: aBlock tally = 0 ifTrue: [ ^self ]. 1 to: array size do: [ :index | (array at: index) ifNotNil: [ :element | + aBlock value: element enclosedSetElement] ]! - aBlock value: element ] ]! Item was added: + Object subclass: #SetElement + instanceVariableNames: 'enclosedElement' + classVariableNames: 'NilElement' + poolDictionaries: '' + category: 'Collections-Support'! Item was added: + ----- Method: SetElement classSide>>with: (in category 'instance creation') ----- + with: anObject + ^ self new enclosedSetElement: anObject!

1 0

The Trunk: CollectionsTests-ar.135.mcz
by commits＠source.squeak.org 02 Feb '10

02 Feb '10

Andreas Raab uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-ar.135.mcz ==================== Summary ==================== Name: CollectionsTests-ar.135 Author: ar Time: 1 February 2010, 8:24:38.93 pm UUID: e7dd8e8c-60b1-fa4a-be32-1f9004b37691 Ancestors: CollectionsTests-ar.134 Tests for sets with nil: Documents current behavior including the cases that aren't supported (KeyedSet and WeakSet since they have some additional requirements). =============== Diff against CollectionsTests-ar.134 =============== Item was added: + ----- Method: SetWithNilTest>>testIdentitySetWithNil (in category 'tests') ----- + testIdentitySetWithNil + self shouldnt:[IdentitySet with: nil] raise: Error. + self shouldnt:[IdentitySet withAll: #(nil nil nil)] raise: Error. + + self assert: (IdentitySet with: nil) size = 1. + self assert: (IdentitySet withAll: #(nil nil nil)) size = 1. + + self assert: (IdentitySet with: nil) anyOne = nil. + self assert: ((IdentitySet with: nil) remove: nil) == nil. + self assert: ((IdentitySet with: nil) remove: nil; yourself) isEmpty. + + self assert: (IdentitySet withAll: #(1 nil foo)) size = 3. + self assert: ((IdentitySet withAll: #(1 nil foo)) remove: nil; yourself) size = 2. + + self assert: ((IdentitySet with: nil) collect:[:x| x]) = (IdentitySet with: nil). + self assert: ((IdentitySet with: nil) collect:[:x| x] as: Array) = #(nil). + ! Item was added: + ----- Method: SetWithNilTest>>testKeyedSetWithNil (in category 'tests') ----- + testKeyedSetWithNil + self should:[KeyedSet with: nil] raise: Error. + ! Item was added: + ----- Method: SetWithNilTest>>testWeakSetWithNil (in category 'tests') ----- + testWeakSetWithNil + self should:[WeakSet with: nil] raise: Error. + ! Item was added: + TestCase subclass: #SetWithNilTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CollectionsTests-Unordered'! Item was added: + ----- Method: SetWithNilTest>>testSetWithNil (in category 'tests') ----- + testSetWithNil + self shouldnt:[Set with: nil] raise: Error. + self shouldnt:[Set withAll: #(nil nil nil)] raise: Error. + + self assert: (Set with: nil) size = 1. + self assert: (Set withAll: #(nil nil nil)) size = 1. + + self assert: (Set with: nil) anyOne = nil. + self assert: ((Set with: nil) remove: nil) == nil. + self assert: ((Set with: nil) remove: nil; yourself) isEmpty. + + self assert: (Set withAll: #(1 nil foo)) size = 3. + self assert: ((Set withAll: #(1 nil foo)) remove: nil; yourself) size = 2. + + self assert: ((Set with: nil) collect:[:x| x]) = (Set with: nil). + self assert: ((Set with: nil) collect:[:x| x] as: Array) = #(nil). + ! Item was added: + ----- Method: SetWithNilTest>>testPluggableSetWithNil (in category 'tests') ----- + testPluggableSetWithNil + self shouldnt:[PluggableSet with: nil] raise: Error. + self shouldnt:[PluggableSet withAll: #(nil nil nil)] raise: Error. + + self assert: (PluggableSet with: nil) size = 1. + self assert: (PluggableSet withAll: #(nil nil nil)) size = 1. + + self assert: (PluggableSet with: nil) anyOne = nil. + self assert: ((PluggableSet with: nil) remove: nil) == nil. + self assert: ((PluggableSet with: nil) remove: nil; yourself) isEmpty. + + self assert: (PluggableSet withAll: #(1 nil foo)) size = 3. + self assert: ((PluggableSet withAll: #(1 nil foo)) remove: nil; yourself) size = 2. + + self assert: ((PluggableSet with: nil) collect:[:x| x]) = (PluggableSet with: nil). + self assert: ((PluggableSet with: nil) collect:[:x| x] as: Array) = #(nil). + !

1 0

The Trunk: Kernel-ar.384.mcz
by commits＠source.squeak.org 02 Feb '10

02 Feb '10

Andreas Raab uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-ar.384.mcz ==================== Summary ==================== Name: Kernel-ar.384 Author: ar Time: 1 February 2010, 8:22:34.594 pm UUID: 312bc627-1351-5943-a531-7f75e003e29b Ancestors: Kernel-tfel.383 Sets with nil: Merge code from http://bugs.squeak.org/view.php?id=7413 before it rots even more. =============== Diff against Kernel-tfel.383 =============== Item was added: + ----- Method: UndefinedObject>>asSetElement (in category 'sets support') ----- + asSetElement + "Since nil is a singleton, we need only a single wrapper instance to represent it in set, + created in advance" + ^ SetElement withNil! Item was added: + ----- Method: Object>>enclosedSetElement (in category 'accessing') ----- + enclosedSetElement + "The receiver is included into a set as an element. + Since some objects require wrappers (see SetElement) to be able to be included into a Set, + a set sends this message to its element to make sure it getting real object, + instead of its wrapper. + Only SetElement instance or its subclasses allowed to answer something different than receiver itself" + + ! Item was added: + ----- Method: Object>>asSetElement (in category 'converting') ----- + asSetElement + "Answer an object, which can be put into a Set as element , wrapped + by one of SetElement instance, if necessary. + Default implementation is to answer self" + !

1 0

In sq 8955 ChangeSorter has a multiple number of ailments
by Jerome Peace 02 Feb '10

02 Feb '10

Hi all, Changesorter has been sort of broken since 3.10.2 . There are no tests to catch the current bugs. More code has been added on top of the bugs, compounding the problems. I have described the problem(s) in detail here: http://bugs.squeak.org/view.php?id=7463 7463: In sq 8955 ChangeSorter has a multiple number of ailments Help would be appreciated. Clues to a good set of tests are key. Yours in curiosity and service, --Jerome Peace

1 0

The Trunk: CollectionsTests-ar.134.mcz
by commits＠source.squeak.org 02 Feb '10

02 Feb '10

Andreas Raab uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-ar.134.mcz ==================== Summary ==================== Name: CollectionsTests-ar.134 Author: ar Time: 1 February 2010, 7:17:53.486 pm UUID: 4adad849-c3b2-044d-b825-2f77af92664a Ancestors: CollectionsTests-ul.133 Tests for beginsWithAnyOf: and endsWithAnyOf:. =============== Diff against CollectionsTests-ul.133 =============== Item was added: + ----- Method: SequenceableCollectionTest>>testBeginsWithAnyOf (in category 'testing - testing') ----- + testBeginsWithAnyOf + "We can't test SequenceableCollection directly. However, we can test a sampling of its descendants." + + | la oc | + la := #(1 2 3 4 5 6). + oc := OrderedCollection new. + oc add: 1; add: 2; add: 3. + + self assert: (la beginsWithAnyOf: #((17) (1) (42))). + self assert: (la beginsWithAnyOf: #((17) (1 2) (42))). + self assert: (la beginsWithAnyOf: #((17) (1 2 3) (42))). + self deny: (la beginsWithAnyOf: #()). + self deny: (la beginsWithAnyOf: #(())). + self deny: (la beginsWithAnyOf: #((42))). + ! Item was added: + ----- Method: SequenceableCollectionTest>>testEndsWithAnyOf (in category 'testing - testing') ----- + testEndsWithAnyOf + "We can't test SequenceableCollection directly. However, we can test a sampling of its descendants." + + | la oc | + la := #(6 5 4 3 2 1). + oc := OrderedCollection new. + oc add: 3; add: 2; add: 1. + + self assert: (la endsWithAnyOf: #((17) (1) (42))). + self assert: (la endsWithAnyOf: #((17) (2 1) (42))). + self assert: (la endsWithAnyOf: #((17) (3 2 1) (42))). + self deny: (la endsWithAnyOf: #()). + self deny: (la endsWithAnyOf: #(())). + self deny: (la endsWithAnyOf: #((42))). + !

1 0

The Trunk: Collections-ar.287.mcz
by commits＠source.squeak.org 02 Feb '10

02 Feb '10

Andreas Raab uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ar.287.mcz ==================== Summary ==================== Name: Collections-ar.287 Author: ar Time: 1 February 2010, 7:16:54.576 pm UUID: 3840f8bc-07e3-6f4c-a3d6-8b52f89973aa Ancestors: Collections-edc.285, Collections-edc.286 Merge Collections-edc.286 with some changes: - Implement both beginsWithAnyOf: as well as endsWithAnyOf: - Push the implementation up to SequenceableCollection - Simplify the implementation (using #anySatisfy:) - Add comments (also in beginsWith: and endsWith:) - Add tests =============== Diff against Collections-edc.285 =============== Item was changed: ----- Method: SequenceableCollection>>beginsWith: (in category 'testing') ----- beginsWith: aSequenceableCollection + "Answer true if the receiver starts with the argument collection" - (aSequenceableCollection isEmpty or: [self size < aSequenceableCollection size]) ifTrue: [^false]. aSequenceableCollection withIndexDo: [:each :index | (self at: index) ~= each ifTrue: [^false]]. ^true! Item was changed: ----- Method: SequenceableCollection>>endsWith: (in category 'testing') ----- endsWith: aSequenceableCollection + "Answer true if the receiver ends with the argument collection" - | start | (aSequenceableCollection isEmpty or: [self size < aSequenceableCollection size]) ifTrue: [^false]. start := self size - aSequenceableCollection size. aSequenceableCollection withIndexDo: [:each :index | (self at: start + index) ~= each ifTrue: [^false]]. ^true! Item was added: + ----- Method: SequenceableCollection>>endsWithAnyOf: (in category 'testing') ----- + endsWithAnyOf: aCollection + "Return true if the receiver ends with any of the elements in aCollection." + ^aCollection anySatisfy:[:suffix| self endsWith: suffix].! Item was added: + ----- Method: SequenceableCollection>>beginsWithAnyOf: (in category 'testing') ----- + beginsWithAnyOf: aCollection + "Return true if the receiver starts with any of the elements in aCollection." + ^aCollection anySatisfy:[:prefix| self beginsWith: prefix].! Item was removed: - ----- Method: String>>beginsWithAnyOf: (in category 'comparing') ----- - beginsWithAnyOf: aCollection - aCollection do:[:suffix| - (self beginsWith: suffix) ifTrue:[^true]. - ]. - ^false!

1 0

Jump to page: