From 71e121c2fd76236952fcbed57019864e83940835 Mon Sep 17 00:00:00 2001 From: Torsten Bergmann Date: Sun, 10 Sep 2023 10:27:30 +0200 Subject: [PATCH] Cleanups like formatting and lint checking --- .../BitmapCharacterSetTest.class.st | 288 +++++++++--------- ...ollectionsBitmapCharacterSetTests.class.st | 36 +++ .../BitmapCharacterSet.class.st | 95 +++--- 3 files changed, 240 insertions(+), 179 deletions(-) create mode 100644 src/Collections-BitmapCharacterSet-Tests/ManifestCollectionsBitmapCharacterSetTests.class.st diff --git a/src/Collections-BitmapCharacterSet-Tests/BitmapCharacterSetTest.class.st b/src/Collections-BitmapCharacterSet-Tests/BitmapCharacterSetTest.class.st index 8e6530b..85b5372 100644 --- a/src/Collections-BitmapCharacterSet-Tests/BitmapCharacterSetTest.class.st +++ b/src/Collections-BitmapCharacterSet-Tests/BitmapCharacterSetTest.class.st @@ -7,7 +7,7 @@ Class { #instVars : [ 'characters' ], - #category : #'Collections-BitmapCharacterSet-Tests' + #category : #'Collections-BitmapCharacterSet-Tests-Base' } { #category : #enumerating } @@ -26,18 +26,22 @@ BitmapCharacterSetTest >> absentCharactersDo: aBlock [ { #category : #asserting } BitmapCharacterSetTest >> assertSet: aFirstSet copiedFrom: aSecondSet equals: aThirdSet [ + self - deny: aFirstSet == aSecondSet; - deny: aFirstSet byteCharacters == aSecondSet byteCharacters. - (aFirstSet wideCharacters notNil - or: [aSecondSet wideCharacters notNil]) - ifTrue: [self deny: aFirstSet wideCharacters == aSecondSet wideCharacters]. - - self assert: aFirstSet = aThirdSet. + deny: aFirstSet identicalTo: aSecondSet; + deny: aFirstSet byteCharacters + identicalTo: aSecondSet byteCharacters. + (aFirstSet wideCharacters notNil or: [ + aSecondSet wideCharacters notNil ]) ifTrue: [ + self + deny: aFirstSet wideCharacters + identicalTo: aSecondSet wideCharacters ]. + self assert: aFirstSet equals: aThirdSet ] { #category : #accessing } BitmapCharacterSetTest >> characters [ + ^ characters ifNil: [| writeStream previousValue offset | writeStream := (Array new: 250000) writeStream. @@ -63,89 +67,98 @@ BitmapCharacterSetTest >> charactersDo: aBlock [ { #category : #accessing } BitmapCharacterSetTest >> emptySet [ + ^ self setClass new ] { #category : #accessing } BitmapCharacterSetTest >> lastCodePoint [ + ^ 16r10FFFF ] { #category : #accessing } BitmapCharacterSetTest >> nonEmptySet [ + ^ self setClass newFrom: self characters ] { #category : #accessing } BitmapCharacterSetTest >> rangeCharacters [ + ^ 'abcdefghijklmnopqrstuvwxyz' ] { #category : #accessing } BitmapCharacterSetTest >> rangeStart [ + ^ self rangeCharacters first ] { #category : #accessing } BitmapCharacterSetTest >> rangeStop [ + ^ self rangeCharacters last ] { #category : #accessing } BitmapCharacterSetTest >> setClass [ + ^ BitmapCharacterSet ] { #category : #tests } BitmapCharacterSetTest >> testAdd [ - | set | + | set | set := self emptySet. - self charactersDo: [:each | + self charactersDo: [ :each | self deny: (set includes: each); - assert: (set add: each) = each; + assert: (set add: each) equals: each; assert: (set includes: each); - assert: (set add: each) = each; - assert: (set includes: each)]. + assert: (set add: each) equals: each; + assert: (set includes: each) ] ] { #category : #tests } BitmapCharacterSetTest >> testAddRangeFromTo [ - | set | + | set | set := self emptySet. - self "empty range, because from > to" - assert: (set addRangeFrom: self rangeStop to: self rangeStart) == set; - assert: set isEmpty. - self - assert: (set addRangeFrom: self rangeStart to: self rangeStop) == set; - assert: set = (self setClass newFrom: self rangeCharacters). + assert: (set addRangeFrom: self rangeStop to: self rangeStart) + identicalTo: set; + assert: set isEmpty. "empty range, because from > to" + self + assert: (set addRangeFrom: self rangeStart to: self rangeStop) + identicalTo: set; + assert: set equals: (self setClass newFrom: self rangeCharacters). set := self emptySet. self - assert: (set addRangeFrom: self rangeStart to: self rangeStart) == set; - assert: set = (self setClass with: self rangeStart). + assert: (set addRangeFrom: self rangeStart to: self rangeStart) + identicalTo: set; + assert: set equals: (self setClass with: self rangeStart) ] { #category : #tests } BitmapCharacterSetTest >> testByteCharactersDo [ - | set enumerated | + | set enumerated | set := self emptySet. enumerated := OrderedCollection new. - set byteCharactersDo: [:each | enumerated addLast: each]. + set byteCharactersDo: [ :each | enumerated addLast: each ]. self assert: enumerated isEmpty. set addAll: self characters. - set byteCharactersDo: [:each | enumerated addLast: each]. + set byteCharactersDo: [ :each | enumerated addLast: each ]. self assert: enumerated notEmpty. - enumerated withIndexDo: [:each :i | + enumerated withIndexDo: [ :each :i | self assert: each asciiValue < 256; - assert: each = (self characters at: i)]. + assert: each equals: (self characters at: i) ] ] { #category : #tests } @@ -154,31 +167,30 @@ BitmapCharacterSetTest >> testCapacity [ even when a specific capacity is specified." self - assert: (self setClass new: 0) capacity = 256; - assert: (self setClass new: 256) capacity = 256. - 257 to: 264 do: [:i | - self assert: (self setClass new: i) capacity = 264]. - 265 to: 272 do: [:i | - self assert: (self setClass new: i) capacity = 272]. + assert: (self setClass new: 0) capacity equals: 256; + assert: (self setClass new: 256) capacity equals: 256. + 257 to: 264 do: [ :i | + self assert: (self setClass new: i) capacity equals: 264 ]. + 265 to: 272 do: [ :i | + self assert: (self setClass new: i) capacity equals: 272 ] ] { #category : #tests } BitmapCharacterSetTest >> testComplement [ - | set complement | + | set complement | set := self nonEmptySet. complement := set complement. - self deny: set = complement. - self charactersDo: [:each | + self deny: set equals: complement. + self charactersDo: [ :each | self assert: (set includes: each); - deny: (complement includes: each)]. - self absentCharactersDo: [:each | + deny: (complement includes: each) ]. + self absentCharactersDo: [ :each | self deny: (set includes: each); - assert: (complement includes: each)]. - - self assert: complement complement = set. + assert: (complement includes: each) ]. + self assert: complement complement equals: set ] { #category : #tests } @@ -199,7 +211,7 @@ BitmapCharacterSetTest >> testConcatenation [ self assertSet: set, self nonEmptySet copiedFrom: set - equals: self nonEmptySet. + equals: self nonEmptySet ] { #category : #tests } @@ -216,7 +228,7 @@ BitmapCharacterSetTest >> testCopy [ self assertSet: set copy copiedFrom: set - equals: self nonEmptySet. + equals: self nonEmptySet ] { #category : #tests } @@ -233,35 +245,36 @@ BitmapCharacterSetTest >> testCopyEmpty [ self assertSet: set copyEmpty copiedFrom: set - equals: self emptySet. + equals: self emptySet ] { #category : #tests } BitmapCharacterSetTest >> testDo [ - | set enumerated | + | set enumerated | set := self emptySet. enumerated := OrderedCollection new. - set do: [:each | enumerated addLast: each]. + set do: [ :each | enumerated addLast: each ]. self assert: enumerated isEmpty. set addAll: self characters. - set do: [:each | enumerated addLast: each]. - self assert: enumerated size = self characters size. + set do: [ :each | enumerated addLast: each ]. + self assert: enumerated size equals: self characters size. enumerated with: self characters - do: [:enumeratedChar :expectedChar | - self assert: enumeratedChar = expectedChar] + do: [ :enumeratedChar :expectedChar | + self assert: enumeratedChar equals: expectedChar ] ] { #category : #tests } BitmapCharacterSetTest >> testEquals [ + self - assert: self emptySet = self emptySet; - assert: self nonEmptySet = self nonEmptySet; - deny: self emptySet = self nonEmptySet; - deny: self nonEmptySet = self emptySet + assert: self emptySet equals: self emptySet; + assert: self nonEmptySet equals: self nonEmptySet; + deny: self emptySet equals: self nonEmptySet; + deny: self nonEmptySet equals: self emptySet ] { #category : #tests } @@ -278,214 +291,213 @@ BitmapCharacterSetTest >> testHasWideCharacters [ self assert: set hasWideCharacters. set remove: 256 asCharacter. - self deny: set hasWideCharacters. + self deny: set hasWideCharacters ] { #category : #tests } BitmapCharacterSetTest >> testHash [ + self - assert: self emptySet hash = self emptySet hash; - assert: self nonEmptySet hash = self nonEmptySet hash + assert: self emptySet hash equals: self emptySet hash; + assert: self nonEmptySet hash equals: self nonEmptySet hash ] { #category : #tests } BitmapCharacterSetTest >> testIncludes [ - | set | + | set | set := self emptySet. self - charactersDo: [:each | self deny: (set includes: each)]; - absentCharactersDo: [:each | self deny: (set includes: each)]. + charactersDo: [ :each | self deny: (set includes: each) ]; + absentCharactersDo: [ :each | self deny: (set includes: each) ]. set := self nonEmptySet. self - charactersDo: [:each | self assert: (set includes: each)]; - absentCharactersDo: [:each | self deny: (set includes: each)]. + charactersDo: [ :each | self assert: (set includes: each) ]; + absentCharactersDo: [ :each | self deny: (set includes: each) ] ] { #category : #tests } BitmapCharacterSetTest >> testIncludesRangeFromTo [ - | set | + | set | set := self emptySet. - self rangeCharacters do: [:each | + self rangeCharacters do: [ :each | self deny: (set includesRangeFrom: self rangeStart to: self rangeStop); assert: (set includesRangeFrom: self rangeStop to: self rangeStart). - set add: each]. + set add: each ]. self assert: (set includesRangeFrom: self rangeStart to: self rangeStop); - assert: (set includesRangeFrom: self rangeStop to: self rangeStart). + assert: (set includesRangeFrom: self rangeStop to: self rangeStart) ] { #category : #tests } BitmapCharacterSetTest >> testMaxCapacity [ - | maxCapacity set | + | maxCapacity set | maxCapacity := self lastCodePoint + 1. set := self setClass new: maxCapacity. - self assert: set capacity = maxCapacity. + self assert: set capacity equals: maxCapacity. set := self setClass new: maxCapacity + 1. - self assert: set capacity = maxCapacity. + self assert: set capacity equals: maxCapacity. set := self setClass new: maxCapacity * 2. - self assert: set capacity = maxCapacity. + self assert: set capacity equals: maxCapacity ] { #category : #tests } BitmapCharacterSetTest >> testMaxCharacter [ - | set | + | set | set := self emptySet. - self - shouldnt: [set add: self lastCodePoint asCharacter] - raise: Error. + set add: self lastCodePoint asCharacter. self assert: (set includes: self lastCodePoint asCharacter). self - should: [set add: (self lastCodePoint + 1) asCharacter] - raise: Error. + should: [ set add: (self lastCodePoint + 1) asCharacter ] + raise: Error ] { #category : #tests } BitmapCharacterSetTest >> testNewFrom [ - | set newSet | + | set newSet | set := self setClass newFrom: self characters. - self assert: set class == self setClass. - self charactersDo: [:each | self assert: (set includes: each)]. + self assert: set class identicalTo: self setClass. + self charactersDo: [ :each | self assert: (set includes: each) ]. newSet := self setClass newFrom: set. self - assert: newSet = set; - deny: newSet == set. + assert: newSet equals: set; + deny: newSet identicalTo: set ] { #category : #tests } BitmapCharacterSetTest >> testRemoveAll [ - | set capacity byteCharactersSize wideCharactersSize| + | set capacity byteCharactersSize wideCharactersSize | set := self nonEmptySet. capacity := set capacity. byteCharactersSize := set byteCharacters size. wideCharactersSize := set wideCharacters size. self - assert: set removeAll == set; - assert: set size = 0; - assert: set capacity = capacity; - assert: set byteCharacters size = byteCharactersSize; - assert: (set byteCharacters allSatisfy: [:each | each = false]); - assert: set wideCharacters size = wideCharactersSize; - assert: (set wideCharacters allSatisfy: [:each | each = 0]). + assert: set removeAll identicalTo: set; + assert: set size equals: 0; + assert: set capacity equals: capacity; + assert: set byteCharacters size equals: byteCharactersSize; + assert: (set byteCharacters allSatisfy: [ :each | each = false ]); + assert: set wideCharacters size equals: wideCharactersSize; + assert: (set wideCharacters allSatisfy: [ :each | each = 0 ]) ] { #category : #tests } BitmapCharacterSetTest >> testRemoveIfAbsent [ - | set | + | set | set := self nonEmptySet. - self absentCharactersDo: [:each | - self assert: - (set - remove: each - ifAbsent: [#absent]) = #absent]. - self charactersDo: [:each | - self assert: - (set - remove: each - ifAbsent: [self fail]) = each. - self assert: - (set - remove: each - ifAbsent: [#absent]) = #absent]. + self absentCharactersDo: [ :each | + self + assert: (set remove: each ifAbsent: [ #absent ]) + equals: #absent ]. + self charactersDo: [ :each | + self assert: (set remove: each ifAbsent: [ self fail ]) equals: each. + self + assert: (set remove: each ifAbsent: [ #absent ]) + equals: #absent ] ] { #category : #tests } BitmapCharacterSetTest >> testRemoveRangeFromTo [ - | set | + | set | set := self emptySet. - self "empty range, because from > to" - assert: (set removeRangeFrom: self rangeStop to: self rangeStart) == set; + self + assert: (set removeRangeFrom: self rangeStop to: self rangeStart) + identicalTo: set; assert: set isEmpty. set addRangeFrom: self rangeStart to: self rangeStop. self - assert: (set removeRangeFrom: self rangeStart to: self rangeStop) == set; + assert: (set removeRangeFrom: self rangeStart to: self rangeStop) + identicalTo: set; assert: set isEmpty. - self rangeCharacters do: [:each | + self rangeCharacters do: [ :each | set := self setClass newFrom: self rangeCharacters. self - assert: (set removeRangeFrom: each to: each) == set; - assert: - set = - (self setClass newFrom: (self rangeCharacters copyWithout: each)). - self - should: [set removeRangeFrom: each to: each] - raise: Error]. + assert: (set removeRangeFrom: each to: each) identicalTo: set; + assert: set + equals: + (self setClass newFrom: (self rangeCharacters copyWithout: each)). + self should: [ set removeRangeFrom: each to: each ] raise: Error ] ] { #category : #tests } BitmapCharacterSetTest >> testSize [ - | set size | + | set size | set := self emptySet. size := 0. - self charactersDo: [:each | - self assert: set size = size. + self charactersDo: [ :each | + self assert: set size equals: size. set add: each. size := size + 1. - self assert: set size = size. - - "Adding the same character shouldn't alter the size" + self assert: set size equals: size. set add: each. - self assert: set size = size.]. + self assert: set size equals: size ]. - self charactersDo: [:each | + self charactersDo: [ :each | set remove: each. size := size - 1. - self assert: set size = size]. + self assert: set size equals: size ] ] { #category : #tests } BitmapCharacterSetTest >> testWideCharacters [ - 0 to: 7 do: [:i | | set character | + + 0 to: 7 do: [ :i | + | set character | set := self setClass new. character := (256 + i) asCharacter. self assert: set wideCharacters isNil. set add: character. - self assert: set wideCharacters first = (16r80 bitShift: i negated). + self + assert: set wideCharacters first + equals: (16r80 bitShift: i negated). set remove: character. - self assert: set wideCharacters first = 0]. - 0 to: 7 do: [:i | | set character | + self assert: set wideCharacters first equals: 0 ]. + 0 to: 7 do: [ :i | + | set character | set := self setClass new. character := (256 + 8 + i) asCharacter. self assert: set wideCharacters isNil. set add: character. - self assert: set wideCharacters second = (16r80 bitShift: i negated). + self + assert: set wideCharacters second + equals: (16r80 bitShift: i negated). set remove: character. - self assert: set wideCharacters second = 0] + self assert: set wideCharacters second equals: 0 ] ] { #category : #tests } BitmapCharacterSetTest >> testWideCharactersDo [ - | set enumerated wideCharOffset | + | set enumerated wideCharOffset | set := self emptySet. enumerated := OrderedCollection new. - set wideCharactersDo: [:each | enumerated addLast: each]. + set wideCharactersDo: [ :each | enumerated addLast: each ]. self assert: enumerated isEmpty. set addAll: self characters. - set wideCharactersDo: [:each | enumerated addLast: each]. + set wideCharactersDo: [ :each | enumerated addLast: each ]. self assert: enumerated notEmpty. - wideCharOffset := - (self characters findFirst: [:each | each asciiValue >= 256]) - 1. - enumerated withIndexDo: [:each :i | + wideCharOffset := (self characters findFirst: [ :each | + each asciiValue >= 256 ]) - 1. + enumerated withIndexDo: [ :each :i | self assert: each asciiValue >= 256; - assert: each = (self characters at: wideCharOffset + i)]. + assert: each equals: (self characters at: wideCharOffset + i) ] ] diff --git a/src/Collections-BitmapCharacterSet-Tests/ManifestCollectionsBitmapCharacterSetTests.class.st b/src/Collections-BitmapCharacterSet-Tests/ManifestCollectionsBitmapCharacterSetTests.class.st new file mode 100644 index 0000000..d205a62 --- /dev/null +++ b/src/Collections-BitmapCharacterSet-Tests/ManifestCollectionsBitmapCharacterSetTests.class.st @@ -0,0 +1,36 @@ +" +Please describe the package using the class comment of the included manifest class. The manifest class also includes other additional metadata for the package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser +" +Class { + #name : #ManifestCollectionsBitmapCharacterSetTests, + #superclass : #PackageManifest, + #category : #'Collections-BitmapCharacterSet-Tests-Manifest' +} + +{ #category : #'code-critics' } +ManifestCollectionsBitmapCharacterSetTests class >> ruleCollectionProtocolRuleV1FalsePositive [ + + + ^ #(#(#(#RGMethodDefinition #(#BitmapCharacterSetTest #testIncludesRangeFromTo #false)) #'2023-09-10T10:22:27.072+02:00') ) +] + +{ #category : #'code-critics' } +ManifestCollectionsBitmapCharacterSetTests class >> ruleEqualsTrueRuleV1FalsePositive [ + + + ^ #(#(#(#RGMethodDefinition #(#BitmapCharacterSetTest #testRemoveAll #false)) #'2023-09-10T10:23:20.756+02:00') ) +] + +{ #category : #'code-critics' } +ManifestCollectionsBitmapCharacterSetTests class >> ruleLiteralArrayContainsSuspiciousTrueFalseOrNilRuleV1FalsePositive [ + + + ^ #(#(#(#RGMetaclassDefinition #(#'ManifestCollectionsBitmapCharacterSetTests class' #ManifestCollectionsBitmapCharacterSetTests)) #'2023-09-10T10:26:38.422+02:00') ) +] + +{ #category : #'code-critics' } +ManifestCollectionsBitmapCharacterSetTests class >> ruleUsesAddRuleV1FalsePositive [ + + + ^ #(#(#(#RGMethodDefinition #(#BitmapCharacterSetTest #testAdd #false)) #'2023-09-10T10:20:40.071+02:00') ) +] diff --git a/src/Collections-BitmapCharacterSet/BitmapCharacterSet.class.st b/src/Collections-BitmapCharacterSet/BitmapCharacterSet.class.st index f463406..2c6d28d 100644 --- a/src/Collections-BitmapCharacterSet/BitmapCharacterSet.class.st +++ b/src/Collections-BitmapCharacterSet/BitmapCharacterSet.class.st @@ -11,7 +11,7 @@ Class { 'wideCharacters', 'tally' ], - #category : #'Collections-BitmapCharacterSet' + #category : #'Collections-BitmapCharacterSet-Base' } { #category : #inspecting } @@ -22,32 +22,37 @@ BitmapCharacterSet class >> inspectorClass [ { #category : #'instance creation' } BitmapCharacterSet class >> new [ + ^ self new: 256 ] { #category : #'instance creation' } BitmapCharacterSet class >> new: aCapacity [ + ^ self basicNew initialize: aCapacity ] { #category : #'instance creation' } BitmapCharacterSet class >> newFrom: aCollection [ "for GS portability" + ^ self new addAll: aCollection; - yourself + yourself ] { #category : #copying } BitmapCharacterSet >> , aCollection [ "GS doesn't define #, for non-Sequenceable collections" + ^ self copy - addAll: aCollection; - yourself + addAll: aCollection; + yourself ] { #category : #comparing } BitmapCharacterSet >> = anObject [ + self == anObject ifTrue: [^ true]. @@ -58,28 +63,26 @@ BitmapCharacterSet >> = anObject [ self do: [:each | (anObject includes: each) ifFalse: [^ false]]. - ^ true. + ^ true ] { #category : #adding } BitmapCharacterSet >> add: aCharacter [ - | asciiValue | + | asciiValue | "optimized for speed with inlining; do not refactor" (asciiValue := aCharacter asciiValue) < 256 ifTrue: [ - (byteCharacters at: asciiValue + 1) - ifFalse: [tally := tally + 1]. - byteCharacters - at: asciiValue + 1 - put: true] - ifFalse: [| byteIndex byte bitmask | + (byteCharacters at: asciiValue + 1) ifFalse: [ tally := tally + 1 ]. + byteCharacters at: asciiValue + 1 put: true ] + ifFalse: [ + | byteIndex byte bitmask | "256 // 8 - 31 = 1 (first index), (256 + 8) // 8 - 31 = 2 (second), etc (with 'bitShift: -3' used over '// 8' for speed)" byteIndex := (asciiValue bitShift: -3) - 31. - (wideCharacters == nil - or: [byteIndex > wideCharacters size]) - ifTrue: [self growWideCharacterBitmapTo: (byteIndex * 1.5) asInteger]. + (wideCharacters isNil or: [ byteIndex > wideCharacters size ]) + ifTrue: [ + self growWideCharacterBitmapTo: (byteIndex * 1.5) asInteger ]. "raises an error if asciiValue > 16r10FFFF" byte := wideCharacters at: byteIndex. @@ -87,15 +90,12 @@ BitmapCharacterSet >> add: aCharacter [ "for the byte bitmask, left shift 1 by 7 - (asciiValue \\ 8) (with 'bitAnd: 7' used over '\\ 8' for speed)" bitmask := 1 bitShift: 7 - (asciiValue bitAnd: 7). - + "increment the tally if the character is not already present" - (byte bitAnd: bitmask) == 0 - ifTrue: [tally := tally + 1]. + (byte bitAnd: bitmask) == 0 ifTrue: [ tally := tally + 1 ]. - wideCharacters - at: byteIndex - put: (byte bitOr: bitmask)]. - ^ aCharacter. + wideCharacters at: byteIndex put: (byte bitOr: bitmask) ]. + ^ aCharacter ] { #category : #adding } @@ -113,44 +113,49 @@ BitmapCharacterSet >> addRangeFrom: aStartCharacter to: aStopCharacter [ { #category : #private } BitmapCharacterSet >> byteCharacters [ + ^ byteCharacters ] { #category : #enumerating } BitmapCharacterSet >> byteCharactersDo: aBlock [ - 1 to: byteCharacters size do: [:i | - (byteCharacters at: i) - ifTrue: [aBlock value: (Character value: i - 1)]] + + 1 to: byteCharacters size do: [ :i | + (byteCharacters at: i) ifTrue: [ + aBlock value: (Character value: i - 1) ] ] ] { #category : #accessing } BitmapCharacterSet >> capacity [ + ^ byteCharacters size + (wideCharacters ifNil: [0] - ifNotNil: [wideCharacters size * 8]). + ifNotNil: [wideCharacters size * 8]) ] { #category : #converting } BitmapCharacterSet >> complement [ - | copy | + | copy | copy := self copyEmpty. 0 to: 16r10FFFF do: [:i | | character | character := (Character value: i). (self includes: character) ifFalse: [copy add: character]]. - ^ copy. + ^ copy ] { #category : #copying } BitmapCharacterSet >> copyEmpty [ "reimplemented for GS and Squeak compatibility" + ^ self species new: self capacity ] { #category : #enumerating } BitmapCharacterSet >> do: aBlock [ + self byteCharactersDo: aBlock; wideCharactersDo: aBlock @@ -158,8 +163,8 @@ BitmapCharacterSet >> do: aBlock [ { #category : #private } BitmapCharacterSet >> growWideCharacterBitmapTo: aSizeInBytes [ - | newSize | + | newSize | newSize := aSizeInBytes min: self maxWideCharactersSize. wideCharacters ifNil: [wideCharacters := ByteArray new: newSize] @@ -169,29 +174,30 @@ BitmapCharacterSet >> growWideCharacterBitmapTo: aSizeInBytes [ replaceFrom: 1 to: wideCharacters size with: wideCharacters - startingAt: 1]. + startingAt: 1] ] { #category : #testing } BitmapCharacterSet >> hasWideCharacters [ + self wideCharactersDo: [:each | ^ true]. - ^ false. + ^ false ] { #category : #comparing } BitmapCharacterSet >> hash [ - | hash | + | hash | hash := self species hash. self byteCharactersDo: [:each | hash := hash bitXor: each hash]. - ^ hash bitXor: self size hash. + ^ hash bitXor: self size hash ] { #category : #testing } BitmapCharacterSet >> includes: aCharacter [ - | asciiValue | + | asciiValue | "optimized for speed with inlining; do not refactor" (asciiValue := aCharacter asciiValue) < 256 ifTrue: [^ byteCharacters at: asciiValue + 1] @@ -222,11 +228,12 @@ BitmapCharacterSet >> includesRangeFrom: aStartCharacter to: aStopCharacter [ do: [:i | (self includes: (Character value: i)) ifFalse: [^ false]]. - ^ true. + ^ true ] { #category : #initialization } BitmapCharacterSet >> initialize: aCapacity [ + byteCharacters := Array new: 256 withAll: false. aCapacity > 256 ifTrue: [ @@ -234,25 +241,28 @@ BitmapCharacterSet >> initialize: aCapacity [ (257 + 8 - 1) // 8 - 31 = 2 (second byte), etc (with 'bitShift: -3' used over '// 8' for speed)" self growWideCharacterBitmapTo: ((aCapacity - 1) bitShift: -3) - 31]. - tally := 0. + tally := 0 ] { #category : #testing } BitmapCharacterSet >> isEmpty [ "Squeak's Collection>>#isEmpty is inefficient" + ^ self size = 0 ] { #category : #private } BitmapCharacterSet >> maxWideCharactersSize [ + ^ 139232 "(16r10FFFF bitShift: -3) - 31" ] { #category : #copying } BitmapCharacterSet >> postCopy [ + byteCharacters := byteCharacters copy. wideCharacters - ifNotNil: [wideCharacters := wideCharacters copy]. + ifNotNil: [wideCharacters := wideCharacters copy] ] { #category : #removing } @@ -270,7 +280,7 @@ BitmapCharacterSet >> remove: aCharacter ifAbsent: aBlock [ ifFalse: [| byteIndex byte bitmask | wideCharacters ifNil: [^ aBlock value]. - + "256 // 8 - 31 = 1 (first index), (256 + 8) // 8 - 31 = 2 (second), etc (with 'bitShift: -3' used over '// 8' for speed)" (byteIndex := (asciiValue bitShift: -3) - 31) > wideCharacters size @@ -286,7 +296,7 @@ BitmapCharacterSet >> remove: aCharacter ifAbsent: aBlock [ at: byteIndex put: (byte bitAnd: bitmask bitInvert)]. tally := tally - 1. - ^ aCharacter. + ^ aCharacter ] { #category : #removing } @@ -314,6 +324,7 @@ BitmapCharacterSet >> removeRangeFrom: aStartCharacter to: aStopCharacter [ "chars don't support to:do: (compiled inline) and using to: and do: separately needlessly creates a (possibly large) temp array" + aStartCharacter asciiValue to: aStopCharacter asciiValue do: [:i | self remove: (Character value: i)] @@ -321,19 +332,21 @@ BitmapCharacterSet >> removeRangeFrom: aStartCharacter to: aStopCharacter [ { #category : #accessing } BitmapCharacterSet >> size [ + ^ tally ] { #category : #private } BitmapCharacterSet >> wideCharacters [ + ^ wideCharacters ] { #category : #enumerating } BitmapCharacterSet >> wideCharactersDo: aBlock [ "optimized for speed with to:do: and inlining; do not refactor" - | baseValue | + | baseValue | wideCharacters ifNil: [^ self]. @@ -346,5 +359,5 @@ BitmapCharacterSet >> wideCharactersDo: aBlock [ ifFalse: [ aBlock value: (Character value: baseValue + shiftIndex)]]]. - baseValue := baseValue + 8]. + baseValue := baseValue + 8] ]