Packages November 2017

packages@lists.squeakfoundation.org

1 participants
117 discussions

The Trunk: Collections-nice.774.mcz
by commits＠source.squeak.org 30 Nov '17

30 Nov '17

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.774.mcz ==================== Summary ==================== Name: Collections-nice.774 Author: nice Time: 1 December 2017, 12:08:06.998278 am UUID: d8c8b26f-2bca-438d-9b75-b929e5290df3 Ancestors: Collections-nice.773 Fulfill gratuitous ANSI expectation about (1 to: 2) readStream contents class This will fix ReadStreamTest>>#testContents2 that I broke with my implementation of Interval>>copyFrom:to:. The expectation: either contents answers the interval itself (please tell me why a shallow copy would not be acceptable???) or it answers same class as select: (that would be the interval species). =============== Diff against Collections-nice.773 =============== Item was changed: ----- Method: Interval>>copyFrom:to: (in category 'copying') ----- copyFrom: startIndex to: stopIndex + (startIndex = 1 and: [stopIndex = self size]) ifTrue: [^self]. stopIndex < startIndex ifTrue: [^self copyEmpty]. ^(self at: startIndex) to: (self at: stopIndex) by: step!

1 0

The Trunk: Kernel-nice.1127.mcz
by commits＠source.squeak.org 30 Nov '17

30 Nov '17

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.1127.mcz ==================== Summary ==================== Name: Kernel-nice.1127 Author: nice Time: 30 November 2017, 11:45:52.543057 pm UUID: 90232bfa-3c54-41a3-a2cc-bb18baf40ede Ancestors: Kernel-nice.1126 Object class initializedInstance shall not bark at me. =============== Diff against Kernel-nice.1126 =============== Item was added: + ----- Method: Metaclass>>initializedInstance (in category 'instance creation') ----- + initializedInstance + thisClass class == self ifFalse: [^self new]. + ^thisClass!

1 0

The Trunk: Balloon-nice.31.mcz
by commits＠source.squeak.org 30 Nov '17

30 Nov '17

Nicolas Cellier uploaded a new version of Balloon to project The Trunk: http://source.squeak.org/trunk/Balloon-nice.31.mcz ==================== Summary ==================== Name: Balloon-nice.31 Author: nice Time: 30 November 2017, 11:42:45.358651 pm UUID: 41218742-19bf-46c7-aa04-25c4775e4549 Ancestors: Balloon-ul.30 Fix ShortRunArray initializedInstance =============== Diff against Balloon-ul.30 =============== Item was changed: + ----- Method: InterpolatedGradientFillStyle>>computePixelRampOfSize: (in category 'private') ----- - ----- Method: InterpolatedGradientFillStyle>>computePixelRampOfSize: (in category 'as yet unclassified') ----- computePixelRampOfSize: length "Compute the pixel ramp in the receiver." | bits ramp lastColor lastIndex lastWord | ramp := colorRamp sorted:[:a1 :a2| a1 key < a2 key]. bits := Bitmap new: length. lastColor := ramp first value. lastWord := lastColor pixelWord32. lastIndex := 0. ramp do:[:assoc| | distance nextColor theta nextWord nextIndex step | nextIndex := (assoc key * length) rounded. nextColor := assoc value. nextWord := nextColor pixelWord32. distance := nextIndex - lastIndex. distance = 0 ifTrue: [distance := 1]. step := 1.0 / distance. theta := 0.0. lastIndex+1 to: nextIndex do: [:i| theta := theta + step. bits at: i put: (self interpolatedAlphaMix: theta of: lastWord and: nextWord)]. lastIndex := nextIndex. lastColor := nextColor. lastWord := nextWord]. lastIndex+1 to: length do: [:i| bits at: i put: lastWord]. ^bits! Item was changed: + ----- Method: InterpolatedGradientFillStyle>>interpolatedAlphaMix:of:and: (in category 'private') ----- - ----- Method: InterpolatedGradientFillStyle>>interpolatedAlphaMix:of:and: (in category 'as yet unclassified') ----- interpolatedAlphaMix: ratio of: rgba1 and: rgba2 "Answer a proper interpolated value between two RGBA color words. Theta is 0..1.." | a1 a2 ra ira rgb1 rgb2 alpha br1 br2 bg1 bg2 bb1 bb2 result | a1 := rgba1 bitShift: -24. a2 := rgba2 bitShift: -24. alpha := ratio * (a2 - a1) + a1. ra := ratio * alpha. ira := (1.0 - ratio) * alpha. rgb1 := rgba1 bitAnd: 16rFFFFFF. rgb2 := rgba2 bitAnd: 16rFFFFFF. br1 := (rgb1 bitAnd: 255). br2 := (rgb2 bitAnd: 255). bg1 := ((rgb1 bitShift: -8) bitAnd: 255). bg2 := ((rgb2 bitShift: -8) bitAnd: 255). bb1 := ((rgb1 bitShift: -16) bitAnd: 255). bb2 := ((rgb2 bitShift: -16) bitAnd: 255). result := (ra * br2 + (ira * br1)) rounded // 255. result := result bitOr: ((ra * bg2 + (ira * bg1)) rounded // 255 bitShift: 8). result := result bitOr: ((ra * bb2 + (ira * bb1)) rounded // 255 bitShift: 16). ^result bitOr: (alpha rounded bitShift: 24)! Item was added: + ----- Method: ShortRunArray class>>new (in category 'instance creation') ----- + new + ^self newFrom: #()!

1 0

The Trunk: Collections-nice.773.mcz
by commits＠source.squeak.org 30 Nov '17

30 Nov '17

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.773.mcz ==================== Summary ==================== Name: Collections-nice.773 Author: nice Time: 30 November 2017, 11:32:28.759622 pm UUID: ada0362a-409d-4c86-8929-52acda17d6f8 Ancestors: Collections-nice.772 Let Collection withAllSubclasses someSatisfy: #isAbstract. That may help some initializedInstance. Provide a well behaved Interval initializedInstance. =============== Diff against Collections-nice.772 =============== Item was added: + ----- Method: AbstractCharacterSet class>>isAbstract (in category 'testing') ----- + isAbstract + ^self = AbstractCharacterSet! Item was added: + ----- Method: ArrayedCollection class>>isAbstract (in category 'testing') ----- + isAbstract + ^self = ArrayedCollection! Item was added: + ----- Method: Collection class>>isAbstract (in category 'testing') ----- + isAbstract + ^self = Collection! Item was added: + ----- Method: HashedCollection class>>isAbstract (in category 'testing') ----- + isAbstract + ^self = HashedCollection! Item was added: + ----- Method: Interval class>>initializedInstance (in category 'instance creation') ----- + initializedInstance + ^self newFrom: #()! Item was removed: - ----- Method: NonPointersOrderedCollection class>>initializedInstance (in category 'instance creation') ----- - initializedInstance - " There are no instances of me, just my subclasses " - ^ self ~~ NonPointersOrderedCollection ifTrue: [super initializedInstance] - ! Item was added: + ----- Method: NonPointersOrderedCollection class>>isAbstract (in category 'testing') ----- + isAbstract + ^self = NonPointersOrderedCollection! Item was added: + ----- Method: SequenceableCollection class>>isAbstract (in category 'testing') ----- + isAbstract + ^self = SequenceableCollection!

1 0

The Trunk: Kernel-nice.1126.mcz
by commits＠source.squeak.org 30 Nov '17

30 Nov '17

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.1126.mcz ==================== Summary ==================== Name: Kernel-nice.1126 Author: nice Time: 30 November 2017, 11:19:00.113675 pm UUID: f617f2e1-6bc6-4db5-b53e-a6136a180c63 Ancestors: Kernel-pre.1125 Introduce Class>>isAbstract for use with initializedInstance. Abstract classes are not expected to have any initializedInstance and will answer nil instead. It is subclassResponsibility to declare if isAbstract, default is false, most classes are concrete. We do not try to be clever and scan all methods sending subclassResponsibility, because failing to fullfill some responsibility does not make a class abstract, it just makes it imperfect! Note that isAbstract may have other smart usage (maybe special presentation in the browser etc...) =============== Diff against Kernel-pre.1125 =============== Item was added: + ----- Method: Boolean class>>isAbstract (in category 'testing') ----- + isAbstract + ^self = Boolean! Item was added: + ----- Method: Class>>isAbstract (in category 'testing') ----- + isAbstract + "Answer true if I am to be considered an abstract class. + An abstract class shall better not be instantiated. + Or its instances may miss some important behavior. + Typically, a class with methods sending #subclassResponsibility might be considered abstract. + But we can't erect this as a general rule, it might be that the message is never sent. + By default, all classes are concrete, up to each one to declare itself abstract." + + ^false! Item was added: + ----- Method: CompiledCode class>>initializedInstance (in category 'instance creation') ----- + initializedInstance + "Don't even think of it. + This low level machinery is not for general use." + + ^nil! Item was changed: ----- Method: Object class>>initializedInstance (in category 'instance creation') ----- initializedInstance + self isAbstract ifTrue: [^nil]. ^ self new!

1 0

The Trunk: Collections-nice.772.mcz
by commits＠source.squeak.org 30 Nov '17

30 Nov '17

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.772.mcz ==================== Summary ==================== Name: Collections-nice.772 Author: nice Time: 30 November 2017, 10:30:07.12046 pm UUID: e43714c3-3e4c-4502-bb00-75852da33184 Ancestors: Collections-nice.771 Fix the CharacterSet failures that I just created I would have sweared that I ran the tests... Not all the tests? Embarassing... =============== Diff against Collections-nice.771 =============== Item was changed: ----- Method: CharacterSet>>union: (in category 'enumerating') ----- union: aCollection - (self species = aCollection species or: [aCollection isString]) ifFalse: [^super union: aCollection]. aCollection class = CharacterSetComplement ifTrue: [^aCollection union: self]. + (self species = aCollection species or: [aCollection isString]) ifFalse: [^super union: aCollection]. ^self copy addAll: aCollection; yourself! Item was changed: ----- Method: LazyCharacterSet class>>including: (in category 'instance creation') ----- including: aBlock "Create the set of Character for which aBlock evaluates to true" + ^self new block: aBlock! - ^self class new block: aBlock! Item was changed: ----- Method: LazyCharacterSet>>block: (in category 'accessing') ----- block: aValuable "Set the block used to determine if I include a Character or not. aValuable is an object that shoud answer true or false when sent value:" byteArrayMapCache := nil. + block := aValuable! - ^block := aValuable!

1 0

The Trunk: Collections-nice.771.mcz
by commits＠source.squeak.org 30 Nov '17

30 Nov '17

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.771.mcz ==================== Summary ==================== Name: Collections-nice.771 Author: nice Time: 30 November 2017, 9:57:27.873964 pm UUID: d8b64711-6119-429b-b3f5-259b46ef864b Ancestors: Collections-nice.770 Fix awfully broken CharacterSetComplement select:/reject: If we want to select:/reject:, we must not only enumerate the absent characters, but rather all the characters in the complement. That's way two many, thus we prefer to do it with a LazyCharacterSet, anything else is unfeasible (we don't even know the upper limit of the set of characters...). Introduce an AbstractCharacterSet superclass of all the CharacterSet family in order to begin factoring some behavior. TODO: we should better rename CharacterSet -> ByteCharacterSet AbstractCharacterSet -> CharacterSet. We delay this quite technical operation, because we don't want to break existing instances, AND we want to redirect (Byte)CharacterSet references to (Abstract)CharacterSet, the Abstract one becoming a factory. =============== Diff against Collections-nice.770 =============== Item was added: + Collection subclass: #AbstractCharacterSet + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Support'! Item was added: + ----- Method: AbstractCharacterSet>>byteArrayMap (in category 'accessing') ----- + byteArrayMap + ^self subclassReponsibility! Item was added: + ----- Method: AbstractCharacterSet>>findFirstInByteString:startingAt: (in category 'enumerating') ----- + findFirstInByteString: aByteString startingAt: startIndex + "Double dispatching: since we know this is a ByteString, we can use a superfast primitive using a ByteArray map with 0 slots for byte characters not included and 1 for byte characters included in the receiver." + ^ByteString + findFirstInString: aByteString + inSet: self byteArrayMap + startingAt: startIndex! Item was added: + ----- Method: AbstractCharacterSet>>occurrencesOf: (in category 'enumerating') ----- + occurrencesOf: anObject + "Answer how many of the receiver's elements are equal to anObject. Optimized version." + + (self includes: anObject) ifTrue: [ ^1 ]. + ^0! Item was added: + ----- Method: AbstractCharacterSet>>removeAll (in category 'removing') ----- + removeAll + self becomeForward: CharacterSet new! Item was changed: + AbstractCharacterSet subclass: #CharacterSet - Collection subclass: #CharacterSet instanceVariableNames: 'map tally' classVariableNames: 'CrLf NonSeparators Separators' poolDictionaries: '' category: 'Collections-Support'! !CharacterSet commentStamp: '<historical>' prior: 0! A set of characters. Lookups for inclusion are very fast.! Item was changed: + ----- Method: CharacterSet>>= (in category 'comparing') ----- - ----- Method: CharacterSet>>= (in category 'comparison') ----- = anObject self species == anObject species ifFalse: [ ^false ]. anObject size = tally ifFalse: [ ^false ]. ^self byteArrayMap = anObject byteArrayMap! Item was changed: + ----- Method: CharacterSet>>add: (in category 'adding') ----- - ----- Method: CharacterSet>>add: (in category 'collection ops') ----- add: aCharacter "I automatically become a WideCharacterSet if you add a wide character to myself" | index | (index := aCharacter asInteger + 1) <= 256 ifFalse: [ | wide | wide := WideCharacterSet new. wide addAll: self. wide add: aCharacter. self becomeForward: wide. ^aCharacter ]. (map at: index) = 1 ifFalse: [ map at: index put: 1. tally := tally + 1 ]. ^aCharacter! Item was changed: + ----- Method: CharacterSet>>do: (in category 'enumerating') ----- - ----- Method: CharacterSet>>do: (in category 'collection ops') ----- do: aBlock "evaluate aBlock with each character in the set" | index | tally >= 128 ifTrue: [ "dense" index := 0. [ (index := index + 1) <= 256 ] whileTrue: [ (map at: index) = 1 ifTrue: [ aBlock value: (Character value: index - 1) ] ]. ^self ]. "sparse" index := 0. [ (index := map indexOf: 1 startingAt: index + 1) = 0 ] whileFalse: [ aBlock value: (Character value: index - 1) ]. ! Item was changed: + ----- Method: CharacterSet>>findFirstInByteString:startingAt: (in category 'enumerating') ----- - ----- Method: CharacterSet>>findFirstInByteString:startingAt: (in category 'collection ops') ----- findFirstInByteString: aByteString startingAt: startIndex "Double dispatching: since we know this is a ByteString, we can use a superfast primitive using a ByteArray map with 0 slots for byte characters not included and 1 for byte characters included in the receiver." ^ByteString findFirstInString: aByteString inSet: self byteArrayMap startingAt: startIndex! Item was changed: + ----- Method: CharacterSet>>hash (in category 'comparing') ----- - ----- Method: CharacterSet>>hash (in category 'comparison') ----- hash ^self byteArrayMap hash! Item was changed: + ----- Method: CharacterSet>>includes: (in category 'testing') ----- - ----- Method: CharacterSet>>includes: (in category 'collection ops') ----- includes: anObject | index | anObject isCharacter ifFalse: [ ^false ]. (index := anObject asInteger + 1) > 256 ifTrue: [ ^false ]. ^(map at: index) > 0! Item was removed: - ----- Method: CharacterSet>>occurrencesOf: (in category 'enumerating') ----- - occurrencesOf: anObject - "Answer how many of the receiver's elements are equal to anObject. Optimized version." - - (self includes: anObject) ifTrue: [ ^1 ]. - ^0! Item was changed: + ----- Method: CharacterSet>>remove: (in category 'removing') ----- - ----- Method: CharacterSet>>remove: (in category 'collection ops') ----- remove: aCharacter ^self remove: aCharacter ifAbsent: aCharacter! Item was changed: + ----- Method: CharacterSet>>remove:ifAbsent: (in category 'removing') ----- - ----- Method: CharacterSet>>remove:ifAbsent: (in category 'collection ops') ----- remove: aCharacter ifAbsent: aBlock | index | (index := aCharacter asciiValue + 1) <= 256 ifFalse: [ ^aBlock value ]. (map at: index) = 0 ifTrue: [ ^aBlock value ]. map at: index put: 0. tally := tally - 1. ^aCharacter! Item was changed: + ----- Method: CharacterSet>>size (in category 'accessing') ----- - ----- Method: CharacterSet>>size (in category 'collection ops') ----- size ^tally! Item was changed: + ----- Method: CharacterSet>>species (in category 'comparing') ----- - ----- Method: CharacterSet>>species (in category 'comparison') ----- species ^CharacterSet! Item was changed: + AbstractCharacterSet subclass: #CharacterSetComplement - Collection subclass: #CharacterSetComplement instanceVariableNames: 'absent byteArrayMapCache' classVariableNames: '' poolDictionaries: '' category: 'Collections-Support'! !CharacterSetComplement commentStamp: 'nice 8/31/2008 14:53' prior: 0! CharacterSetComplement is a space efficient implementation of (CharacterSet complement) taking care of WideCharacter (code > 255) However, it will maintain a byteArrayMap for character <= 255 in a cache keeping instance variables: absent <CharacterSet> contains character that are not in the set (i.e. my complement) byteArrayMapCache <ByteArray | nil> cache this information because it has to be used in tight loops where efficiency matters! Item was changed: + ----- Method: CharacterSetComplement>>add: (in category 'adding') ----- - ----- Method: CharacterSetComplement>>add: (in category 'collection ops') ----- add: aCharacter "a character is present if not absent, so adding a character is removing it from the absent" (absent includes: aCharacter) ifTrue: [byteArrayMapCache := nil. absent remove: aCharacter]. ^ aCharacter! Item was changed: + ----- Method: CharacterSetComplement>>do: (in category 'enumerating') ----- - ----- Method: CharacterSetComplement>>do: (in category 'collection ops') ----- do: aBlock "evaluate aBlock with each character in the set. don't do it, there are too many..." self shouldNotImplement! Item was changed: + ----- Method: CharacterSetComplement>>findFirstInByteString:startingAt: (in category 'enumerating') ----- - ----- Method: CharacterSetComplement>>findFirstInByteString:startingAt: (in category 'collection ops') ----- findFirstInByteString: aByteString startingAt: startIndex "Double dispatching: since we know this is a ByteString, we can use a superfast primitive using a ByteArray map with 0 slots for byte characters not included and 1 for byte characters included in the receiver." ^ByteString findFirstInString: aByteString inSet: self byteArrayMap startingAt: startIndex! Item was changed: + ----- Method: CharacterSetComplement>>includes: (in category 'testing') ----- - ----- Method: CharacterSetComplement>>includes: (in category 'collection ops') ----- includes: anObject anObject isCharacter ifFalse: [ ^false ]. (absent includes: anObject) ifTrue: [ ^false ]. ^true! Item was removed: - ----- Method: CharacterSetComplement>>occurrencesOf: (in category 'enumerating') ----- - occurrencesOf: anObject - "Answer how many of the receiver's elements are equal to anObject. Optimized version." - - (self includes: anObject) ifTrue: [ ^1 ]. - ^0! Item was changed: + ----- Method: CharacterSetComplement>>reject: (in category 'enumerating') ----- - ----- Method: CharacterSetComplement>>reject: (in category 'collection ops') ----- reject: aBlock + ^LazyCharacterSet including: [:c | (absent includes: c) not and: [(aBlock value: c) not]]! - "Implementation note: rejecting present is selecting absent" - - ^(absent select: aBlock) complement! Item was changed: + ----- Method: CharacterSetComplement>>remove: (in category 'removing') ----- - ----- Method: CharacterSetComplement>>remove: (in category 'collection ops') ----- remove: aCharacter "This means aCharacter is now absent from myself. It must be added to my absent." byteArrayMapCache := nil. ^absent add: aCharacter! Item was changed: + ----- Method: CharacterSetComplement>>remove:ifAbsent: (in category 'removing') ----- - ----- Method: CharacterSetComplement>>remove:ifAbsent: (in category 'collection ops') ----- remove: aCharacter ifAbsent: aBlock (self includes: aCharacter) ifFalse: [^aBlock value]. ^self remove: aCharacter! Item was removed: - ----- Method: CharacterSetComplement>>removeAll (in category 'collection ops') ----- - removeAll - - self becomeForward: CharacterSet new! Item was changed: + ----- Method: CharacterSetComplement>>select: (in category 'enumerating') ----- - ----- Method: CharacterSetComplement>>select: (in category 'collection ops') ----- select: aBlock + ^LazyCharacterSet including: [:c | (absent includes: c) not and: [aBlock value: c]]! - "Implementation note: selecting present is rejecting absent" - - ^(absent reject: aBlock) complement! Item was removed: - ----- Method: CharacterSetComplement>>size (in category 'collection ops') ----- - size - "Is this 2**32-absent size ?" - - ^self shouldNotImplement! Item was added: + ----- Method: Interval>>copyFrom:to: (in category 'copying') ----- + copyFrom: startIndex to: stopIndex + stopIndex < startIndex ifTrue: [^self copyEmpty]. + ^(self at: startIndex) to: (self at: stopIndex) by: step! Item was added: + AbstractCharacterSet subclass: #LazyCharacterSet + instanceVariableNames: 'block byteArrayMapCache' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Support'! + + !LazyCharacterSet commentStamp: 'nice 11/30/2017 21:40' prior: 0! + A LazyCharacterSet is a kind of CharacterSet which does not know in advance which Character it contains or not. + If will lazily evaluate a block on demand if ever one ask whether it includes: a character. + It is not feasible to enumerate a LazyCharacterSet, because there are way too many characters. + + Instance Variables + block: <BlockContext | Symbol> + byteArrayMapCache: <ByteArray | nil> + + block + - a valuable, answering either true or false when sent the message value: - true means that this set includes the character passed as value: argument. + + byteArrayMapCache + - a cache holding 0 or 1 for the first 256 character codes - 0 meaning not included, 1 included. This is used in some priitives + ! Item was added: + ----- Method: LazyCharacterSet class>>including: (in category 'instance creation') ----- + including: aBlock + "Create the set of Character for which aBlock evaluates to true" + ^self class new block: aBlock! Item was added: + ----- Method: LazyCharacterSet>>add: (in category 'adding') ----- + add: aCharacter + self block: [:c | c = aCharacter or: [block value: c]]. + ^aCharacter! Item was added: + ----- Method: LazyCharacterSet>>addAll: (in category 'adding') ----- + addAll: aCollection + self block: [:c | (aCollection includes: c) or: [block value: c]]. + ^aCollection! Item was added: + ----- Method: LazyCharacterSet>>block (in category 'accessing') ----- + block + ^block! Item was added: + ----- Method: LazyCharacterSet>>block: (in category 'accessing') ----- + block: aValuable + "Set the block used to determine if I include a Character or not. + aValuable is an object that shoud answer true or false when sent value:" + + byteArrayMapCache := nil. + ^block := aValuable! Item was added: + ----- Method: LazyCharacterSet>>byteArrayMap (in category 'accessing') ----- + byteArrayMap + "return a ByteArray mapping each ascii value to a 1 if that ascii value is in the set, and a 0 if it isn't. Intended for use by primitives only" + + ^byteArrayMapCache ifNil: [byteArrayMapCache := (0 to: 255) collect: [:i | self includes: (Character value: i)]]! Item was added: + ----- Method: LazyCharacterSet>>complement (in category 'converting') ----- + complement + ^self class including: [:char | (block value: char) not]! Item was added: + ----- Method: LazyCharacterSet>>do: (in category 'enumerating') ----- + do: aBlock + "evaluate aBlock with each character in the set. + don't do it, there are too many loop..." + + self shouldNotImplement! Item was added: + ----- Method: LazyCharacterSet>>includes: (in category 'testing') ----- + includes: aCharacter + ^block value: aCharacter! Item was added: + ----- Method: LazyCharacterSet>>reject: (in category 'enumerating') ----- + reject: aBlock + ^self class including: [:char | (aBlock value: char) not and: [block value: char]]! Item was added: + ----- Method: LazyCharacterSet>>remove: (in category 'removing') ----- + remove: aCharacter + self block: [:c | (c = aCharacter) not and: [block value: c]]. + ^aCharacter! Item was added: + ----- Method: LazyCharacterSet>>remove:ifAbsent: (in category 'removing') ----- + remove: aCharacter ifAbsent: aBlock + (self includes: aCharacter) ifFalse: [^aBlock value]. + ^self remove: aCharacter! Item was added: + ----- Method: LazyCharacterSet>>removeAll: (in category 'removing') ----- + removeAll: aCollection + self block: [:c | (aCollection include: c) not and: [block value: c]]. + ^aCollection! Item was added: + ----- Method: LazyCharacterSet>>select: (in category 'enumerating') ----- + select: aBlock + ^self class including: [:char | (block value: char) and: [aBlock value: char]]! Item was changed: + AbstractCharacterSet subclass: #WideCharacterSet - Collection subclass: #WideCharacterSet instanceVariableNames: 'map byteArrayMap bitsetCapacity highBitsShift lowBitsMask' classVariableNames: '' poolDictionaries: '' category: 'Collections-Support'! !WideCharacterSet commentStamp: 'nice 12/10/2009 19:17' prior: 0! WideCharacterSet is used to store a Set of WideCharacter with fast access and inclusion test. Implementation should be efficient in memory if sets are sufficently sparse. Wide Characters are at most 32bits. We split them into 16 highBits and 16 lowBits. map is a dictionary key: 16 highBits value: map of 16 lowBits. Maps of lowBits are stored as arrays of bits in a ByteArray. If a bit is set to 1, this indicate that corresponding character is present. 8192 bytes are necessary in each lowmap. Empty lowmap are removed from the map Dictionary. A byteArrayMap is maintained in parallel with map for fast handling of ByteString. (byteArrayMap at: i+1) = 0 means that character of asciiValue i is absent, = 1 means present.! Item was changed: + ----- Method: WideCharacterSet>>add: (in category 'adding') ----- - ----- Method: WideCharacterSet>>add: (in category 'collection ops') ----- add: aCharacter | value highBits lowBits | (value := aCharacter asInteger) < 256 ifTrue: [ byteArrayMap at: value + 1 put: 1 ]. highBits := value bitShift: highBitsShift. lowBits := value bitAnd: lowBitsMask. (map at: highBits ifAbsentPut: [ Bitset new: bitsetCapacity ]) setBitAt: lowBits. ^aCharacter! Item was changed: + ----- Method: WideCharacterSet>>do: (in category 'enumerating') ----- - ----- Method: WideCharacterSet>>do: (in category 'collection ops') ----- do: aBlock map keysAndValuesDo: [ :index :bitset | | highBits | highBits := index * bitsetCapacity. bitset do: [ :lowBits | aBlock value: (Character value: highBits + lowBits) ] ]! Item was changed: + ----- Method: WideCharacterSet>>findFirstInByteString:startingAt: (in category 'enumerating') ----- - ----- Method: WideCharacterSet>>findFirstInByteString:startingAt: (in category 'collection ops') ----- findFirstInByteString: aByteString startingAt: startIndex "Double dispatching: since we know this is a ByteString, we can use a superfast primitive using a ByteArray map with 0 slots for byte characters not included and 1 for byte characters included in the receiver." ^ByteString findFirstInString: aByteString inSet: byteArrayMap startingAt: startIndex! Item was changed: + ----- Method: WideCharacterSet>>includes: (in category 'testing') ----- - ----- Method: WideCharacterSet>>includes: (in category 'collection ops') ----- includes: anObject | value | anObject isCharacter ifFalse: [ ^false ]. (value := anObject asInteger) < 256 ifTrue: [ ^(byteArrayMap at: value + 1) ~= 0 ]. ^((map at: (value bitShift: highBitsShift) ifAbsent: nil) ifNil: [ ^false ]) includes: (value bitAnd: lowBitsMask)! Item was removed: - ----- Method: WideCharacterSet>>occurrencesOf: (in category 'enumerating') ----- - occurrencesOf: anObject - "Answer how many of the receiver's elements are equal to anObject. Optimized version." - - (self includes: anObject) ifTrue: [ ^1 ]. - ^0! Item was changed: + ----- Method: WideCharacterSet>>remove: (in category 'removing') ----- - ----- Method: WideCharacterSet>>remove: (in category 'collection ops') ----- remove: aCharacter "Don't signal an error when aCharacter is not present." ^self remove: aCharacter ifAbsent: aCharacter! Item was changed: + ----- Method: WideCharacterSet>>remove:ifAbsent: (in category 'removing') ----- - ----- Method: WideCharacterSet>>remove:ifAbsent: (in category 'collection ops') ----- remove: aCharacter ifAbsent: aBlock | value highBits lowBits bitset | (value := aCharacter asInteger) < 256 ifTrue: [ (byteArrayMap at: value + 1) = 0 ifTrue: [ ^aBlock value ]. byteArrayMap at: value + 1 put: 0 ]. highBits := value bitShift: highBitsShift. lowBits := value bitAnd: lowBitsMask. bitset := (map at: highBits ifAbsent: nil) ifNil: [ ^aBlock value ]. ((bitset clearBitAt: lowBits) and: [ bitset size = 0 ]) ifTrue: [ map removeKey: highBits ]. ^aCharacter! Item was changed: + ----- Method: WideCharacterSet>>removeAll (in category 'removing') ----- - ----- Method: WideCharacterSet>>removeAll (in category 'collection ops') ----- removeAll map isEmpty ifTrue: [ ^self ]. map removeAll. byteArrayMap atAllPut: 0! Item was changed: + ----- Method: WideCharacterSet>>size (in category 'accessing') ----- - ----- Method: WideCharacterSet>>size (in category 'collection ops') ----- size ^map detectSum: [ :each | each size ]!

1 0

The Trunk: CollectionsTests-nice.285.mcz
by commits＠source.squeak.org 30 Nov '17

30 Nov '17

Nicolas Cellier uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-nice.285.mcz ==================== Summary ==================== Name: CollectionsTests-nice.285 Author: nice Time: 30 November 2017, 9:25:14.59936 pm UUID: e50f181d-41a8-428f-ba63-b370998aac7d Ancestors: CollectionsTests-nice.284 Tests for (Wide)CharacterSet(Complement) - add tests for intersection: and union: - don't (ab)use should: when assert: could do it - add tests for awfully broken complement select:/reject: =============== Diff against CollectionsTests-nice.284 =============== Item was added: + ----- Method: CharacterSetComplementTest>>testIncludes (in category 'testing') ----- + testIncludes + | set complement | + set := 'abc' as: CharacterSet. + complement := set complement. + self assert: (set noneSatisfy: [:e | complement includes: e]). + self assert: (($d to: $z) allSatisfy: [:e | complement includes: e]).! Item was added: + ----- Method: CharacterSetComplementTest>>testReject (in category 'testing') ----- + testReject + | set complement subset | + set := 'abc' as: CharacterSet. + complement := set complement. + subset := complement reject: [:c | c isVowel]. + self assert: (subset includes: $z). "Not a vowel, it is in the subset" + self deny: (subset includes: $e). "a vowel should be rejected" + self deny: (subset includes: $b). "Not a vowel, but not in the original set"! Item was added: + ----- Method: CharacterSetComplementTest>>testSelect (in category 'testing') ----- + testSelect + | set complement digits | + set := 'abc012' as: CharacterSet. + complement := set complement. + digits := complement select: [:c | c isDigit]. + self assert: (digits includes: $9). + self deny: (digits includes: $1). + self deny: (digits includes: $z).! Item was added: + ----- Method: CharacterSetTest>>testComplement (in category 'testing') ----- + testComplement + | set complement | + set := 'abc' as: CharacterSet. + complement := set complement. + self assert: (set noneSatisfy: [:e | complement includes: e]). + self assert: (($d to: $z) allSatisfy: [:e | complement includes: e]).! Item was changed: ----- Method: CharacterSetTest>>testCopy (in category 'testing') ----- testCopy | theOriginal theCopy | theOriginal := CharacterSet newFrom: 'abc'. theCopy := theOriginal copy. theCopy remove: $a. + ^self assert: (theOriginal includes: $a) description: 'Changing the copy should not change the original'.! - ^self should: [theOriginal includes: $a] description: 'Changing the copy should not change the original'.! Item was added: + ----- Method: CharacterSetTest>>testIncludes (in category 'testing') ----- + testIncludes + | set | + set := 'abc' as: CharacterSet. + self assert: (($a to: $c) allSatisfy: [:e | set includes: e]). + self assert: (($d to: $z) noneSatisfy: [:e | set includes: e]).! Item was added: + ----- Method: CharacterSetTest>>testIntersection (in category 'testing') ----- + testIntersection + | intersection | + intersection := ('abc' as: CharacterSet) intersection: ('bcde' as: CharacterSet). + self assert: intersection = ('bc' as: CharacterSet)! Item was added: + ----- Method: CharacterSetTest>>testIntersectionWithComplement (in category 'testing') ----- + testIntersectionWithComplement + | intersection intersection2 | + intersection := ('abcd' as: CharacterSet) intersection: ('cdef' as: CharacterSet) complement. + self assert: intersection = ('ab' as: CharacterSet). + intersection2 := ('cdef' as: CharacterSet) complement intersection: ('abcd' as: CharacterSet). + self assert: intersection2 = intersection. "Intersection is symmetric"! Item was added: + ----- Method: CharacterSetTest>>testUnion (in category 'testing') ----- + testUnion + | union | + union := ('abc' as: CharacterSet) union: ('bcde' as: CharacterSet). + self assert: union = ('abcde' as: CharacterSet)! Item was added: + ----- Method: CharacterSetTest>>testUnionWithComplement (in category 'testing') ----- + testUnionWithComplement + | union union2 | + union := ('abc' as: CharacterSet) union: ('bcde' as: CharacterSet) complement. + self assert: union = ('de' as: CharacterSet) complement. + union2 := ('bcde' as: CharacterSet) complement union: ('abc' as: CharacterSet). + self assert: union2 = union. "union is symmetric"! Item was changed: ----- Method: WideCharacterSetTest>>testAddingToCharacterSet (in category 'testing') ----- testAddingToCharacterSet | cs wcs wc | cs := CharacterSet newFrom: 'aeiouy'. wcs := cs copy. wc := 4452 asCharacter. self shouldnt: [wcs add: wc] raise: Error description: 'adding a WideCharacter to an ordinary CharacterSet should turn it into a WideCharacterSet'. + self assert: (wcs size = (cs size + 1)) description: 'We just added a Character, size should be increased by one'. + self deny: (wcs = cs) description: 'We just added a Character, sets should not be equal'. + self deny: (cs = wcs) description: 'We just added a Character, sets should not be equal'. + self assert: (cs allSatisfy: [:char | wcs includes: char]) description: 'Each character of the original CharacterSet should be included in the WideCharacterSet'. + self assert: (wcs hasWideCharacters) description: 'We just added a WideCharacter, so this WideCharacterSet definitely has one'. + self assert: (wcs includes: wc) description: 'We just added this WideCharacter, so this WideCharacterSet should include it'. - self should: [wcs size = (cs size + 1)] description: 'We just added a Character, size should be increased by one'. - self shouldnt: [wcs = cs] description: 'We just added a Character, sets should not be equal'. - self shouldnt: [cs = wcs] description: 'We just added a Character, sets should not be equal'. - self should: [cs allSatisfy: [:char | wcs includes: char]] description: 'Each character of the original CharacterSet should be included in the WideCharacterSet'. - self should: [wcs hasWideCharacters] description: 'We just added a WideCharacter, so this WideCharacterSet definitely has one'. - self should: [wcs includes: wc] description: 'We just added this WideCharacter, so this WideCharacterSet should include it'. wcs add: wc. + self assert: (wcs size = (cs size + 1)) description: 'We just added a Character already included in the set, size should be unchanged'. - self should: [wcs size = (cs size + 1)] description: 'We just added a Character already included in the set, size should be unchanged'. wcs remove: wc. + self assert: (wcs size = cs size) description: 'We added then removed a Character, now size should be equal to original'. + self deny: (wcs hasWideCharacters) description: 'We just removed the only WideCharacter, so this WideCharacterSet definitely has no WideCharacter'. - self should: [wcs size = cs size] description: 'We added then removed a Character, now size should be equal to original'. - self shouldnt: [wcs hasWideCharacters] description: 'We just removed the only WideCharacter, so this WideCharacterSet definitely has no WideCharacter'. + self assert: (wcs = cs) description: 'A WideCharacterSet can be equal to an Ordinary CharacterSet'. + self assert: (cs = wcs) description: 'An ordinary CharacterSet can be equal to a WideCharacterSet'. + self assert: (cs hash = wcs hash) description: 'If some objects are equal, then they should have same hash code'. - self should: [wcs = cs] description: 'A WideCharacterSet can be equal to an Ordinary CharacterSet'. - self should: [cs = wcs] description: 'An ordinary CharacterSet can be equal to a WideCharacterSet'. - self should: [cs hash = wcs hash] description: 'If some objects are equal, then they should have same hash code'. ! Item was changed: ----- Method: WideCharacterSetTest>>testCreation (in category 'testing') ----- testCreation "By now, only creation method is newFrom:" | cs1 wcs1 cs2 wcs2 byteString wideString | byteString := 'aeiouy'. wideString := 'aeiouy' copyWith: 340 asCharacter. cs1 := CharacterSet newFrom: byteString. wcs1 := WideCharacterSet newFrom: byteString. + self assert: (wcs1 = cs1). + self assert: (wcs1 size = byteString "asSet" size). - self should: [wcs1 = cs1]. - self should: [wcs1 size = byteString "asSet" size]. cs2 := CharacterSet newFrom: wideString. wcs2 := WideCharacterSet newFrom: wideString. + self assert: (wcs2 = cs2). + self assert: (wcs2 size = wideString "asSet" size). - self should: [wcs2 = cs2]. - self should: [wcs2 size = wideString "asSet" size]. + self assert: ((byteString indexOfAnyOf: wcs1) = 1) description: 'This should used optimized byteArrayMap method'. + self assert: ((byteString indexOfAnyOf: wcs2) = 1) description: 'This should used optimized byteArrayMap method'. - self should: [(byteString indexOfAnyOf: wcs1) = 1] description: 'This should used optimized byteArrayMap method'. - self should: [(byteString indexOfAnyOf: wcs2) = 1] description: 'This should used optimized byteArrayMap method'. + self assert: (('bcd' indexOfAnyOf: wcs1) = 0) description: 'This should used optimized byteArrayMap method'. + self assert: (('bcd' indexOfAnyOf: wcs2) = 0) description: 'This should used optimized byteArrayMap method'.! - self should: [('bcd' indexOfAnyOf: wcs1) = 0] description: 'This should used optimized byteArrayMap method'. - self should: [('bcd' indexOfAnyOf: wcs2) = 0] description: 'This should used optimized byteArrayMap method'.!

1 0

The Trunk: Collections-nice.770.mcz
by commits＠source.squeak.org 30 Nov '17

30 Nov '17

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.770.mcz ==================== Summary ==================== Name: Collections-nice.770 Author: nice Time: 30 November 2017, 6:01:07.729917 pm UUID: bab44976-95d4-e142-a0f7-eb954c3c237c Ancestors: Collections-tpr.769 Let CharacterSet union: work as expected and answer a (Wide)CharacterSet(Complement) when possible. =============== Diff against Collections-tpr.769 =============== Item was added: + ----- Method: CharacterSet>>union: (in category 'enumerating') ----- + union: aCollection + (self species = aCollection species or: [aCollection isString]) ifFalse: [^super union: aCollection]. + aCollection class = CharacterSetComplement ifTrue: [^aCollection union: self]. + ^self copy addAll: aCollection; yourself! Item was added: + ----- Method: CharacterSetComplement>>intersection: (in category 'enumerating') ----- + intersection: aCollection + aCollection class = self class ifTrue: [^(self complement union: aCollection complement) complement]. + ^(aCollection intersection: self) as: CharacterSet! Item was added: + ----- Method: CharacterSetComplement>>union: (in category 'enumerating') ----- + union: aCollection + aCollection class = self class ifTrue: [^(self complement intersection: aCollection complement) complement]. + (aCollection species = CharacterSet or: [aCollection isString]) ifFalse: [^self error: 'no way to compute the union, this collection is too big']. + ^(absent reject: [:e | aCollection includes: e]) complement! Item was added: + ----- Method: WideCharacterSet>>union: (in category 'enumerating') ----- + union: aCollection + (self species = aCollection species or: [aCollection isString]) ifFalse: [^super union: aCollection]. + ^self copy addAll: aCollection; yourself!

1 0

The Trunk: EToys-dtl.314.mcz
by commits＠source.squeak.org 29 Nov '17

29 Nov '17

David T. Lewis uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-dtl.314.mcz ==================== Summary ==================== Name: EToys-dtl.314 Author: dtl Time: 25 November 2017, 12:18:54.339694 pm UUID: 5d8ae2a6-a8d1-4c96-acc8-69ef66a4aa81 Ancestors: EToys-dtl.313 Remove references to global World from SyntaxMorph. Note: #asMorphicSyntaxIn: is required for SyntaxMorph but not implemented in the ParseNode hierarchy. Presumably this should be harvested from an Etoys image. =============== Diff against EToys-dtl.313 =============== Item was changed: ----- Method: SyntaxMorph>>offerTilesMenuFor:in: (in category 'menus') ----- offerTilesMenuFor: aReceiver in: aLexiconModel "Offer a menu of tiles for assignment and constants" | menu | menu := MenuMorph new addTitle: 'Hand me a tile for...'. menu addLine. menu add: '(accept method now)' target: aLexiconModel selector: #acceptTiles. menu submorphs last color: Color red darker. menu addLine. menu add: 'me, by name' target: self selector: #attachTileForCode:nodeType: argumentList: {'<me by name>'. aReceiver}. menu add: 'self' target: self selector: #attachTileForCode:nodeType: argumentList: {'self'. VariableNode}. menu add: '_ (assignment)' target: self selector: #attachTileForCode:nodeType: argumentList: {'<assignment>'. nil}. menu add: '"a Comment"' target: self selector: #attachTileForCode:nodeType: argumentList: {'"a comment"\' withCRs. CommentNode}. menu submorphs last color: Color blue. menu add: 'a Number' target: self selector: #attachTileForCode:nodeType: argumentList: {'5'. LiteralNode}. menu add: 'a Character' target: self selector: #attachTileForCode:nodeType: argumentList: {'$z'. LiteralNode}. menu add: '''abc''' target: self selector: #attachTileForCode:nodeType: argumentList: {'''abc'''. LiteralNode}. menu add: 'a Symbol constant' target: self selector: #attachTileForCode:nodeType: argumentList: {'#next'. LiteralNode}. menu add: 'true' target: self selector: #attachTileForCode:nodeType: argumentList: {'true'. VariableNode}. menu add: 'a Test' target: self selector: #attachTileForCode:nodeType: argumentList: {'true ifTrue: [self] ifFalse: [self]'. MessageNode}. menu add: 'a Loop' target: self selector: #attachTileForCode:nodeType: argumentList: {'1 to: 10 do: [:index | self]'. MessageNode}. menu add: 'a Block' target: self selector: #attachTileForCode:nodeType: argumentList: {'[self]'. BlockNode}. menu add: 'a Class or Global' target: self selector: #attachTileForCode:nodeType: argumentList: {'Character'. LiteralVariableNode}. menu add: 'a Reply' target: self selector: #attachTileForCode:nodeType: argumentList: {'| temp | temp'. ReturnNode}. + menu popUpAt: ActiveHand position forHand: ActiveHand in: self world. - menu popUpAt: ActiveHand position forHand: ActiveHand in: World. ! Item was changed: ----- Method: SyntaxMorph>>offerVarsMenuFor:in: (in category 'menus') ----- offerVarsMenuFor: aReceiver in: aLexiconModel "Offer a menu of tiles for assignment and constants" | menu instVarList cls | menu := MenuMorph new addTitle: 'Hand me a tile for...'. menu addLine. menu add: '(accept method now)' target: aLexiconModel selector: #acceptTiles. menu submorphs last color: Color red darker. menu addLine. menu add: 'new temp variable' target: self selector: #attachTileForCode:nodeType: argumentList: {'| temp | temp'. TempVariableNode}. instVarList := OrderedCollection new. cls := aReceiver class. [instVarList addAllFirst: cls instVarNames. cls == aLexiconModel limitClass] whileFalse: [cls := cls superclass]. instVarList do: [:nn | menu add: nn target: self selector: #instVarTile: argument: nn]. + menu popUpAt: ActiveHand position forHand: ActiveHand in: self world. - menu popUpAt: ActiveHand position forHand: ActiveHand in: World. ! Item was changed: ----- Method: SyntaxMorph>>showMenu: (in category 'menus') ----- showMenu: evt | menu | menu := MenuMorph new. self rootTile isMethodNode ifTrue: [menu add: 'accept method' target: self selector: #accept. menu addLine. menu add: 'new temp variable' target: self selector: #attachTileForCode:nodeType: argumentList: {'| temp | temp'. TempVariableNode}. menu addLine. self parsedInClass allInstVarNames do: [:nn | menu add: nn,' tile' target: self selector: #instVarTile: argument: nn]. menu addLine. menu add: 'show code' target: self selector: #showCode. menu add: 'try out' target: self selector: #try. + menu popUpAt: evt hand position forHand: evt hand in: self world]. - menu popUpAt: evt hand position forHand: evt hand in: World]. !

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages November 2017