Squeak-dev May 2015

squeak-dev@lists.squeakfoundation.org

50 participants
615 discussions

The Inbox: Collections-ul.625.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

A new version of Collections was added to project The Inbox: http://source.squeak.org/inbox/Collections-ul.625.mcz ==================== Summary ==================== Name: Collections-ul.625 Author: ul Time: 1 May 2015, 1:41:40.726 pm UUID: d09538cd-53f4-42d7-8070-224fde4a4ae2 Ancestors: Collections-ul.624 Use the ClassificationTable in #asLowercase, #asUppercase (the obsolete behavior is gone), #isAlphaNumeric, #isDigit, #isLetter, #isLowercase and #isUppercase of Character. =============== Diff against Collections-ul.624 =============== Item was changed: ----- Method: Character>>asLowercase (in category 'converting') ----- asLowercase + "Answer the receiver's matching lowercase Character." + + value > 255 ifFalse: [ + | result | + (result := (ClassificationTable at: value + 1) bitAnd: 16rFF) > 0 + ifTrue: [ ^self class value: result ] ]. + ^self class value: (self encodedCharSet toLowercaseCode: value)! - "If the receiver is uppercase, answer its matching lowercase Character." - "A tentative implementation. Eventually this should consult the Unicode table." - - | v | - v := self charCode. - (((8r101 <= v and: [v <= 8r132]) or: [16rC0 <= v and: [v <= 16rD6]]) or: [16rD8 <= v and: [v <= 16rDE]]) - ifTrue: [^ Character value: v + 8r40]. - v < 256 ifTrue: [^self]. - ^self class value: ((value < 16r400000 - ifTrue: [Unicode] - ifFalse: [self encodedCharSet charsetClass]) - toLowercaseCode: v)! Item was changed: ----- Method: Character>>asUppercase (in category 'converting') ----- asUppercase + "Answer the receiver's matching uppercase Character." + + value > 255 ifFalse: [ + | result | + (result := ((ClassificationTable at: value + 1) bitShift: -8) bitAnd: 16rFF) > 0 + ifTrue: [ ^self class value: result ] ]. + ^self class value: (self encodedCharSet toUppercaseCode: value)! - "If the receiver is lowercase, answer its matching uppercase Character." - "A tentative implementation. Eventually this should consult the Unicode table." - - | v | - v := self charCode. - (((8r141 <= v and: [v <= 8r172]) or: [16rE0 <= v and: [v <= 16rF6]]) or: [16rF8 <= v and: [v <= 16rFE]]) - ifTrue: [^ Character value: v - 8r40]. - v < 256 ifTrue: [^self]. - ^self class value: ((value < 16r400000 - ifTrue: [Unicode] - ifFalse: [self encodedCharSet charsetClass]) - toUppercaseCode: v)! Item was changed: ----- Method: Character>>isAlphaNumeric (in category 'testing') ----- isAlphaNumeric "Answer whether the receiver is a letter or a digit." + value > 255 ifFalse: [ ^((ClassificationTable at: value + 1) bitAnd: AlphaNumericMask) > 0 ]. ^self encodedCharSet isAlphaNumeric: self! Item was changed: ----- Method: Character>>isDigit (in category 'testing') ----- isDigit + value > 255 ifFalse: [ ^((ClassificationTable at: value + 1) bitAnd: DigitBit) > 0 ]. ^self encodedCharSet isDigit: self. ! Item was changed: ----- Method: Character>>isLetter (in category 'testing') ----- isLetter + value > 255 ifFalse: [ ^((ClassificationTable at: value + 1) bitAnd: LetterMask) > 0 ]. + ^self encodedCharSet isLetter: self! - ^self encodedCharSet isLetter: self. - ! Item was changed: ----- Method: Character>>isLowercase (in category 'testing') ----- isLowercase + value > 255 ifFalse: [ ^((ClassificationTable at: value + 1) bitAnd: LowercaseBit) > 0 ]. ^self encodedCharSet isLowercase: self. ! Item was changed: ----- Method: Character>>isUppercase (in category 'testing') ----- isUppercase + value > 255 ifFalse: [ ^((ClassificationTable at: value + 1) bitAnd: UppercaseBit) > 0 ]. ^self encodedCharSet isUppercase: self. !

1 0

The Inbox: Collections-ul.624.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

A new version of Collections was added to project The Inbox: http://source.squeak.org/inbox/Collections-ul.624.mcz ==================== Summary ==================== Name: Collections-ul.624 Author: ul Time: 1 May 2015, 1:40:09.445 pm UUID: a89640e5-e0cc-44e1-9613-e065b78258ad Ancestors: Collections-tfel.623 Various improvements related to Characters and Strings. Resurrected Character's ClassificationTable - initialize it based on the actual EncodedCharSet for leadingChar 0 (Unicode) - added a bit for #isDigit - added a mask for #isAlphaNumeirc - use 0 as a tag if the uppercase or lowercase character value is greater than 255 - initialize the table in the postscript (to not infere with #initialize) Character >> #encodedCharSet assumes than leadingChar 0 means Unicode. This is hardcoded in a few methods, so why not unify it here? Simpler and faster Character >> #tokenish. Simpler and faster String >> #withoutLineEndings. Precalculate the size of the result in Symbol >> #numArgs: to avoid an extra allocation. =============== Diff against Collections-tfel.623 =============== Item was changed: Magnitude subclass: #Character instanceVariableNames: 'value' + classVariableNames: 'AlphaNumericMask CharacterTable ClassificationTable DigitBit DigitValues LetterMask LowercaseBit UppercaseBit' - classVariableNames: 'CharacterTable ClassificationTable DigitValues LetterBits LowercaseBit UppercaseBit' poolDictionaries: '' category: 'Collections-Strings'! !Character commentStamp: 'ar 4/9/2005 22:35' prior: 0! I represent a character by storing its associated Unicode. The first 256 characters are created uniquely, so that all instances of latin1 characters ($R, for example) are identical. 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. I represent a character by storing its associated ASCII code (extended to 256 codes). My instances are created uniquely, so that all instances of a character ($R, for example) are identical.! 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 " - " - Initialize the classification table. The classification table is a - compact encoding of upper and lower cases of characters with + | encodedCharSet | + "Base the table on the EncodedCharset of these characters' leadingChar - 0." + encodedCharSet := EncodedCharSet charsetAt: 0. - - bits 0-7: The lower case value of this character. - - bits 8-15: The upper case value of this character. - - bit 16: lowercase bit (e.g., isLowercase == true) - - bit 17: uppercase bit (e.g., isUppercase == true) - " - | ch1 | - 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 letter bits (e.g., isLetter == true)" - LetterBits := LowercaseBit bitOr: UppercaseBit. + "Initialize the alphanumeric mask (e.g. isAlphaNumeric == true)" + AlphaNumericMask := LetterMask bitOr: DigitBit. - ClassificationTable := Array new: 256. - "Initialize the defaults (neither lower nor upper case)" - 0 to: 255 do:[:i| - ClassificationTable at: i+1 put: (i bitShift: 8) + i. - ]. + "Initialize the table based on encodedCharSet." + ClassificationTable := 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 ]. + ClassificationTable at: code + 1 put: value ]! - "Initialize character pairs (upper-lower case)" - #( - "Basic roman" - ($A $a) ($B $b) ($C $c) ($D $d) - ($E $e) ($F $f) ($G $g) ($H $h) - ($I $i) ($J $j) ($K $k) ($L $l) - ($M $m) ($N $n) ($O $o) ($P $p) - ($Q $q) ($R $r) ($S $s) ($T $t) - ($U $u) ($V $v) ($W $w) ($X $x) - ($Y $y) ($Z $z) - "International" - ($Ä $ä) ($Å $å) ($Ç $ç) ($É $é) - ($Ñ $ñ) ($Ö $ö) ($Ü $ü) ($À $à) - ($Ã $ã) ($Õ $õ) ($ $) ($Æ $æ) - "International - Spanish" - ($Á $á) ($Í $í) ($Ó $ó) ($Ú $ú) - "International - PLEASE CHECK" - ($È $è) ($Ì $ì) ($Ò $ò) ($Ù $ù) - ($Ë $ë) ($Ï $ï) - ($Â $â) ($Ê $ê) ($Î $î) ($Ô $ô) ($Û $û) - ) do:[:pair| | ch2 | - ch1 := pair first asciiValue. - ch2 := pair last asciiValue. - ClassificationTable at: ch1+1 put: (ch1 bitShift: 8) + ch2 + UppercaseBit. - ClassificationTable at: ch2+1 put: (ch1 bitShift: 8) + ch2 + LowercaseBit. - ]. - - "Initialize a few others for which we only have lower case versions." - #($ß $Ø $ø $ÿ) do:[:char| - ch1 := char asciiValue. - ClassificationTable at: ch1+1 put: (ch1 bitShift: 8) + ch1 + LowercaseBit. - ]. - ! Item was changed: ----- Method: Character>>encodedCharSet (in category 'accessing') ----- encodedCharSet + + value < 16r400000 ifTrue: [ ^Unicode ]. "Shortcut" - ^EncodedCharSet charsetAt: self leadingChar ! Item was changed: ----- Method: Character>>tokenish (in category 'testing') ----- tokenish + "Answer whether the receiver is a valid token-character--letter, digit, or colon." - "Answer whether the receiver is a valid token-character--letter, digit, or - colon." + self == $_ ifTrue: [ ^Scanner prefAllowUnderscoreSelectors ]. + ^self == $: or: [ self isAlphaNumeric ]! - ^ self == $_ - ifTrue: [ Scanner prefAllowUnderscoreSelectors ] - ifFalse: [ self == $: or: [ self isLetter or: [ self isDigit ] ] ]! Item was changed: ----- Method: String>>withoutLineEndings (in category 'converting') ----- withoutLineEndings + ^self withLineEndings: ' '! - ^ self withSqueakLineEndings - copyReplaceAll: String cr - with: ' ' - asTokens: false! Item was changed: ----- Method: Symbol>>numArgs: (in category 'system primitives') ----- numArgs: n "Answer a string that can be used as a selector with n arguments. TODO: need to be extended to support shrinking and for selectors like #+ " + | numArgs offset |. + (numArgs := self numArgs) >= n ifTrue: [ ^self ]. + numArgs = 0 + ifTrue: [ offset := 1 ] + ifFalse: [ offset := 0 ]. + ^(String new: n - numArgs + offset * 5 + offset + self size streamContents: [ :stream | + stream nextPutAll: self. + numArgs = 0 ifTrue: [ stream nextPut: $:. ]. + numArgs + offset + 1 to: n do: [ :i | stream nextPutAll: 'with:' ] ]) asSymbol! - | numArgs aStream offs |. - (numArgs := self numArgs) >= n ifTrue: [^self]. - aStream := WriteStream on: (String new: 16). - aStream nextPutAll: self. - - (numArgs = 0) ifTrue: [aStream nextPutAll: ':'. offs := 0] ifFalse: [offs := 1]. - 2 to: n - numArgs + offs do: [:i | aStream nextPutAll: 'with:']. - ^aStream contents asSymbol! Item was changed: + (PackageInfo named: 'Collections') postscript: 'Character initializeClassificationTable'! - (PackageInfo named: 'Collections') postscript: 'LRUCache allInstances do: [ :each | each reset ]'!

1 0

The Inbox: Multilingual-ul.208.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

A new version of Multilingual was added to project The Inbox: http://source.squeak.org/inbox/Multilingual-ul.208.mcz ==================== Summary ==================== Name: Multilingual-ul.208 Author: ul Time: 1 May 2015, 3:25:18.828 pm UUID: 82d19dac-c602-4c0d-bc9a-7858e3a3c283 Ancestors: Multilingual-ul.206 Improved Unicode caseMappings: - Don't overwrite an existing mapping, because that leads to problems (like (Unicode toUppercaseCode: $k asciiValue) = 8490) - Use PluggableDictionary class >> #integerDictionary for better lookup performance (~+16%), and compaction resistance (done at every release). - Compact the dictionaries before saving. - Save the new dictionaries atomically. =============== Diff against Multilingual-ul.206 =============== Item was changed: ----- Method: Unicode class>>initializeCaseMappings (in category 'casing') ----- initializeCaseMappings "Unicode initializeCaseMappings" + + UIManager default informUserDuring: [ :bar | - ToCasefold := IdentityDictionary new. - ToUpper := IdentityDictionary new. - ToLower := IdentityDictionary new. - UIManager default informUserDuring: [:bar| | stream | bar value: 'Downloading Unicode data'. stream := HTTPClient httpGet: 'http://www.unicode.org/Public/UNIDATA/CaseFolding.txt'. (stream isKindOf: RWBinaryOrTextStream) ifFalse:[^self error: 'Download failed']. stream reset. bar value: 'Updating Case Mappings'. + self parseCaseMappingFrom: stream ].! - self parseCaseMappingFrom: stream. - ].! Item was changed: ----- Method: Unicode class>>parseCaseMappingFrom: (in category 'casing') ----- parseCaseMappingFrom: stream "Parse the Unicode casing mappings from the given stream. Handle only the simple mappings" " Unicode initializeCaseMappings. " + | newToCasefold newToUpper newToLower casefoldKeys | + newToCasefold := PluggableDictionary integerDictionary. + newToUpper := PluggableDictionary integerDictionary. + newToLower := PluggableDictionary integerDictionary. - ToCasefold := IdentityDictionary new: 2048. - ToUpper := IdentityDictionary new: 2048. - ToLower := IdentityDictionary new: 2048. + "Filter the mappings (Simple and Common) to newToCasefold." + stream contents linesDo: [ :line | + | data fields sourceCode destinationCode | + data := line copyUpTo: $#. + fields := data findTokens: '; '. + (fields size > 2 and: [ #('C' 'S') includes: (fields at: 2) ]) ifTrue:[ + sourceCode := Integer readFrom: (fields at: 1) base: 16. + destinationCode := Integer readFrom: (fields at: 3) base: 16. + newToCasefold at: sourceCode put: destinationCode ] ]. - [stream atEnd] whileFalse:[ - | fields line srcCode dstCode | - line := stream nextLine copyUpTo: $#. - fields := line withBlanksTrimmed findTokens: $;. - (fields size > 2 and: [#('C' 'S') includes: (fields at: 2) withBlanksTrimmed]) ifTrue:[ - srcCode := Integer readFrom: (fields at: 1) withBlanksTrimmed base: 16. - dstCode := Integer readFrom: (fields at: 3) withBlanksTrimmed base: 16. - ToCasefold at: srcCode put: dstCode. - ]. - ]. + casefoldKeys := newToCasefold keys. + newToCasefold keysAndValuesDo: [ :sourceCode :destinationCode | + (self isUppercaseCode: sourceCode) ifTrue: [ + "In most cases, uppercase letter are folded to lower case" + newToUpper at: destinationCode put: sourceCode. + newToLower at: sourceCode ifAbsentPut: destinationCode "Don't overwrite existing pairs. To avoid $k asUppercase to return the Kelvin character (8490)." ]. + (self isLowercaseCode: sourceCode) ifTrue: [ + "In a few cases, two upper case letters are folded to the same lower case. + We must find an upper case letter folded to the same letter" + casefoldKeys + detect: [ :each | + (self isUppercaseCode: each) and: [ + (newToCasefold at: each) = destinationCode ] ] + ifFound: [ :uppercaseCode | + newToUpper at: sourceCode put: uppercaseCode ] + ifNone: [ ] ] ]. + + "Compact the dictionaries." + newToCasefold compact. + newToUpper compact. + newToLower compact. + "Save in an atomic operation." + ToCasefold := newToCasefold. + ToUpper := newToUpper. + ToLower := newToLower + ! - ToCasefold keysAndValuesDo: - [:k :v | - (self isUppercaseCode: k) - ifTrue: - ["In most cases, uppercase letter are folded to lower case" - ToUpper at: v put: k. - ToLower at: k put: v]. - (self isLowercaseCode: k) - ifTrue: - ["In a few cases, two upper case letters are folded to the same lower case. - We must find an upper case letter folded to the same letter" - | up | - up := ToCasefold keys detect: [:e | (self isUppercaseCode: e) and: [(ToCasefold at: e) = v]] ifNone: [nil]. - up ifNotNil: [ToUpper at: k put: up]]].!

1 0

The Inbox: Multilingual-ul.209.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

A new version of Multilingual was added to project The Inbox: http://source.squeak.org/inbox/Multilingual-ul.209.mcz ==================== Summary ==================== Name: Multilingual-ul.209 Author: ul Time: 1 May 2015, 7:48:22.654 pm UUID: 966caead-fd54-4687-9369-3580c258e5db Ancestors: Multilingual-ul.208 Refactored unicode data parsing. Case conversion (ToUpper and ToLower) is parsed from UnicodeData.txt instead of CaseFolding.txt. Reinitialize both CaseFolding and CompositionMapping in the postscript. =============== Diff against Multilingual-ul.206 =============== Item was added: + ----- Method: Unicode class>>caseFoldingData (in category 'casing') ----- + caseFoldingData + + UIManager default informUserDuring: [ :bar | + | stream | + bar value: 'Downloading CaseFolding Unicode data'. + stream := HTTPClient httpGet: 'http://www.unicode.org/Public/UNIDATA/CaseFolding.txt'. + (stream isKindOf: RWBinaryOrTextStream) ifFalse: [ + ^self error: 'Download failed' ]. + ^stream reset; contents ]! Item was added: + ----- Method: Unicode class>>initializeCaseFolding (in category 'casing') ----- + initializeCaseFolding + " self initializeCaseFolding " + + self parseCaseFoldingFrom: self caseFoldingData! Item was removed: - ----- Method: Unicode class>>initializeCaseMappings (in category 'casing') ----- - initializeCaseMappings - "Unicode initializeCaseMappings" - ToCasefold := IdentityDictionary new. - ToUpper := IdentityDictionary new. - ToLower := IdentityDictionary new. - UIManager default informUserDuring: [:bar| - | stream | - bar value: 'Downloading Unicode data'. - stream := HTTPClient httpGet: 'http://www.unicode.org/Public/UNIDATA/CaseFolding.txt'. - (stream isKindOf: RWBinaryOrTextStream) ifFalse:[^self error: 'Download failed']. - stream reset. - bar value: 'Updating Case Mappings'. - self parseCaseMappingFrom: stream. - ].! Item was changed: ----- Method: Unicode class>>initializeCompositionMappings (in category 'composing') ----- initializeCompositionMappings + " self initializeCompositionMappings " + + self parseCompositionMappingFrom: self unicodeData! - "Unicode initializeCompositionMappings" - Compositions := IdentityDictionary new. - Decompositions := IdentityDictionary new. - UIManager default informUserDuring:[:bar| - | stream | - bar value: 'Downloading Unicode data'. - stream := HTTPClient httpGet: 'http://unicode.org/Public/UNIDATA/UnicodeData.txt'. - (stream isKindOf: RWBinaryOrTextStream) ifFalse:[^self error: 'Download failed']. - stream reset. - bar value: 'Updating Composition Mappings'. - self parseCompositionMappingFrom: stream. - ].! Item was added: + ----- Method: Unicode class>>parseCaseFoldingFrom: (in category 'casing') ----- + parseCaseFoldingFrom: caseFoldingData + "Parse the Unicode casing mappings from the given string." + + | newToCasefold | + newToCasefold := PluggableDictionary integerDictionary. + + "Filter the mappings (Simple and Common) to newToCasefold." + caseFoldingData linesDo: [ :line | + | lineWithoutComment fields sourceCode destinationCode | + lineWithoutComment := line copyUpTo: $#. + fields := lineWithoutComment findTokens: '; '. + (fields size > 2 and: [ #('C' 'S') includes: (fields at: 2) ]) ifTrue: [ + sourceCode := Integer readFrom: (fields at: 1) base: 16. + destinationCode := Integer readFrom: (fields at: 3) base: 16. + newToCasefold at: sourceCode put: destinationCode ] ]. + + "Compact and save." + ToCasefold := newToCasefold compact + ! Item was removed: - ----- Method: Unicode class>>parseCaseMappingFrom: (in category 'casing') ----- - parseCaseMappingFrom: stream - "Parse the Unicode casing mappings from the given stream. - Handle only the simple mappings" - " - Unicode initializeCaseMappings. - " - - ToCasefold := IdentityDictionary new: 2048. - ToUpper := IdentityDictionary new: 2048. - ToLower := IdentityDictionary new: 2048. - - [stream atEnd] whileFalse:[ - | fields line srcCode dstCode | - line := stream nextLine copyUpTo: $#. - fields := line withBlanksTrimmed findTokens: $;. - (fields size > 2 and: [#('C' 'S') includes: (fields at: 2) withBlanksTrimmed]) ifTrue:[ - srcCode := Integer readFrom: (fields at: 1) withBlanksTrimmed base: 16. - dstCode := Integer readFrom: (fields at: 3) withBlanksTrimmed base: 16. - ToCasefold at: srcCode put: dstCode. - ]. - ]. - - ToCasefold keysAndValuesDo: - [:k :v | - (self isUppercaseCode: k) - ifTrue: - ["In most cases, uppercase letter are folded to lower case" - ToUpper at: v put: k. - ToLower at: k put: v]. - (self isLowercaseCode: k) - ifTrue: - ["In a few cases, two upper case letters are folded to the same lower case. - We must find an upper case letter folded to the same letter" - | up | - up := ToCasefold keys detect: [:e | (self isUppercaseCode: e) and: [(ToCasefold at: e) = v]] ifNone: [nil]. - up ifNotNil: [ToUpper at: k put: up]]].! Item was changed: ----- Method: Unicode class>>parseCompositionMappingFrom: (in category 'composing') ----- + parseCompositionMappingFrom: unicodeData - parseCompositionMappingFrom: stream "Parse the Unicode composition mappings from the given stream" " Unicode initializeCompositionMappings. " + | newCompositions newDecompositions newToUpper newToLower toNumber | - | toNumber fields codePoint decomposed baseChar compChar line | toNumber := [:quad | quad inject: 0 into:[:sum :ch| sum * 16 + ch digitValue]]. + newCompositions := PluggableDictionary integerDictionary. + newDecompositions := PluggableDictionary integerDictionary. + newToUpper := PluggableDictionary integerDictionary. + newToLower := PluggableDictionary integerDictionary. - Compositions := IdentityDictionary new: 2048. - Decompositions := IdentityDictionary new: 2048. + unicodeData linesDo: [ :line | + | fields | + (fields := line splitBy: ';') size > 13 ifTrue: [ + | codePoint lowercaseCodePoint uppercaseCodePoint decomposed baseChar compChar | - [stream atEnd] whileFalse:[ - line := (stream nextLine copyUpTo: $#) withBlanksTrimmed readStream. - fields := Array streamContents:[:s|[line atEnd] whileFalse:[s nextPut: (line upTo: $;)]]. - fields size > 6 ifTrue:[ codePoint := toNumber value: (fields at: 1). + uppercaseCodePoint := (fields at: 13) ifEmpty: [ codePoint ] ifNotEmpty: toNumber. + codePoint = uppercaseCodePoint ifFalse: [ newToUpper at: codePoint put: uppercaseCodePoint ]. + lowercaseCodePoint := (fields at: 14) ifEmpty: [ codePoint ] ifNotEmpty: toNumber. + codePoint = lowercaseCodePoint ifFalse: [ newToLower at: codePoint put: lowercaseCodePoint ]. decomposed := (fields at: 6) findTokens: ' '. (decomposed size = 2 and:[decomposed first first ~= $<]) ifTrue:[ + decomposed replace: toNumber. - decomposed := decomposed collect: toNumber. baseChar := decomposed first. "base character" compChar := decomposed second. "composition character" + newDecompositions at: codePoint put: { baseChar. compChar }. + (newCompositions at: baseChar ifAbsentPut: [ PluggableDictionary integerDictionary ]) + at: compChar put: codePoint ] ] ]. + + "Compact the new dictionaries." + newCompositions compact. + newCompositions valuesDo: [ :each | each compact ]. + newDecompositions compact. + newToUpper compact. + newToLower compact. + "Save atomically." + Compositions := newCompositions. + Decompositions := newDecompositions. + ToUpper := newToUpper. + ToLower := newToLower. - Decompositions at: codePoint put: (Array with: baseChar with: compChar). - (Compositions at: baseChar ifAbsentPut:[IdentityDictionary new]) - at: compChar put: codePoint. - ]. - ]. - ]. ! Item was added: + ----- Method: Unicode class>>unicodeData (in category 'composing') ----- + unicodeData + + UIManager default informUserDuring: [ :bar | + | stream | + bar value: 'Downloading Unicode data'. + stream := HTTPClient httpGet: 'http://www.unicode.org/Public/UNIDATA/UnicodeData.txt'. + (stream isKindOf: RWBinaryOrTextStream) ifFalse: [ + ^self error: 'Download failed' ]. + ^stream reset; contents ]! Item was changed: + (PackageInfo named: 'Multilingual') postscript: 'Unicode + initializeCaseFolding; + initializeCompositionMappings'! - (PackageInfo named: 'Multilingual') postscript: '"Remove CrLfFileStream from the startupList" - (Smalltalk classNamed: ''CrLfFileStream'') ifNotNil: [ :class | - Smalltalk removeFromStartUpList: class ]. - "Ensure toLower et al work on WideStrings" - Unicode - initialize; - initializeCaseMappings. - '!

1 0

Re: The Trunk: Collections-mt.626.mcz
by Marcel Taeumel 01 May '15

01 May '15

We should think about moving TranscriptStream out of the Collections package because of its dependencies. Best, Marcel -- View this message in context: http://forum.world.st/The-Trunk-Collections-mt-626-mcz-tp4823611p4823612.ht… Sent from the Squeak - Dev mailing list archive at Nabble.com.

1 0

The Trunk: Tools-mt.615.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

Marcel Taeumel uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-mt.615.mcz ==================== Summary ==================== Name: Tools-mt.615 Author: mt Time: 1 May 2015, 7:19:00.098 pm UUID: d3a1a446-028b-e24f-8c15-084451b30c40 Ancestors: Tools-mt.614 Use code panes in inspector and object explorer (was text panes). =============== Diff against Tools-mt.614 =============== Item was changed: ----- Method: Inspector>>buildCodePaneWith: (in category 'toolbuilder') ----- buildCodePaneWith: builder | textSpec | + textSpec := builder pluggableCodePaneSpec new. - textSpec := builder pluggableTextSpec new. textSpec model: self; getText: #expression; editText: #expression:; help: #helpText; selection: #contentsSelection; menu: #codePaneMenu:shifted:; askBeforeDiscardingEdits: false. ^textSpec! Item was changed: ----- Method: ObjectExplorer>>buildWith: (in category 'toolbuilder') ----- buildWith: builder | windowSpec treeSpec textSpec buttonSpec buttonOffset | windowSpec := builder pluggableWindowSpec new. windowSpec model: self; children: OrderedCollection new; label: #label; extent: self initialExtent. treeSpec := builder pluggableTreeSpec new. treeSpec model: self; nodeClass: self class nodeClass; roots: #getList; keyPress: #explorerKey:from:event:; getSelected: #currentSelection; setSelected: #currentSelection:; setSelectedParent: #currentParent:; menu: #genericMenu:; autoDeselect: false; columns: (ObjectExplorerWrapper showContentsInColumns ifTrue: [{ [:listMorph | (listMorph filteredItems collect: [:item | item preferredWidthOfColumn: 1]) max]. nil "take all the space"}]); frame: (0@0 corner: 1(a)0.71). windowSpec children add: treeSpec. buttonOffset := (Preferences standardButtonFont widthOfString: 'inspect') * 3/2. + textSpec := builder pluggableCodePaneSpec new. - textSpec := builder pluggableTextSpec new. textSpec model: self; getText: #expression; editText: #expression:; menu: #codePaneMenu:shifted:; help: 'Evaluate expressions for the current tree selection...' translated; frame: (LayoutFrame fractions: (0(a)0.71 corner: 1@1) offsets: (0@0 corner: buttonOffset negated@0)). windowSpec children add: textSpec. buttonSpec := builder pluggableButtonSpec new model: self; label: 'inspect'; action: #inspectObject; help: 'Switch to an inspector tool'; frame: (LayoutFrame fractions: (1(a)0.71 corner: 1@1) offsets: (buttonOffset negated@0 corner: 0 @ 0)). windowSpec children add: buttonSpec. [^ builder build: windowSpec] ensure: [self changed: #expandRootsRequested]!

1 0

The Trunk: SMLoader-mt.82.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

Marcel Taeumel uploaded a new version of SMLoader to project The Trunk: http://source.squeak.org/trunk/SMLoader-mt.82.mcz ==================== Summary ==================== Name: SMLoader-mt.82 Author: mt Time: 1 May 2015, 7:15:59.365 pm UUID: 5a87a1e6-6cac-1649-874e-a92ad8bcdd1a Ancestors: SMLoader-cmm.81 Fixed layout problems and selection bugs in SqueakMap tools. =============== Diff against SMLoader-cmm.81 =============== Item was changed: + ----- Method: SMLoaderCategoricalPlus>>buildFancyWith: (in category 'DEPRECATED') ----- - ----- Method: SMLoaderCategoricalPlus>>buildFancyWith: (in category 'interface') ----- buildFancyWith: aBuilder "Creates a variant of the window where the package pane is split between installed and uninstalled packages." | buttonBarHeight searchHeight vertDivide horizDivide | buttonBarHeight := 0.07. searchHeight := 0.07. vertDivide := 0.5. horizDivide := 0.6. builder := aBuilder. window := builder build: (builder pluggableWindowSpec new model: self; label: #label; children: (OrderedCollection new add: ((self buildButtonBarWith: builder) frame: (0 @ 0 corner: 1 @ buttonBarHeight); yourself); add: ((self buildCategoriesListWith: builder) frame: (0 @ buttonBarHeight corner: vertDivide @ horizDivide); yourself); add: ((self buildSearchPaneWith: builder) frame: (vertDivide @ buttonBarHeight corner: 1 @ (buttonBarHeight + searchHeight)); yourself); add: ((self buildNotInstalledPackagesListWith: builder) frame: (vertDivide @ (buttonBarHeight + searchHeight) corner: 1 @ (horizDivide / 2)); yourself); add: ((self buildInstalledPackagesListWith: builder) frame: (vertDivide @ (horizDivide / 2) corner: 1 @ horizDivide); yourself); add: ((self buildPackagePaneWith: builder) frame: (0 @ horizDivide corner: 1 @ 1); yourself); yourself)). window on: #mouseEnter send: #paneTransition: to: window. window on: #mouseLeave send: #paneTransition: to: window. self setUpdatablePanesFrom: #(#installedPackageList #notInstalledPackageList ). currentPackageList := #notInstalled. window extent: self initialExtent. ^ window! Item was changed: + ----- Method: SMLoaderCategoricalPlus>>buildInstalledPackagesListWith: (in category 'DEPRECATED') ----- - ----- Method: SMLoaderCategoricalPlus>>buildInstalledPackagesListWith: (in category 'interface') ----- buildInstalledPackagesListWith: aBuilder ^ aBuilder pluggableTreeSpec new model: self; roots: #installedPackageList; getSelectedPath: #selectedItemPath; + getSelected: #selectedItem; setSelected: #selectedItem:; menu: #packagesMenu:; label: #itemLabel:; getChildren: #itemChildren:; hasChildren: #itemHasChildren:; autoDeselect: true; wantsDrop: true; yourself! Item was changed: + ----- Method: SMLoaderCategoricalPlus>>buildNotInstalledPackagesListWith: (in category 'DEPRECATED') ----- - ----- Method: SMLoaderCategoricalPlus>>buildNotInstalledPackagesListWith: (in category 'interface') ----- buildNotInstalledPackagesListWith: aBuilder ^ aBuilder pluggableTreeSpec new model: self; roots: #notInstalledPackageList; getSelectedPath: #selectedItemPath; + getSelected: #selectedItem; setSelected: #selectedItem:; menu: #packagesMenu:; label: #itemLabel:; getChildren: #itemChildren:; hasChildren: #itemHasChildren:; autoDeselect: true; wantsDrop: true; yourself! Item was changed: ----- Method: SMLoaderCategoricalPlus>>buildWith: (in category 'interface') ----- buildWith: aBuilder | buttonBarHeight searchHeight vertDivide horizDivide | + buttonBarHeight := Preferences standardButtonFont height * 2. + searchHeight := Preferences standardDefaultTextFont height * 2. - buttonBarHeight := 0.07. - searchHeight := 0.07. vertDivide := 0.5. horizDivide := 0.6. builder := aBuilder. window := builder build: (builder pluggableWindowSpec new model: self; label: #label; + children: (OrderedCollection new + add: ((self buildButtonBarWith: builder) + frame: (LayoutFrame + fractions: (0 @ 0 corner: 1 @ 0) + offsets: (0@0 corner: 0@buttonBarHeight))); + add: ((self buildCategoriesListWith: builder) + frame: (LayoutFrame + fractions: (0 @ 0 corner: vertDivide @ horizDivide) + offsets: (0@ buttonBarHeight corner: 0@0))); + add: ((self buildSearchPaneWith: builder) + frame: (LayoutFrame + fractions: (vertDivide @ 0 corner: 1 @ 0) + offsets: (0@ buttonBarHeight corner: 0@ (buttonBarHeight + searchHeight)))); + add: ((self buildPackagesListWith: builder) + frame: (LayoutFrame + fractions: (vertDivide @ 0 corner: 1 @ horizDivide) + offsets: (0 @ (buttonBarHeight + searchHeight) corner: 0@0))); + add: ((self buildPackagePaneWith: builder) + frame: (0 @ horizDivide corner: 1 @ 1)); + yourself); + yourself). - children: (OrderedCollection new add: - ((self buildButtonBarWith: builder) - frame: (0 @ 0 corner: 1 @ buttonBarHeight); yourself); - add: ((self buildCategoriesListWith: builder) - frame: (0 @ buttonBarHeight corner: vertDivide @ horizDivide); yourself); - add: ((self buildSearchPaneWith: builder) - frame: (vertDivide @ buttonBarHeight corner: 1 @ (buttonBarHeight + searchHeight))); - add: ((self buildPackagesListWith: builder) - frame: (vertDivide @ (buttonBarHeight + searchHeight) corner: 1 @ horizDivide)); - add: ((self buildPackagePaneWith: builder) - frame: (0 @ horizDivide corner: 1 @ 1)); yourself)). window on: #mouseEnter send: #paneTransition: to: window. window on: #mouseLeave send: #paneTransition: to: window. window extent: self initialExtent. ^ window! Item was changed: ----- Method: SMLoaderPlus>>buildCategoriesListWith: (in category 'interface') ----- buildCategoriesListWith: aBuilder "Create the hierarchical list holding the category tree." ^ aBuilder pluggableTreeSpec new model: self; roots: #categoryList; getSelectedPath: #selectedCategoryPath; getChildren: #categoryChildren:; hasChildren: #categoryHasChildren:; setSelected: #selectedCategory:; + getSelected: #selectedCategory; menu: #categoriesMenu:; label: #categoryLabel:; autoDeselect: true; wantsDrop: true; name: #categoriesList; yourself! Item was changed: ----- Method: SMLoaderPlus>>buildPackagePaneWith: (in category 'interface') ----- buildPackagePaneWith: aBuilder "Create the text area to the right in the loader." + ^ aBuilder pluggableTextSpec new + model: self; + getText: #itemDescription; + name: #packagePane; + help: 'Select a package to view its description.'; + yourself! - ^ aBuilder pluggableTextSpec new model: self; getText: #itemDescription; name: #packagePane; yourself! Item was changed: ----- Method: SMLoaderPlus>>buildPackagesListWith: (in category 'interface') ----- buildPackagesListWith: aBuilder "Create the hierarchical list holding the packages and releases." ^ aBuilder pluggableTreeSpec new model: self; roots: #packageList; getSelectedPath: #selectedItemPath; + getSelected: #selectedItem; setSelected: #selectedItem:; menu: #packagesMenu:; label: #itemLabel:; getChildren: #itemChildren:; hasChildren: #itemHasChildren:; autoDeselect: true; wantsDrop: true; name: #packagesList; yourself! Item was changed: ----- Method: SMLoaderPlus>>buildSearchPaneWith: (in category 'interface') ----- buildSearchPaneWith: aBuilder ^ aBuilder pluggableInputFieldSpec new model: self; selection: #searchSelection; + setText: #findPackage:notifying:; + help: 'Search packages...'; + name: #search; + yourself! - getText: #searchText; setText: #findPackage:notifying:; name: #search; yourself! Item was changed: ----- Method: SMLoaderPlus>>buildWith: (in category 'interface') ----- buildWith: aBuilder "Create the package loader window." + | buttonBarHeight searchPaneHeight vertDivide horizDivide | + buttonBarHeight := Preferences standardButtonFont height * 2. + searchPaneHeight := Preferences standardDefaultTextFont height * 2. - | buttonBarHeight vertDivide horizDivide | - buttonBarHeight := 0.07. vertDivide := 0.6. horizDivide := 0.3. builder := aBuilder. window := builder build: (builder pluggableWindowSpec new model: self; label: #label; children: (OrderedCollection new add: ((self buildButtonBarWith: builder) + frame: (LayoutFrame + fractions: (0 @ 0 corner: 1 @ 0) + offsets: (0@0 corner: 0@buttonBarHeight))); - frame: (0 @ 0 corner: 1 @ buttonBarHeight)); add: ((self buildSearchPaneWith: builder) + frame: (LayoutFrame + fractions: (0 @ 0 corner: horizDivide @ 0) + offsets: (0@ buttonBarHeight corner: 0@ (buttonBarHeight + searchPaneHeight)))); - frame: (0 @ buttonBarHeight corner: horizDivide @ (buttonBarHeight * 2))); add: ((self buildPackagesListWith: builder) + frame: (LayoutFrame + fractions: (0 @ 0 corner: horizDivide @ vertDivide) + offsets: (0 @ (buttonBarHeight + searchPaneHeight) corner: 0@0))); - frame: (0 @ (buttonBarHeight * 2) corner: horizDivide @ vertDivide)); add: ((self buildCategoriesListWith: builder) frame: (0 @ vertDivide corner: horizDivide @ 1)); add: ((self buildPackagePaneWith: builder) + frame: (LayoutFrame + fractions: (horizDivide @ 0 corner: 1 @ 1) + offsets: (0 @ buttonBarHeight corner: 0@0))); - frame: (horizDivide @ buttonBarHeight corner: 1 @ 1)); yourself); yourself). window on: #mouseEnter send: #paneTransition: to: window. window on: #mouseLeave send: #paneTransition: to: window. window extent: self initialExtent. ^ window! Item was changed: ----- Method: SMLoaderPlus>>itemDescription (in category 'private') ----- itemDescription ^ self selectedPackageOrRelease + ifNotNil: [:item | item fullDescription]! - ifNil: ['<No package selected>'] - ifNotNilDo: [:item | item fullDescription]! Item was changed: ----- Method: SMLoaderPlus>>searchText (in category 'interface') ----- searchText "A dummy default search text so that the field describes its purpose." + ^ ''! - ^ 'Search packages'! Item was changed: ----- Method: SMLoaderPlus>>selectedCategory: (in category 'accessing') ----- selectedCategory: anSMCategory "Change the selected category." selectedCategory := anSMCategory. selectedCategory ifNotNil: [ (selectedCategory objects includes: self selectedItem) ifFalse: [ self selectedItem: nil ] ]. self + changed: #selectedCategory; - changed: #selectedCategoryPath ; changed: #packageList! Item was changed: ----- Method: SMLoaderPlus>>selectedItem: (in category 'accessing') ----- selectedItem: anItem "This == workaround protects us from recursion since ToolBuilder's tree widgets will always tell us that the selection has been updated when we tell it that the selection path has been updated. Cleaner solutions invited." anItem == selectedItem ifFalse: [ selectedItem := anItem. + self changed: #selectedItem. - self changed: #selectedItemPath. self changed: #itemDescription. self changed: #hasSelectedItem]!

1 0

The Trunk: Tools-mt.614.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

Marcel Taeumel uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-mt.614.mcz ==================== Summary ==================== Name: Tools-mt.614 Author: mt Time: 1 May 2015, 6:02:03.582 pm UUID: d14a1b9e-198e-e549-931c-440d9c40d12c Ancestors: Tools-mt.613 Some descriptive balloon texts added to browser's switch buttons. =============== Diff against Tools-mt.613 =============== Item was changed: ----- Method: Browser>>buildSwitchesWith: (in category 'toolbuilder') ----- buildSwitchesWith: builder "Build the instance/comment/class switch" | panelSpec buttonSpec | panelSpec := builder pluggablePanelSpec new layout: #horizontal; children: OrderedCollection new; yourself. buttonSpec := builder pluggableButtonSpec new. buttonSpec model: self; + label: 'instance'; + help: 'Show instance-side methods' translated; - label: 'instance'; state: #instanceMessagesIndicated; action: #indicateInstanceMessages. panelSpec children addLast: buttonSpec. buttonSpec := builder pluggableButtonSpec new. buttonSpec model: self; label: '?'; help: 'Cycle between definition, comment, and hierarchy view' translated; state: #classCommentIndicated; action: #plusButtonHit. panelSpec children addLast: buttonSpec. buttonSpec := builder pluggableButtonSpec new. buttonSpec model: self; + label: 'class'; + help: 'Show class-side methods' translated; - label: 'class'; state: #classMessagesIndicated; action: #indicateClassMessages. panelSpec children addLast: buttonSpec. ^panelSpec!

1 0

The Trunk: Morphic-mt.955.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.955.mcz ==================== Summary ==================== Name: Morphic-mt.955 Author: mt Time: 1 May 2015, 5:59:25.636 pm UUID: 50c62168-fb76-e34e-955b-dc488b84049b Ancestors: Morphic-mt.954 Flag about a performance issue in scroll bars added. We should improve that at some point. =============== Diff against Morphic-mt.954 =============== Item was changed: ----- Method: ScrollBar>>sliderColor: (in category 'access') ----- sliderColor: aColor "Change the color of the scrollbar to go with aColor." | buttonColor | super sliderColor: aColor. self updateSliderColor: aColor. buttonColor := self thumbColor. self menuButton color: aColor. upButton color: aColor. downButton color: aColor. self class updateScrollBarButtonsAspect: {self menuButton. upButton. downButton} color: aColor. + self flag: #performance. "mt: This is slow..." self updateMenuButtonImage. self updateUpButtonImage. self updateDownButtonImage.!

1 0

The Trunk: Collections-mt.625.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

Marcel Taeumel uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-mt.625.mcz ==================== Summary ==================== Name: Collections-mt.625 Author: mt Time: 1 May 2015, 5:56:35.941 pm UUID: 0edce141-a23a-a845-a735-743f311112b2 Ancestors: Collections-tfel.624 Speed-up #endsWith: for strings. =============== Diff against Collections-tfel.624 =============== Item was changed: ----- Method: String>>endsWith: (in category 'testing') ----- + endsWith: sequence + "Answer true if the receiver ends with the argument collection. The comparison is case-sensitive." - endsWith: suffix - "Answer true if the receiver ends with the argument collection. The comparison is case-sensitive. Overridden for better performance." + | sequenceSize offset | + sequence isString ifFalse: [ ^ super endsWith: sequence ]. + ((sequenceSize := sequence size) = 0 or: [ (offset := self size - sequence size) < 0 ]) ifTrue: [ ^false ]. + 1 to: sequenceSize do: [ :index | + (sequence basicAt: index) = (self basicAt: index + offset) ifFalse: [ ^false ] ]. + ^true! - | offset | - (offset := self size - suffix size) < 0 ifTrue: [ ^false ]. - ^(self findString: suffix startingAt: offset + 1) ~= 0!

1 0

Jump to page: