Squeak-dev May 2019

squeak-dev@lists.squeakfoundation.org

36 participants
153 discussions

The Inbox: EToys-cmm.342.mcz
by commits＠source.squeak.org 08 May '19

08 May '19

Chris Muller uploaded a new version of EToys to project The Inbox: http://source.squeak.org/inbox/EToys-cmm.342.mcz ==================== Summary ==================== Name: EToys-cmm.342 Author: cmm Time: 7 May 2019, 6:34:48.519808 pm UUID: da78bdd2-19c3-446e-aec2-be2dab3a21eb Ancestors: EToys-kfr.341 Ask whether a Parameter and Phrase tiles whether they're #isBooleanType, to allow proper distinction of the actual instances of Boolean. =============== Diff against EToys-kfr.341 =============== Item was changed: ----- Method: CategoryViewer>>booleanPhraseFromPhrase: (in category 'support') ----- booleanPhraseFromPhrase: phrase "Answer, if possible, a boolean-valued phrase derived from the phrase provided" | retrieverOp retrieverTile | (phrase isKindOf: ParameterTile orOf: FunctionTile) ifTrue: [^ phrase booleanComparatorPhrase]. + phrase isBooleanType ifTrue: [^ phrase]. - phrase isBoolean ifTrue: [^ phrase]. ((scriptedPlayer respondsTo: #costume) and:[scriptedPlayer costume isInWorld not]) ifTrue: [^ Array new]. ((phrase isMemberOf: PhraseTileMorph) and: [phrase submorphs size > 1] and: [#(bearingTo: distanceToPlayer:) includes: phrase submorphs second operatorOrExpression]) ifTrue: [^ self booleanPhraseFromNumericGetterWithArgument: phrase]. ((retrieverTile := phrase submorphs last) isKindOf: TileMorph) ifFalse: [^ phrase]. retrieverOp := retrieverTile operatorOrExpression. (Vocabulary vocabularyForType: phrase resultType) affordsCoercionToBoolean ifTrue: [ retrieverOp = #getPatchValueIn: ifTrue: [ ^ self booleanPhraseForGetPatchValueOfType: phrase resultType retrieverOp: retrieverOp player: phrase actualObject. ]. retrieverOp = #getRedComponentIn: ifTrue: [ ^ self booleanPhraseForGetColorComponentOfType: phrase resultType componentName: #red retrieverOp: retrieverOp player: phrase actualObject. ]. retrieverOp = #getGreenComponentIn: ifTrue: [ ^ self booleanPhraseForGetColorComponentOfType: phrase resultType componentName: #green retrieverOp: retrieverOp player: phrase actualObject. ]. retrieverOp = #getBlueComponentIn: ifTrue: [ ^ self booleanPhraseForGetColorComponentOfType: phrase resultType componentName: #blue retrieverOp: retrieverOp player: phrase actualObject. ]. retrieverOp = #getUphillIn: ifTrue: [ ^ self booleanPhraseForGetUpHillOfType: phrase resultType retrieverOp: retrieverOp player: phrase actualObject. ]. retrieverOp = #getDistanceTo: ifTrue: [ ^ self booleanPhraseForGetDistanceToOfType: phrase resultType retrieverOp: retrieverOp player: phrase actualObject. ]. retrieverOp = #getAngleTo: ifTrue: [ ^ self booleanPhraseForGetAngleToOfType: phrase resultType retrieverOp: retrieverOp player: phrase actualObject. ]. retrieverOp = #bounceOn: ifTrue: [ ^ self booleanPhraseForBounceOnOfType: phrase resultType retrieverOp: retrieverOp player: phrase actualObject. ]. " (retrieverOp = #bounceOn:color: or: [retrieverOp = #bounceOnColor:]) ifTrue: [ ^ self booleanPhraseForBounceOnColorOfType: phrase resultType retrieverOp: retrieverOp player: phrase actualObject. ]." "retrieverOp = #getTurtleAt: ifTrue: [ ^ self booleanPhraseForGetTurtleAtOfType: phrase resultType retrieverOp: retrieverOp player: phrase actualObject. ]." retrieverOp = #getTurtleOf: ifTrue: [ ^ self booleanPhraseForGetTurtleOfOfType: phrase resultType retrieverOp: retrieverOp player: phrase actualObject. ]. ^ self booleanPhraseForRetrieverOfType: phrase resultType retrieverOp: retrieverOp player: phrase actualObject. ]. ^ phrase! Item was removed: - ----- Method: ParameterTile>>isBoolean (in category 'access') ----- - isBoolean - "Answer whether the receiver's type is inherently boolean" - - ^ self scriptEditor typeForParameter == #Boolean! Item was added: + ----- Method: ParameterTile>>isBooleanType (in category 'access') ----- + isBooleanType + "Answer whether the receiver's type is inherently boolean" + + ^ self scriptEditor typeForParameter == #Boolean! Item was removed: - ----- Method: PhraseTileMorph>>isBoolean (in category 'queries') ----- - isBoolean - "Answer whether the receiver has a boolean type" - - ^ self resultType = #Boolean! Item was added: + ----- Method: PhraseTileMorph>>isBooleanType (in category 'queries') ----- + isBooleanType + "Answer whether the receiver has a boolean type" + + ^ self resultType = #Boolean! Item was changed: ----- Method: PhraseTileMorph>>rowOfRightTypeFor:forActor: (in category 'all') ----- rowOfRightTypeFor: aLayoutMorph forActor: aPlayer "Answer a phrase of the right type for the putative container" | aTemporaryViewer aPhrase | aLayoutMorph demandsBoolean ifTrue: + [self isBooleanType ifTrue: [^ self]. - [self isBoolean ifTrue: [^ self]. aTemporaryViewer := CategoryViewer new invisiblySetPlayer: aPlayer. aPhrase := aTemporaryViewer booleanPhraseFromPhrase: self. aPhrase justGrabbedFromViewer: false. ^ aPhrase]. ^ self! Item was removed: - ----- Method: SystemQueryPhrase>>isBoolean (in category 'access') ----- - isBoolean - ^ true! Item was added: + ----- Method: SystemQueryPhrase>>isBooleanType (in category 'access') ----- + isBooleanType + ^ true!

1 0

The Trunk: Protocols-pre.62.mcz
by commits＠source.squeak.org 07 May '19

07 May '19

Patrick Rein uploaded a new version of Protocols to project The Trunk: http://source.squeak.org/trunk/Protocols-pre.62.mcz ==================== Summary ==================== Name: Protocols-pre.62 Author: pre Time: 7 May 2019, 12:09:35.44983 pm UUID: db63a735-b9ea-6442-9048-022830af513e Ancestors: Protocols-cmm.61 Replaces calls to the deprecated #upTo: with #copyUpTo: in the lexicon browser =============== Diff against Protocols-cmm.61 =============== Item was changed: ----- Method: Lexicon>>displaySelector: (in category 'basic operation') ----- displaySelector: aSelector "Set aSelector to be the one whose source shows in the browser. If there is a category list, make it highlight a suitable category" | detectedItem messageIndex | self chooseCategory: (self categoryDefiningSelector: aSelector). detectedItem := messageList detect: + [:anItem | (anItem asString copyUpTo: Character space) asSymbol == aSelector] ifNone: [^ Beeper beep]. - [:anItem | (anItem asString upTo: $ ) asSymbol == aSelector] ifNone: [^ Beeper beep]. messageIndex := messageList indexOf: detectedItem. self messageListIndex: messageIndex! Item was changed: ----- Method: Lexicon>>selectSelectorItsNaturalCategory: (in category 'selection') ----- selectSelectorItsNaturalCategory: aSelector "Make aSelector be the current selection of the receiver, with the category being its home category." | cat catIndex detectedItem | cat := self categoryOfSelector: aSelector. catIndex := categoryList indexOf: cat ifAbsent: ["The method's own category is not seen in this browser; the method probably occurs in some other category not known directly to the class, but for now, we'll just use the all category" 1]. self categoryListIndex: catIndex. detectedItem := messageList detect: + [:anItem | (anItem asString copyUpTo: Character space) asSymbol == aSelector] ifNone: [^ self]. - [:anItem | (anItem asString upTo: $ ) asSymbol == aSelector] ifNone: [^ self]. self messageListIndex: (messageList indexOf: detectedItem ifAbsent: [^ self])! Item was changed: ----- Method: Lexicon>>selectWithinCurrentCategory: (in category 'selection') ----- selectWithinCurrentCategory: aSelector "If aSelector is one of the selectors seen in the current category, select it" | detectedItem | detectedItem := self messageList detect: + [:anItem | (anItem asString copyUpTo: Character space) asSymbol == aSelector] ifNone: [^ self]. - [:anItem | (anItem asString upTo: $ ) asSymbol == aSelector] ifNone: [^ self]. self messageListIndex: (messageList indexOf: detectedItem ifAbsent: [^ self])! Item was changed: ----- Method: Lexicon>>selectorsSendingSelectedSelector (in category 'senders') ----- selectorsSendingSelectedSelector "Assumes lastSendersSearchSelector is already set" | selectorSet | + autoSelectString := (self lastSendersSearchSelector copyUpTo: $:) asString. - autoSelectString := (self lastSendersSearchSelector upTo: $:) asString. selectorSet := Set new. (self systemNavigation allCallsOn: self lastSendersSearchSelector) do: [:anItem | | sel cl | sel := anItem methodSymbol. cl := anItem actualClass. ((currentVocabulary includesSelector: sel forInstance: self targetObject ofClass: targetClass limitClass: limitClass) and: [targetClass includesBehavior: cl]) ifTrue: [selectorSet add: sel]]. ^ selectorSet sorted! Item was changed: ----- Method: Lexicon>>setToShowSelector:selectCategory: (in category 'selection') ----- setToShowSelector: selectorString selectCategory: aBoolean "Set up the receiver so that it will show the given selector" | catName catIndex messageIndex aList | catName := aBoolean ifTrue: [ (aList := currentVocabulary categoriesContaining: selectorString forClass: targetClass) at: 1 ifAbsent: [ self class allCategoryName ] ] ifFalse: [ self class allCategoryName ]. catIndex := categoryList indexOf: catName ifAbsent: [ 1 ]. self categoryListIndex: catIndex. messageList detect: + [ : anItem | (anItem copyUpTo: Character space) asString asSymbol == selectorString ] - [ : anItem | (anItem upTo: Character space) asString asSymbol == selectorString ] ifFound: [ : detectedItem | messageIndex := messageList indexOf: detectedItem. self messageListIndex: messageIndex ] ifNone: [ ^ self ]!

2 1

The Trunk: Tools-nice.847.mcz
by commits＠source.squeak.org 07 May '19

07 May '19

Nicolas Cellier uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-nice.847.mcz ==================== Summary ==================== Name: Tools-nice.847 Author: nice Time: 7 May 2019, 9:38:06.649253 am UUID: 58b94b2d-3cc1-42fc-ace2-c702f38295c8 Ancestors: Tools-dtl.846 Don't propose addLast:times: in MethodFinder, it's been deprecated =============== Diff against Tools-dtl.846 =============== Item was changed: ----- Method: MethodFinder>>initialize2 (in category 'initialize') ----- (excessive size, no diff calculated)

1 0

The Trunk: Collections-nice.831.mcz
by commits＠source.squeak.org 07 May '19

07 May '19

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.831.mcz ==================== Summary ==================== Name: Collections-nice.831 Author: nice Time: 7 May 2019, 9:33:06.030048 am UUID: f1eda889-8e88-4e90-aca1-96620127ab63 Ancestors: Collections-nice.830 Fix two occurrences of addLast:times: that crept in since I proposed the deprecation. =============== Diff against Collections-nice.830 =============== Item was changed: ----- Method: HtmlReadWriter>>processRunStackTop (in category 'reading') ----- processRunStackTop "Write accumulated attributes to run array." | currentIndex start attrs | currentIndex := count - offset. start := runStack top second. attrs := runStack top first. runArray + add: attrs asArray + withOccurrences: currentIndex - start + 1.! - addLast: attrs asArray - times: currentIndex - start + 1.! Item was changed: ----- Method: Text>>setString:setRunsChecking: (in category 'private') ----- setString: aString setRunsChecking: aRunArray | stringSize runsSize | string := aString. aRunArray ifNil: [^ aString asText]. "Check runs and do the best you can to make them fit..." aRunArray runs size = aRunArray values size ifFalse: [^ aString asText]. "raise error here?" runsSize := aRunArray size. stringSize := string size. runs := stringSize = runsSize ifTrue: [aRunArray] ifFalse: [ stringSize > runsSize + ifTrue: [aRunArray add: {} withOccurrences: stringSize - runsSize] - ifTrue: [aRunArray addLast: {} times: stringSize - runsSize] ifFalse: [aRunArray copyFrom: 1 to: stringSize]].!

1 0

The Trunk: CollectionsTests-nice.308.mcz
by commits＠source.squeak.org 07 May '19

07 May '19

Nicolas Cellier uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-nice.308.mcz ==================== Summary ==================== Name: CollectionsTests-nice.308 Author: nice Time: 7 May 2019, 9:28:47.605099 am UUID: 682eef1e-7191-404d-b11a-4078704d76f3 Ancestors: CollectionsTests-pre.307, CollectionsTests-nice.195 Merge CollectionsTests-pre.307, CollectionsTests-nice.195 Let's use add:withOccurrences: now that addLast:times: is deprecated =============== Diff against CollectionsTests-pre.307 =============== Item was changed: ----- Method: TextAndTextStreamTest>>testRunArrayAdjacentMerge (in category 'tests') ----- testRunArrayAdjacentMerge "this demonstrates that adjancent runs with equal attributes are merged. " | runArray | runArray := RunArray new. runArray + add: TextEmphasis normal withOccurrences: 5; + add: TextEmphasis bold withOccurrences: 5; + add: TextEmphasis bold withOccurrences: 5. - addLast: TextEmphasis normal times: 5; - addLast: TextEmphasis bold times: 5; - addLast: TextEmphasis bold times: 5. self assert: (runArray runs size = 2). ! Item was changed: ----- Method: TextAndTextStreamTest>>testRunArrayInvariant (in category 'tests') ----- testRunArrayInvariant "this verifies that the fundamental invariant of a RunArray is always satisfied. " "see comment below" | runArray | runArray := RunArray new. runArray + add: TextEmphasis normal withOccurrences: 5; + add: TextEmphasis bold withOccurrences: 5; + add: TextEmphasis normal withOccurrences: 5. - addLast: TextEmphasis normal times: 5; - addLast: TextEmphasis bold times: 5; - addLast: TextEmphasis normal times: 5. self assert: ((1 to: runArray size) allSatisfy: [:idx | | lastIndex lastOffset lastRun lengthOfPreviousRuns | runArray at: idx. " updates the cached values " lastIndex := runArray instVarNamed: 'lastIndex'. lastRun := runArray instVarNamed: 'lastRun'. lastOffset := runArray instVarNamed: 'lastOffset'. lengthOfPreviousRuns := (1 to: lastRun - 1) inject: 0 into: [:sum :idx2 | sum + (runArray runs at: idx2)]. lastIndex = (lastOffset + lengthOfPreviousRuns + 1) ] ). " This method is a bit tricky. First, it uses Object>>instVarNamed: to access instance variables for which no accessors are defined. The same method is used by the debuggers and by various inspectors. The assertion itself explains the meaning of the cached values."! Item was changed: ----- Method: TextAndTextStreamTest>>testRunArrayReversal (in category 'tests') ----- testRunArrayReversal "this tests the reversal of a RunArray " | runArray | runArray := RunArray new. runArray + add: TextEmphasis normal withOccurrences: 5; + add: TextEmphasis bold withOccurrences: 5; + add: TextEmphasis normal withOccurrences: 5. - addLast: TextEmphasis normal times: 5; - addLast: TextEmphasis bold times: 5; - addLast: TextEmphasis normal times: 5. self assert: (runArray reversed runs size = 3). ! Item was changed: ----- Method: TextAndTextStreamTest>>testRunArrayRunsAreNotMerged (in category 'tests') ----- testRunArrayRunsAreNotMerged " this demonstrates that different runs are not merged " | runArray | runArray := RunArray new. runArray + add: TextEmphasis normal withOccurrences: 5; + add: TextEmphasis bold withOccurrences: 5; + add: TextEmphasis normal withOccurrences: 5. - addLast: TextEmphasis normal times: 5; - addLast: TextEmphasis bold times: 5; - addLast: TextEmphasis normal times: 5. self assert: (runArray runs size = 3). ! Item was changed: ----- Method: TextAndTextStreamTest>>testRunArrayRunsSize (in category 'tests') ----- testRunArrayRunsSize "this demonstrates that the size of a run array is the sum of the sizes of its runs. " | runArray | runArray := RunArray new. runArray + add: TextEmphasis normal withOccurrences: 5; + add: TextEmphasis bold withOccurrences: 5; + add: TextEmphasis normal withOccurrences: 5. - addLast: TextEmphasis normal times: 5; - addLast: TextEmphasis bold times: 5; - addLast: TextEmphasis normal times: 5. self assert: (runArray size = 15). !

1 0

The Trunk: System-dtl.1062.mcz
by commits＠source.squeak.org 07 May '19

07 May '19

David T. Lewis uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-dtl.1062.mcz ==================== Summary ==================== Name: System-dtl.1062 Author: dtl Time: 5 May 2019, 10:54:56.642077 pm UUID: c527ef41-51fb-4e49-b00a-90a9a09a935d Ancestors: System-cmm.1061 If CodeLoader is loading a script that begins with a Unix shebang line, then skip over line one of the script. This accomodates the case of an executable Unix shell script that starts a Squeak image, then feeds itself to Squeak as a start script. For example, an executable script file might contain this: #!/usr/local/bin/squeak -- Transcript show: 'Hello, world'; cr. =============== Diff against System-cmm.1061 =============== Item was added: + ----- Method: CodeLoader>>allButShebangLine: (in category 'private') ----- + allButShebangLine: contentsString + "If tontentsString begins with '#!!' then assume that it contains a Unix + shebang line should be skipped prior to evaluating the contents." + + (contentsString beginsWith: '#!!') + ifTrue: [contentsString lineIndicesDo: [:line :end :endOfLine | + ^ contentsString allButFirst: endOfLine ]] + ifFalse: [^ contentsString] + + " CodeLoader new allButShebangLine: + '#!!/usr/llocal/bin/squeak -- + Transcript cr; show: ''Hello world!!'' + ' "! Item was changed: ----- Method: CodeLoader>>installSourceFile: (in category 'installing') ----- installSourceFile: aStream "Install the previously loaded source file" | contents trusted | aStream ifNil:[^self error:'No content to install']. trusted := SecurityManager default positionToSecureContentsOf: aStream. trusted ifFalse:[(SecurityManager default enterRestrictedMode) ifFalse:[ aStream close. ^ self error:'Insecure content encountered']]. + contents := self allButShebangLine: aStream upToEnd unzipped asString. - contents := aStream upToEnd unzipped asString. (aStream respondsTo: #close) ifTrue:[aStream close]. ^contents readStream fileIn!

4 3

The Trunk: 60Deprecated-nice.34.mcz
by commits＠source.squeak.org 07 May '19

07 May '19

Nicolas Cellier uploaded a new version of 60Deprecated to project The Trunk: http://source.squeak.org/trunk/60Deprecated-nice.34.mcz ==================== Summary ==================== Name: 60Deprecated-nice.34 Author: nice Time: 7 May 2019, 9:26:52.899828 am UUID: 882e9027-6b0f-4ef4-9ab6-02e2dff2df3b Ancestors: 60Deprecated-tpr.33 Deprecate RunArray>>addLast:times: Companion change to Collections-nice.830/Collections-nice.499 =============== Diff against 60Deprecated-tpr.33 =============== Item was added: + ----- Method: RunArray>>addLast:times: (in category '*60Deprecated') ----- + addLast: value times: times + "Add value as the last element of the receiver, the given number of times" + self deprecated: 'use add:withOccurrences:'. + ^self add: value withOccurrences: times!

1 0

The Trunk: Collections-nice.830.mcz
by commits＠source.squeak.org 07 May '19

07 May '19

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.830.mcz ==================== Summary ==================== Name: Collections-nice.830 Author: nice Time: 7 May 2019, 9:25:17.144861 am UUID: 3eccc0fe-9098-4c67-ad2b-78b02e5287e5 Ancestors: Collections-nice.829, Collections-nice.499 Merge: Collections-nice.829, Collections-nice.499 Rename RunArray unique selector #addLast:times: as #add:withOccurrences: It's a bit less expressive but it's universal. Deprecate #addLast:times: After 6 years purgatory in inbox without further complaints, now is the last time I add an occurrence of this change. =============== Diff against Collections-nice.829 =============== Item was added: + ----- Method: RunArray>>add:withOccurrences: (in category 'adding') ----- + add: value withOccurrences: times + "Add value as the last element of the receiver, the given number of times" + times = 0 ifTrue: [ ^self ]. + lastIndex := nil. "flush access cache" + (runs size=0 or: [values last ~= value]) + ifTrue: + [runs := runs copyWith: times. + values := values copyWith: value] + ifFalse: + [runs at: runs size put: runs last+times]! Item was removed: - ----- Method: RunArray>>addLast:times: (in category 'adding') ----- - addLast: value times: times - "Add value as the last element of the receiver, the given number of times" - times = 0 ifTrue: [ ^self ]. - lastIndex := nil. "flush access cache" - (runs size=0 or: [values last ~= value]) - ifTrue: - [runs := runs copyWith: times. - values := values copyWith: value] - ifFalse: - [runs at: runs size put: runs last+times]!

1 0

The Trunk: CollectionsTests-nice.195.mcz
by commits＠source.squeak.org 07 May '19

07 May '19

Nicolas Cellier uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-nice.195.mcz ==================== Summary ==================== Name: CollectionsTests-nice.195 Author: nice Time: 25 January 2013, 11:13:57.37 pm UUID: 9c525519-c8dc-49aa-a82f-74d8ae1ebef0 Ancestors: CollectionsTests-ul.194 Let tests use add:withOccurrences: once addLast:times: will be deprecated =============== Diff against CollectionsTests-ul.194 =============== Item was changed: ----- Method: TextAndTextStreamTest>>testRunArrayAdjacentMerge (in category 'tests') ----- testRunArrayAdjacentMerge "this demonstrates that adjancent runs with equal attributes are merged. " | runArray | runArray := RunArray new. runArray + add: TextEmphasis normal withOccurrences: 5; + add: TextEmphasis bold withOccurrences: 5; + add: TextEmphasis bold withOccurrences: 5. - addLast: TextEmphasis normal times: 5; - addLast: TextEmphasis bold times: 5; - addLast: TextEmphasis bold times: 5. self assert: (runArray runs size = 2). ! Item was changed: ----- Method: TextAndTextStreamTest>>testRunArrayInvariant (in category 'tests') ----- testRunArrayInvariant "this verifies that the fundamental invariant of a RunArray is always satisfied. " "see comment below" | runArray | runArray := RunArray new. runArray + add: TextEmphasis normal withOccurrences: 5; + add: TextEmphasis bold withOccurrences: 5; + add: TextEmphasis normal withOccurrences: 5. - addLast: TextEmphasis normal times: 5; - addLast: TextEmphasis bold times: 5; - addLast: TextEmphasis normal times: 5. self assert: ((1 to: runArray size) allSatisfy: [:idx | | lastIndex lastOffset lastRun lengthOfPreviousRuns | runArray at: idx. " updates the cached values " lastIndex := runArray instVarNamed: 'lastIndex'. lastRun := runArray instVarNamed: 'lastRun'. lastOffset := runArray instVarNamed: 'lastOffset'. lengthOfPreviousRuns := (1 to: lastRun - 1) inject: 0 into: [:sum :idx2 | sum + (runArray runs at: idx2)]. lastIndex = (lastOffset + lengthOfPreviousRuns + 1) ] ). " This method is a bit tricky. First, it uses Object>>instVarNamed: to access instance variables for which no accessors are defined. The same method is used by the debuggers and by various inspectors. The assertion itself explains the meaning of the cached values."! Item was changed: ----- Method: TextAndTextStreamTest>>testRunArrayReversal (in category 'tests') ----- testRunArrayReversal "this tests the reversal of a RunArray " | runArray | runArray := RunArray new. runArray + add: TextEmphasis normal withOccurrences: 5; + add: TextEmphasis bold withOccurrences: 5; + add: TextEmphasis normal withOccurrences: 5. - addLast: TextEmphasis normal times: 5; - addLast: TextEmphasis bold times: 5; - addLast: TextEmphasis normal times: 5. self assert: (runArray reversed runs size = 3). ! Item was changed: ----- Method: TextAndTextStreamTest>>testRunArrayRunsAreNotMerged (in category 'tests') ----- testRunArrayRunsAreNotMerged " this demonstrates that different runs are not merged " | runArray | runArray := RunArray new. runArray + add: TextEmphasis normal withOccurrences: 5; + add: TextEmphasis bold withOccurrences: 5; + add: TextEmphasis normal withOccurrences: 5. - addLast: TextEmphasis normal times: 5; - addLast: TextEmphasis bold times: 5; - addLast: TextEmphasis normal times: 5. self assert: (runArray runs size = 3). ! Item was changed: ----- Method: TextAndTextStreamTest>>testRunArrayRunsSize (in category 'tests') ----- testRunArrayRunsSize "this demonstrates that the size of a run array is the sum of the sizes of its runs. " | runArray | runArray := RunArray new. runArray + add: TextEmphasis normal withOccurrences: 5; + add: TextEmphasis bold withOccurrences: 5; + add: TextEmphasis normal withOccurrences: 5. - addLast: TextEmphasis normal times: 5; - addLast: TextEmphasis bold times: 5; - addLast: TextEmphasis normal times: 5. self assert: (runArray size = 15). !

1 0

The Trunk: Collections-nice.499.mcz
by commits＠source.squeak.org 07 May '19

07 May '19

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.499.mcz ==================== Summary ==================== Name: Collections-nice.499 Author: nice Time: 25 January 2013, 11:09:44.244 pm UUID: a0703731-567b-4e87-9fbc-94cfbeed1534 Ancestors: Collections-bf.498 Rename RunArray unique selector #addLast:times: as #add:withOccurrences: It's a bit less expressive but it's universal. Deprecate #addLast:times: =============== Diff against Collections-bf.498 =============== Item was added: + ----- Method: RunArray>>add:withOccurrences: (in category 'adding') ----- + add: value withOccurrences: times + "Add value as the last element of the receiver, the given number of times" + times = 0 ifTrue: [ ^self ]. + lastIndex := nil. "flush access cache" + (runs size=0 or: [values last ~= value]) + ifTrue: + [runs := runs copyWith: times. + values := values copyWith: value] + ifFalse: + [runs at: runs size put: runs last+times]! Item was changed: ----- Method: RunArray>>addLast:times: (in category 'adding') ----- + addLast: value times: times - addLast: value times: times "Add value as the last element of the receiver, the given number of times" + self deprecated: 'use add:withOccurrences:'. + ^self add: value withOccurrences: times! - times = 0 ifTrue: [ ^self ]. - lastIndex := nil. "flush access cache" - (runs size=0 or: [values last ~= value]) - ifTrue: - [runs := runs copyWith: times. - values := values copyWith: value] - ifFalse: - [runs at: runs size put: runs last+times]!

1 0

Jump to page: