Squeak-dev July 2018

squeak-dev@lists.squeakfoundation.org

28 participants
119 discussions

The Trunk: Collections-ul.798.mcz
by commits＠source.squeak.org 03 Jul '18

03 Jul '18

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.798.mcz ==================== Summary ==================== Name: Collections-ul.798 Author: ul Time: 2 July 2018, 8:52:05.858045 pm UUID: 8ed17235-fb2c-4453-9e6e-977d6d838cac Ancestors: Collections-cmm.797 HashedCollection changes: - added 3, 7 and 13 to #goodPrimes. These will mainly be used during compaction as the default grow sequence is 5, 11, 17, etc.. - improved performance of #goodPrimeAtLeast: by reordering comparisons - finally deprecated #findElementOrNil: and #fullCheck SequenceableCollection changes: - improved performance of #findBinary* methods by reordering comparisons and postponing index calculation - did the same in SortedCollection >> #indexForInserting: along with using #ifNil:ifNotNil: =============== Diff against Collections-cmm.797 =============== Item was changed: ----- Method: HashedCollection class>>goodPrimeAtLeast: (in category 'sizing') ----- goodPrimeAtLeast: lowerLimit "Answer the next good prime >= lowerlimit. If lowerLimit is larger than the largest known good prime, just make it odd." + | low mid high prime primes | - | primes low mid high prime | primes := self goodPrimes. - low := 1. high := primes size. lowerLimit > (primes at: high) ifTrue: [ ^lowerLimit bitOr: 1 ]. + low := 1. [ high - low <= 1 ] whileFalse: [ mid := high + low // 2. prime := primes at: mid. + lowerLimit < prime + ifTrue: [ high := mid ] + ifFalse: [ + lowerLimit > prime + ifTrue: [ low := mid ] + ifFalse: [ ^prime ] ] ]. - prime = lowerLimit ifTrue: [ ^prime ]. - prime < lowerLimit - ifTrue: [ low := mid ] - ifFalse: [ high := mid ] ]. (primes at: low) >= lowerLimit ifTrue: [ ^primes at: low ]. ^primes at: high! Item was changed: ----- Method: HashedCollection class>>goodPrimes (in category 'sizing') ----- goodPrimes "Answer a sorted array of prime numbers less than one billion that make good hash table sizes. Should be expanded as needed. See comments below code" + ^#(3 5 7 11 13 17 23 31 43 59 79 107 149 199 269 359 479 641 857 1151 1549 2069 - ^#( - 5 11 17 23 31 43 59 79 107 149 199 269 359 479 641 857 1151 1549 2069 2237 2423 2617 2797 2999 3167 3359 3539 3727 3911 4441 4787 5119 5471 5801 6143 6521 6827 7177 7517 7853 8783 9601 10243 10867 11549 12239 12919 13679 14293 15013 15731 17569 19051 20443 21767 23159 24611 25847 27397 28571 30047 31397 35771 38201 40841 43973 46633 48989 51631 54371 57349 60139 62969 70589 76091 80347 85843 90697 95791 101051 106261 111143 115777 120691 126311 140863 150523 160969 170557 181243 190717 201653 211891 221251 232591 242873 251443 282089 300869 321949 341227 362353 383681 401411 422927 443231 464951 482033 504011 562621 605779 647659 681607 723623 763307 808261 844709 886163 926623 967229 1014617 1121987 1201469 1268789 1345651 1429531 1492177 1577839 1651547 1722601 1800377 1878623 1942141 2028401 2242727 2399581 2559173 2686813 2836357 3005579 3144971 3283993 3460133 3582923 3757093 3903769 4061261 4455361 4783837 5068529 5418079 5680243 6000023 6292981 6611497 6884641 7211599 7514189 7798313 8077189 9031853 9612721 10226107 10745291 11338417 11939203 12567671 13212697 13816333 14337529 14938571 15595673 16147291 17851577 18993941 20180239 21228533 22375079 23450491 24635579 25683871 26850101 27921689 29090911 30153841 31292507 32467307 35817611 37983761 40234253 42457253 44750177 46957969 49175831 51442639 53726417 55954637 58126987 60365939 62666977 64826669 71582779 76039231 80534381 84995153 89500331 93956777 98470819 102879613 107400389 111856841 116365721 120819287 125246581 129732203 143163379 152076289 161031319 169981667 179000669 187913573 196826447 205826729 214748357 223713691 232679021 241591901 250504801 259470131 285162679 301939921 318717121 335494331 352271573 369148753 385926017 402603193 419480419 436157621 453034849 469712051 486589307 503366497 520043707 570475349 603929813 637584271 671138659 704693081 738247541 771801929 805356457 838910803 872365267 905919671 939574117 973128521 1006682977 1040137411 1073741833) "The above primes past 2069 were chosen carefully so that they do not interact badly with 1664525 (used by hashMultiply), and so that gcd(p, (256^k) +/- a) = 1, for 0<a<=32 and 0<k<=8. See Knuth's TAOCP for details." "The above primes also try to map the values of ((0 to: 4095) collect: [ :each | each << 18 \\ prime ]) sort to an equidistant sequence of numbers. This helps to avoid the collision of chains in identity-based hashed collections. To do that they were chosen to return a low value when the following block is evaluated with them as argument: [ :prime | + | n slots cost optimalDistance | + n := 1 bitShift: 22. + slots := Array new: n + 1. + 0 to: n - 1 do: [ :ea | slots at: ea + 1 put: (ea bitShift: 8) \\ prime ]. + slots at: n + 1 put: prime. - | slots cost optimalDistance previous | - slots := Array new: 4097. - 0 to: 4095 do: [ :ea | slots at: ea + 1 put: ea * 262144 \\ prime ]. - slots at: 4097 put: prime. slots sort. cost := 0. + optimalDistance := prime // n. + 2 to: n + 1 do: [ :index | - optimalDistance := prime // 4096. - 2 to: 4097 do: [ :index | | newCost | newCost := optimalDistance - ((slots at: index) - (slots at: index - 1)). newCost > cost ifTrue: [ cost := newCost ] ]. + result add: prime -> cost ] + + The shifts in the block relate to the numer of bits the #identityHash consists of (22) and the number of bits #scaledIdentityHash shifts it (8)"! - cost ]."! Item was removed: - ----- Method: HashedCollection>>findElementOrNil: (in category 'compatibility') ----- - findElementOrNil: anObject - "This method has been superseeded by #scanFor: - It is here for compatibility with external packages only." - ^self scanFor: anObject! Item was removed: - ----- Method: HashedCollection>>fullCheck (in category 'compatibility') ----- - fullCheck - "This is a private method, formerly implemented in Set, that is no longer required. - It is here for compatibility with external packages only." - "Keep array at least 1/4 free for decent hash behavior" - - array size * 3 < (tally * 4) ifTrue: [ self grow ]! Item was changed: ----- Method: SequenceableCollection>>findBinaryIndex:do:ifNone: (in category 'enumerating') ----- findBinaryIndex: aBlock do: actionBlock ifNone: exceptionBlock "Search for an element in the receiver using binary search. The argument aBlock is a one-element block returning 0 - if the element is the one searched for <0 - if the search should continue in the first half >0 - if the search should continue in the second half If found, evaluate actionBlock with the index as argument If no matching element is found, evaluate exceptionBlock, with the indexes of the 'bounding' elements as optional arguments. Warning: Might give invalid indexes, see examples below. Examples: #(1 3 5 7 11 15 23) findBinaryIndex: [ :arg | 11 - arg ] do: [ :found | found ] ifNone: [ :a :b | ('between: ', {a. b} printString)] #(1 3 5 7 11 15 23) findBinaryIndex: [ :arg | 12 - arg ] do: [ :found | found ] ifNone: [ :a :b | ('between: ', {a. b} printString) ] #(1 3 5 7 11 15 23) d findBinaryIndex: [ :arg | 0.5 - arg ] do: [ :found | found ] ifNone: [ :a :b | ('between: ', {a. b} printString) ] #(1 3 5 7 11 15 23) findBinaryIndex: [ :arg | 25 - arg ] do: [ :found | found ] ifNone: [ :a :b | ('between: ',{a. b} printString) ] " + | index low high test | - | index low high | low := 1. high := self size. + [ high < low ] whileFalse: [ + index := high + low // 2. + (test := aBlock value: (self at: index)) < 0 + ifTrue: [ high := index - 1 ] + ifFalse: [ + 0 < test - [ - index := high + low // 2. - low > high ] whileFalse: [ - | test | - test := aBlock value: (self at: index). - test = 0 - ifTrue: [ ^actionBlock value: index ] - ifFalse: [ test > 0 ifTrue: [ low := index + 1 ] + ifFalse: [ "test = 0" + ^actionBlock value: index ] ] ]. - ifFalse: [ high := index - 1 ] ] ]. ^exceptionBlock cull: high cull: low! Item was changed: ----- Method: SortedCollection>>indexForInserting: (in category 'private') ----- indexForInserting: newObject | index low high | low := firstIndex. high := lastIndex. + sortBlock + ifNil: [ + [ low > high ] whileFalse: [ + index := (high + low) // 2. + (array at: index) <= newObject + ifTrue: [ low := index + 1 ] + ifFalse: [ high := index - 1 ] ] ] + ifNotNil: [ + [ low > high ] whileFalse: [ + index := (high + low) // 2. + (sortBlock value: (array at: index) value: newObject) + ifTrue: [ low := index + 1 ] + ifFalse: [ high := index - 1 ] ] ]. - sortBlock isNil - ifTrue: [[index := high + low // 2. low > high] - whileFalse: - [((array at: index) <= newObject) - ifTrue: [low := index + 1] - ifFalse: [high := index - 1]]] - ifFalse: [[index := high + low // 2. low > high] - whileFalse: - [(sortBlock value: (array at: index) value: newObject) - ifTrue: [low := index + 1] - ifFalse: [high := index - 1]]]. ^low!

3 2

[RFE] Enhancing Backgrounds
by Edgar J. De Cleene 03 Jul '18

03 Jul '18

Folks: We don't have Gradient fills or individual background fills for each project. Any like this idea ? Could made as Sunday Squeak ? Edgar @morplenauta

3 13

The Trunk: EToys-dtl.337.mcz
by commits＠source.squeak.org 03 Jul '18

03 Jul '18

David T. Lewis uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-dtl.337.mcz ==================== Summary ==================== Name: EToys-dtl.337 Author: dtl Time: 2 July 2018, 10:20:52.440426 pm UUID: b77b5ba6-3a55-4797-b009-b6080a8b9ceb Ancestors: EToys-hjh.336 In Squeak circa 2003, GenericPropertiesMorph thingsToRevert is a Dictionary. In Etoys circa 2007 it is an ordered collection of associations to control order of execution in TextPropertiesMorph. Modern Squeak has OrderedDictionary, so use that instead. Partial fix for issues identified in http://lists.squeakfoundation.org/pipermail/squeak-dev/2018-July/199422.html. =============== Diff against EToys-hjh.336 =============== Item was changed: ----- Method: GenericPropertiesMorph>>initialize (in category 'initialization') ----- initialize "initialize the state of the receiver" super initialize. "" self layoutInset: 4. self hResizing: #shrinkWrap. self vResizing: #shrinkWrap. + thingsToRevert := OrderedDictionary new. "to control order of execution" - thingsToRevert := Dictionary new. self useRoundedCorners! Item was changed: ----- Method: TextPropertiesMorph>>initialize (in category 'initialization') ----- initialize "initialize the state of the receiver" super initialize. applyToWholeText := false. myTarget ifNil: [myTarget := TextMorph new openInWorld. myTarget contents: '']. activeTextMorph := myTarget. "Formerly was a copy..." - thingsToRevert := OrderedCollection new. "to control order of execution" thingsToRevert add: (#wrapFlag: -> myTarget isWrapped); add: (#autoFit: -> myTarget isAutoFit); add: (#setTextStyle: -> myTarget textStyle); add: (#margins: -> myTarget margins); add: (#extent: -> myTarget extent); add: (#textColor: -> myTarget textColor); add: (#restoreText: -> myTarget text deepCopy). self rebuild!

1 0

[Test][Squeak5.2a] Change text properties from the morph menu
by Jakob Reschke 03 Jul '18

03 Jul '18

1. Open a workspace, type some text in it. 2. Ctrl+left click on the text to open the morph menu of the TextMorphForEditView. 3. Choose "text properties..." Currently, the following appears, so I cannot write assertions about the expected behavior: MessageNotUnderstood: UndefinedObject>>bounds UndefinedObject(Object)>>doesNotUnderstand: #bounds TextPropertiesMorph(Morph)>>openNear:in: TextPropertiesMorph(Morph)>>openNearMorph: TextPropertiesMorph(GenericPropertiesMorph)>>openNearTarget [] in TextMorphForEditView(Morph)>>openATextPropertySheet IdentityDictionary(Dictionary)>>at:ifPresent: Environment>>at:ifPresent: SmalltalkImage>>at:ifPresent: TextMorphForEditView(Morph)>>openATextPropertySheet TextMorphForEditView(TextMorph)>>changeTextColor [] in MenuItemMorph>>invokeWithEvent: BlockClosure>>ensure: CursorWithMask(Cursor)>>showWhile: MenuItemMorph>>invokeWithEvent: MenuItemMorph>>mouseUp: MenuItemMorph>>handleMouseUp: MouseButtonEvent>>sentTo: MenuItemMorph(Morph)>>handleEvent: MorphicEventDispatcher>>dispatchEvent:withHandler:withMorph: MorphicEventDispatcher>>dispatchDefault:with:

2 1

The Trunk: Morphic-dtl.1459.mcz
by commits＠source.squeak.org 03 Jul '18

03 Jul '18

David T. Lewis uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-dtl.1459.mcz ==================== Summary ==================== Name: Morphic-dtl.1459 Author: dtl Time: 2 July 2018, 9:22:17.292098 pm UUID: ec5201c6-26aa-452d-b447-36fe3e0721fb Ancestors: Morphic-cmm.1458 Morph>>openNearMorph should open in a world. If the nearby morph does not know its world and self does not know either, then fall back on Project current world as a sensible place to be opened. This fixes the first of possibly several bugs identified in the test case described at http://lists.squeakfoundation.org/pipermail/squeak-dev/2018-July/199422.html. The remaining bug(s) involve Etoys integration. The #thingsToRevert in GenericPropertiesMorph is expected to be a Dictionary, but subclass TextPropertiesMorph from Etoys makes it an OrderedCollection of associations. The (earlier) Dictionary implementation appears correct, so the TextPropertiesmorph>>initialize from Etoys-Experimental should probably be changed to match the earlier implementation. =============== Diff against Morphic-cmm.1458 =============== Item was changed: ----- Method: Morph>>openNearMorph: (in category 'initialization') ----- openNearMorph: aMorph self openNear: aMorph boundsInWorld + in: (aMorph world + ifNil: [self world + ifNil: [Project current world]])! - in: (aMorph world ifNil: [ self world ])!

2 1

The Trunk: Morphic-dtl.1459.mcz
by commits＠source.squeak.org 03 Jul '18

03 Jul '18

David T. Lewis uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-dtl.1459.mcz ==================== Summary ==================== Name: Morphic-dtl.1459 Author: dtl Time: 2 July 2018, 9:13:27.506225 pm UUID: dea580bf-a9ac-401c-88b9-c9dd2b7eb101 Ancestors: Morphic-cmm.1458 Morph>>openNearMorph should open in a world. If the nearby morph does not know its world and self does not know either, then fall back on Project current world as a sensible place to be opened. This fixes the first of possibly several bugs identified in the test case described at GenericPropertiesMorph allSubInstances. The remaining bug(s) involve Etoys integration. The #thingsToRevert in GenericPropertiesMorph is expected to be a Dictionary, but subclass TextPropertiesMorph from Etoys makes it an OrderedCollection of associations. The (earlier) Dictionary implementation appears correct, so the TextPropertiesmorph>>initialize from Etoys-Experimental should probably be changed to match the earlier implementation. =============== Diff against Morphic-cmm.1458 =============== Item was changed: ----- Method: Morph>>openNearMorph: (in category 'initialization') ----- openNearMorph: aMorph self openNear: aMorph boundsInWorld + in: (aMorph world + ifNil: [self world + ifNil: [Project current world]])! - in: (aMorph world ifNil: [ self world ])!

1 0

The Trunk: MultilingualTests-ul.33.mcz
by commits＠source.squeak.org 02 Jul '18

02 Jul '18

Levente Uzonyi uploaded a new version of MultilingualTests to project The Trunk: http://source.squeak.org/trunk/MultilingualTests-ul.33.mcz ==================== Summary ==================== Name: MultilingualTests-ul.33 Author: ul Time: 2 July 2018, 11:35:48.085236 pm UUID: 27e2687a-0b43-4c8a-891a-c6011ba19b07 Ancestors: MultilingualTests-ul.32 MultiByteFileStreamTest: - fix 2 more cases =============== Diff against MultilingualTests-ul.32 =============== Item was changed: ----- Method: MultiByteFileStreamTest>>testUpToPositionNonZero (in category 'testing') ----- testUpToPositionNonZero "Ensures that upToPosition: behaves correctly with a non-zero-length read." - | in out fn | - fn :='testUpToPosition.in'. - out := FileDirectory default forceNewFileNamed: fn. - out nextPutAll: 231 asCharacter asString, 'a<b'. - out close. + fileName := 'testUpToPosition.in'. + FileDirectory default forceNewFileNamed: fileName do: [ :out | + out nextPutAll: 231 asCharacter asString, 'a<b' ]. + + FileDirectory default readOnlyFileNamed: fileName do: [ :in | + self assert: in next = 231 asCharacter. + self assert: (in upToPosition: in position + 2) = 'a<'. + self assert: in next = $b ]! - in := FileDirectory default readOnlyFileNamed: fn. - self assert: in next = 231 asCharacter. - self assert: (in upToPosition: in position + 2) = 'a<'. - self assert: in next = $b.! Item was changed: ----- Method: MultiByteFileStreamTest>>testUpToPositionZero (in category 'testing') ----- testUpToPositionZero "Ensures that upToPosition: behaves correctly with a zero-length read." - | in out fn | - fn :='testUpToPosition.in'. - out := FileDirectory default forceNewFileNamed: fn. - out nextPutAll: 231 asCharacter asString, 'a<b'. - out close. + fileName := 'testUpToPosition.in'. + FileDirectory default forceNewFileNamed: fileName do: [ :out | + out nextPutAll: 231 asCharacter asString, 'a<b' ]. + + FileDirectory default readOnlyFileNamed: fileName do: [ :in | + self assert: in next = 231 asCharacter. + self assert: (in upToPosition: in position) = ''. + self assert: in next = $a ]! - in := FileDirectory default readOnlyFileNamed: fn. - self assert: in next = 231 asCharacter. - self assert: (in upToPosition: in position) = ''. - self assert: in next = $a.!

1 0

The Trunk: MultilingualTests-ul.32.mcz
by commits＠source.squeak.org 02 Jul '18

02 Jul '18

Levente Uzonyi uploaded a new version of MultilingualTests to project The Trunk: http://source.squeak.org/trunk/MultilingualTests-ul.32.mcz ==================== Summary ==================== Name: MultilingualTests-ul.32 Author: ul Time: 2 July 2018, 11:33:14.701094 pm UUID: 37d57291-187e-4317-83c4-ec3cef2b5a92 Ancestors: MultilingualTests-dtl.31 MultiByteFileStreamTest: - use the existing mechanism (assign to the instance variable fileName) to prevent files being left behind - use *fileNamed:do: instead of *fileNamed: to ensure the files are closed right after use =============== Diff against MultilingualTests-dtl.31 =============== Item was changed: ----- Method: MultiByteFileStreamTest>>testUpToAllAscii (in category 'testing') ----- testUpToAllAscii "This test case is inspired by Mantis #4665." "Compare to testUpToAllUtf." + | resultA resultB | + fileName :='testUpToAll.in'. + FileDirectory default forceNewFileNamed: fileName do: [ :out | + out nextPutAll: 'A<'. "Encodes to byte sequence 413C" ]. - | in out fn resultA resultB | - fn :='testUpToAll.in'. - out := FileDirectory default forceNewFileNamed: fn. - out nextPutAll: 'A<'. "Encodes to byte sequence 413C" - out close. + resultA := FileDirectory default readOnlyFileNamed: fileName do: [ :in | + in upToAll: '<' ]. - in := FileDirectory default readOnlyFileNamed: fn. - resultA := in upToAll: '<'. - in close. + resultB := FileDirectory default readOnlyFileNamed: fileName do: [ :in | + in upTo: $< ]. - in := FileDirectory default readOnlyFileNamed: fn. - resultB := in upTo: $<. - in close. self assert: resultA = resultB ! Item was changed: ----- Method: MultiByteFileStreamTest>>testUpToAllNonZeroLength (in category 'testing') ----- testUpToAllNonZeroLength "Ensures that upToAll: correctly skips over the nonzero-length separator." + + fileName :='testUpToAll.in'. + FileDirectory default forceNewFileNamed: fileName do: [ :out | + out nextPutAll: 231 asCharacter asString, 'a<b<<c' ]. - | in out fn | - fn :='testUpToAll.in'. - out := FileDirectory default forceNewFileNamed: fn. - out nextPutAll: 231 asCharacter asString, 'a<b<<c'. - out close. + FileDirectory default readOnlyFileNamed: fileName do: [ :in | + self assert: in next = 231 asCharacter. + self assert: (in upToAll: '<<') = 'a<b'. + self assert: in next = $c ]! - in := FileDirectory default readOnlyFileNamed: fn. - self assert: in next = 231 asCharacter. - self assert: (in upToAll: '<<') = 'a<b'. - self assert: in next = $c.! Item was changed: ----- Method: MultiByteFileStreamTest>>testUpToAllUtf (in category 'testing') ----- testUpToAllUtf "This test case is adapted from Mantis #4665." "MultiByteFileStream was relying on PositionableStream>>#match: to discover the position immediately following the delimiter collection. It would then use #next: to retrieve a number of *characters* computed as the difference in stream positions. However, stream positions are measured in *bytes*, not characters, so this would lead to misalignment when the skipped text included UTF-8 encoded characters." + | resultA resultB | + fileName :='testUpToAll.in'. + FileDirectory default forceNewFileNamed: fileName do: [ :out | + out nextPutAll: 231 asCharacter asString, '<'. "Encodes to byte sequence C3A73C" ]. - | in out fn resultA resultB | - fn :='testUpToAll.in'. - out := FileDirectory default forceNewFileNamed: fn. - out nextPutAll: 231 asCharacter asString, '<'. "Encodes to byte sequence C3A73C" - out close. + resultA := FileDirectory default readOnlyFileNamed: fileName do: [ :in | + in upToAll: '<' ]. - in := FileDirectory default readOnlyFileNamed: fn. - resultA := in upToAll: '<'. - in close. + resultB := FileDirectory default readOnlyFileNamed: fileName do: [ :in | + in upTo: $< ]. - in := FileDirectory default readOnlyFileNamed: fn. - resultB := in upTo: $<. - in close. self assert: resultA = resultB ! Item was changed: ----- Method: MultiByteFileStreamTest>>testUpToAllZeroLength (in category 'testing') ----- testUpToAllZeroLength "Ensures that upToAll: behaves correctly with a zero-length separator." + + fileName :='testUpToAll.in'. + FileDirectory default forceNewFileNamed: fileName do: [ :out | + out nextPutAll: 231 asCharacter asString, 'a<b<<c' ]. - | in out fn | - fn :='testUpToAll.in'. - out := FileDirectory default forceNewFileNamed: fn. - out nextPutAll: 231 asCharacter asString, 'a<b<<c'. - out close. + FileDirectory default readOnlyFileNamed: fileName do: [ :in | + self assert: in next = 231 asCharacter. + self assert: (in upToAll: '') = ''. + self assert: in next = $a ]! - in := FileDirectory default readOnlyFileNamed: fn. - self assert: in next = 231 asCharacter. - self assert: (in upToAll: '') = ''. - self assert: in next = $a.!

1 0

The Trunk: 60Deprecated-ul.24.mcz
by commits＠source.squeak.org 02 Jul '18

02 Jul '18

Levente Uzonyi uploaded a new version of 60Deprecated to project The Trunk: http://source.squeak.org/trunk/60Deprecated-ul.24.mcz ==================== Summary ==================== Name: 60Deprecated-ul.24 Author: ul Time: 2 July 2018, 11:38:16.743035 pm UUID: fd211025-e838-49aa-a701-14c4bb7e0287 Ancestors: 60Deprecated-ul.23 - deprecated Character class >> #characterTable =============== Diff against 60Deprecated-ul.23 =============== Item was added: + ----- Method: Character class>>characterTable (in category '*60Deprecated-constants') ----- + characterTable + "Answer the class variable in which unique Characters are stored." + + self deprecated: 'All characters are immediate.'. + ^self allByteCharacters as: String!

1 0

The Trunk: Collections-ul.800.mcz
by commits＠source.squeak.org 02 Jul '18

02 Jul '18

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.800.mcz ==================== Summary ==================== Name: Collections-ul.800 Author: ul Time: 2 July 2018, 11:44:52.435558 pm UUID: 369bd2ae-d7b3-40cd-acbd-b731aee61d94 Ancestors: Collections-ul.799 Character changes: - deprecated #characterTable - removed the CharacterTable class variable - store ClassificationTable data in a WordArray (reinitialized by the package postscript) - use self to create character constants (#euro, #nbsp) String optimizations for - #findFirstInString:inSet:startingAt: - #isAllDigits - #isOctetString =============== Diff against Collections-ul.799 =============== Item was changed: Magnitude immediateSubclass: #Character instanceVariableNames: '' + classVariableNames: 'AlphaNumericMask ClassificationTable DigitBit DigitValues LetterMask LowercaseBit UppercaseBit' - classVariableNames: 'AlphaNumericMask CharacterTable ClassificationTable DigitBit DigitValues LetterMask LowercaseBit UppercaseBit' poolDictionaries: '' category: 'Collections-Strings'! !Character commentStamp: 'eem 8/12/2014 14:53' prior: 0! I represent a character by storing its associated Unicode as an unsigned 30-bit value. Characters are created uniquely, so that all instances of a particular Unicode are identical. My instances are encoded in tagged pointers in the VM, so called immediates, and therefore are pure immutable values. The code point is based on Unicode. Since Unicode is 21-bit wide character set, we have several bits available for other information. As the Unicode Standard states, a Unicode code point doesn't carry the language information. This is going to be a problem with the languages so called CJK (Chinese, Japanese, Korean. Or often CJKV including Vietnamese). Since the characters of those languages are unified and given the same code point, it is impossible to display a bare Unicode code point in an inspector or such tools. To utilize the extra available bits, we use them for identifying the languages. Since the old implementation uses the bits to identify the character encoding, the bits are sometimes called "encoding tag" or neutrally "leading char", but the bits rigidly denotes the concept of languages. The other languages can have the language tag if you like. This will help to break the large default font (font set) into separately loadable chunk of fonts. However, it is open to the each native speakers and writers to decide how to define the character equality, since the same Unicode code point may have different language tag thus simple #= comparison may return false.! Item was removed: - ----- Method: Character class>>characterTable (in category 'constants') ----- - characterTable - "Answer the class variable in which unique Characters are stored." - - ^CharacterTable! Item was changed: ----- Method: Character class>>euro (in category 'accessing untypeable characters') ----- euro "The Euro currency sign, that E with two dashes. The code point is a official unicode ISO/IEC-10646-1" + ^self value: 16r20AC! - ^ Unicode value: 16r20AC! Item was changed: ----- Method: Character class>>initializeClassificationTable (in category 'class initialization') ----- initializeClassificationTable "Initialize the classification table. The classification table is a compact encoding of upper and lower cases and digits of characters with - bits 0-7: The lower case value of this character or 0, if its greater than 255. - bits 8-15: The upper case value of this character or 0, if its greater than 255. - bit 16: lowercase bit (isLowercase == true) - bit 17: uppercase bit (isUppercase == true) - bit 18: digit bit (isDigit == true)" " self initializeClassificationTable " | encodedCharSet newClassificationTable | "Base the table on the EncodedCharset of these characters' leadingChar - 0." encodedCharSet := EncodedCharSet charsetAt: 0. LowercaseBit := 1 bitShift: 16. UppercaseBit := 1 bitShift: 17. DigitBit := 1 bitShift: 18. "Initialize the letter mask (e.g., isLetter == true)" LetterMask := LowercaseBit bitOr: UppercaseBit. "Initialize the alphanumeric mask (e.g. isAlphaNumeric == true)" AlphaNumericMask := LetterMask bitOr: DigitBit. "Initialize the table based on encodedCharSet." + newClassificationTable := WordArray new: 256. - newClassificationTable := Array new: 256. 0 to: 255 do: [ :code | | isLowercase isUppercase isDigit lowercaseCode uppercaseCode value | isLowercase := encodedCharSet isLowercaseCode: code. isUppercase := encodedCharSet isUppercaseCode: code. isDigit := encodedCharSet isDigitCode: code. lowercaseCode := encodedCharSet toLowercaseCode: code. lowercaseCode > 255 ifTrue: [ lowercaseCode := 0 ]. uppercaseCode := encodedCharSet toUppercaseCode: code. uppercaseCode > 255 ifTrue: [ uppercaseCode := 0 ]. value := (uppercaseCode bitShift: 8) + lowercaseCode. isLowercase ifTrue: [ value := value bitOr: LowercaseBit ]. isUppercase ifTrue: [ value := value bitOr: UppercaseBit ]. isDigit ifTrue: [ value := value bitOr: DigitBit ]. newClassificationTable at: code + 1 put: value ]. ClassificationTable := newClassificationTable! Item was changed: ----- Method: Character class>>nbsp (in category 'accessing untypeable characters') ----- nbsp + "non-breakable space" - "non-breakable space. Latin1 encoding common usage." + ^self value: 160! - ^ Character value: 160! Item was changed: ----- Method: String class>>findFirstInString:inSet:startingAt: (in category 'primitives') ----- findFirstInString: aString inSet: inclusionMap startingAt: start "Trivial, non-primitive version" + | i stringSize ascii | + inclusionMap size ~= 256 ifTrue: [ ^0 ]. - | i stringSize ascii more | - inclusionMap size ~= 256 ifTrue: [^ 0]. stringSize := aString size. - more := true. i := start - 1. + [ (i := i + 1) <= stringSize ] whileTrue: [ + (ascii := aString basicAt: i) < 256 ifTrue: [ + (inclusionMap at: ascii + 1) = 0 ifFalse: [ ^i ] ] ]. + ^0! - [more and: [(i := i + 1) <= stringSize]] whileTrue: [ - ascii := aString basicAt: i. - more := ascii < 256 ifTrue: [(inclusionMap at: ascii + 1) = 0] ifFalse: [true]. - ]. - - i > stringSize ifTrue: [^ 0]. - ^ i! Item was changed: ----- Method: String>>isAllDigits (in category 'testing') ----- isAllDigits "whether the receiver is composed entirely of digits" + + ^self allSatisfy: [ :character | character isDigit ]! - self do: [:c | c isDigit ifFalse: [^ false]]. - ^ true! Item was changed: ----- Method: String>>isOctetString (in category 'testing') ----- isOctetString "Answer whether the receiver can be represented as a byte string. This is different from asking whether the receiver *is* a ByteString (i.e., #isByteString)" 1 to: self size do: [:pos | + (self basicAt: pos) >= 256 ifTrue: [^ false]. - (self at: pos) asInteger >= 256 ifTrue: [^ false]. ]. ^ true. ! Item was changed: + (PackageInfo named: 'Collections') postscript: 'Character initializeClassificationTable'! - (PackageInfo named: 'Collections') postscript: 'CharacterSet allInstancesDo: [:e | ByteCharacterSet adoptInstance: e ]'!

1 0