Packages February 2010

packages@lists.squeakfoundation.org

2 participants
1083 discussions

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: Collections-ar.288.mcz
by commits＠source.squeak.org 02 Feb '10

02 Feb '10

1 0

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

02 Feb '10

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: CollectionsTests-ar.135.mcz
by commits＠source.squeak.org 02 Feb '10

02 Feb '10

1 0

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

02 Feb '10

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

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

02 Feb '10

1 0

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

02 Feb '10

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages February 2010