Squeak-dev March 2021

squeak-dev@lists.squeakfoundation.org

32 participants
257 discussions

The Trunk: CollectionsTests-nice.351.mcz
by commits＠source.squeak.org 03 Mar '21

03 Mar '21

Nicolas Cellier uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-nice.351.mcz ==================== Summary ==================== Name: CollectionsTests-nice.351 Author: nice Time: 3 March 2021, 2:18:59.33262 am UUID: b5730ca8-f82f-3c44-af32-6b067a27d017 Ancestors: CollectionsTests-dtl.350 Change the expectations w.r.t. Interval fuzzy inclusion. Include a couple of tests taken from https://github.com/dolphinsmalltalk/Dolphin/issues/1108 Revise the expectedFailures, some turned into unexpected success! =============== Diff against CollectionsTests-dtl.350 =============== Item was changed: ----- Method: IntervalTest>>expectedFailures (in category 'failures') ----- expectedFailures + ^ #(testIntervalOfFloatEqual)! - ^ #(testIntervalOfFloatLast testIntervalOfFloatReversed testSurprisingFuzzyInclusionBehavior)! Item was added: + ----- Method: IntervalTest>>testElementOutOfBound (in category 'tests') ----- + testElementOutOfBound + self deny: ((1/5 to: 1.2 by: 1) anySatisfy: [:e | e > 1.2]).! Item was added: + ----- Method: IntervalTest>>testIncludesBound (in category 'tests') ----- + testIncludesBound + "This interval is crafted for including 1.2 + but a careless definition of size might exclude this bound" + self assert: (((0.3 to: 1.2 by: 0.1) includes: 1.2) ==> [(0.3 to: 1.2 by: 0.1) anySatisfy: [:each | each = 1.2]]).! Item was changed: ----- Method: IntervalTest>>testInclusionBug6455 (in category 'tests') ----- testInclusionBug6455 + "This test is about mantis bug http://bugs.squeak.org/view.php?id=6455. + Well it's not a bug, and not a good feature. + See testSurprisingFuzzyInclusion for why this feature is not a good idea" - "This test is about mantis bug http://bugs.squeak.org/view.php?id=6455 - It should work as long as Fuzzy inclusion test feature for Interval of Float is maintained. - This is a case when tested element is near ones of actual value, but by default. - Code used to work only in the case of close numbers by excess..." + self deny: ((0.2 to: 0.6 by: 0.1) includes: 0.3) description: 'Strict Float equality expecation is too high'. + self assert: ((0.2 to: 0.6 by: 0.1) includes: 0.3 successor) description: 'it includes a slightly different number'! - self assert: ((0 to: Float pi by: Float pi / 100) includes: Float pi * (3/100))! Item was changed: ----- Method: IntervalTest>>testIndexOfBug6455 (in category 'tests') ----- testIndexOfBug6455 "This test is about mantis bug http://bugs.squeak.org/view.php?id=6455 + Well it's not a bug, and not a good feature. + See testSurprisingFuzzyInclusion for why this feature is not a good idea" - It should work as long as Fuzzy inclusion test feature for Interval of Float is maintained. - This is a case when tested element is near ones of actual value, but by default. - Code used to work only in the case of close numbers by excess..." + self deny: ((0.2 to: 0.6 by: 0.1) indexOf: 0.3) = 2 description: 'Strict Float equality expecation is too high'. + self assert: ((0.2 to: 0.6 by: 0.1) indexOf: 0.3 successor) = 2 description: 'it includes a slightly different number'! - self assert: ((0 to: Float pi by: Float pi / 100) indexOf: Float pi * (3/100)) = 4!

1 0

The Trunk: Kernel-nice.1376.mcz
by commits＠source.squeak.org 03 Mar '21

03 Mar '21

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.1376.mcz ==================== Summary ==================== Name: Kernel-nice.1376 Author: nice Time: 3 March 2021, 12:18:22.91462 am UUID: c9ee47c3-4e2a-fa4f-9dcd-ed61ababdb73 Ancestors: Kernel-jar.1375 Introduce hasLimitedPrecision which is the way to indicate that arithmetic may be inexact. =============== Diff against Kernel-jar.1375 =============== Item was added: + ----- Method: Float>>hasLimitedPrecision (in category 'testing') ----- + hasLimitedPrecision + ^true! Item was added: + ----- Method: Number>>hasLimitedPrecision (in category 'testing') ----- + hasLimitedPrecision + "indicate whether this number has limited precision. + Arithmetic involving numbers with limited precision is potentially inexact. + The default implementation is false. + Subclass subject to inexact arithmetic shall refine." + ^false!

1 0

The Inbox: Kernel-ct.1376.mcz
by commits＠source.squeak.org 02 Mar '21

02 Mar '21

A new version of Kernel was added to project The Inbox: http://source.squeak.org/inbox/Kernel-ct.1376.mcz ==================== Summary ==================== Name: Kernel-ct.1376 Author: ct Time: 2 March 2021, 7:16:36.10917 pm UUID: 4c5758e1-3727-f04b-86c3-e9fe79a65db4 Ancestors: Kernel-jar.1375 Adds #cull:cull:cull:cull:cull: (for five args) analogously to #value:value:value:value:. =============== Diff against Kernel-jar.1375 =============== Item was added: + ----- Method: BlockClosure>>cull:cull:cull:cull:cull: (in category 'evaluating') ----- + cull: firstArg cull: secondArg cull: thirdArg cull: fourthArg cull: fifthArg + "Activate the receiver, with five or less arguments." + <primitive: 206> "Handle the five argument case primitively" + + ^ numArgs + caseOf: { + [5] -> [self value: firstArg value: secondArg value: thirdArg value: fourthArg value: fifthArg]. + [4] -> [self value: firstArg value: secondArg value: thirdArg value: fourthArg]. + [3] -> [self value: firstArg value: secondArg value: thirdArg]. + [2] -> [self value: firstArg value: secondArg]. + [1] -> [self value: firstArg]. + [0] -> [self value] } + otherwise: [self numArgsError: numArgs]! Item was added: + ----- Method: FullBlockClosure>>cull:cull:cull:cull:cull: (in category 'evaluating') ----- + cull: firstArg cull: secondArg cull: thirdArg cull: fourthArg cull: fifthArg + "Activate the receiver, with five or less arguments." + <primitive: 207> "Handle the five argument case primitively" + + ^ numArgs + caseOf: { + [5] -> [self value: firstArg value: secondArg value: thirdArg value: fourthArg value: fifthArg]. + [4] -> [self value: firstArg value: secondArg value: thirdArg value: fourthArg]. + [3] -> [self value: firstArg value: secondArg value: thirdArg]. + [2] -> [self value: firstArg value: secondArg]. + [1] -> [self value: firstArg]. + [0] -> [self value] } + otherwise: [self numArgsError: numArgs]! Item was added: + ----- Method: MessageSend>>cull:cull:cull:cull:cull: (in category 'evaluating') ----- + cull: firstArg cull: secondArg cull: thirdArg cull: fourthArg cull: fifthArg + "Send the message with these optional arguments and answer the return value" + + ^ selector numArgs caseOf: { + [5] -> [self value: firstArg value: secondArg value: thirdArg value: fourthArg value: fifthArg]. + [4] -> [self value: firstArg value: secondArg value: thirdArg value: fourthArg]. + [3] -> [self value: firstArg value: secondArg value: thirdArg]. + [2] -> [self value: firstArg value: secondArg]. + [1] -> [self value: firstArg]. + [0] -> [self value] }!

2 1

The Trunk: EToys-mt.430.mcz
by commits＠source.squeak.org 02 Mar '21

02 Mar '21

Marcel Taeumel uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-mt.430.mcz ==================== Summary ==================== Name: EToys-mt.430 Author: mt Time: 2 March 2021, 5:08:34.225687 pm UUID: 001ccf96-161a-6848-a231-743877f0d41d Ancestors: EToys-mt.429 Complements Morphic-mt.1732. I think that the call in #mouseDown: is enough to stop recording. Yet, we might want to inform a morph when a halo was (or is about to be) openend on it. There is none yet. =============== Diff against EToys-mt.429 =============== Item was removed: - ----- Method: EventRecordingSpace>>invokeHaloOrMove: (in category 'events-processing') ----- - invokeHaloOrMove: anEvent - - (eventRecorder userStopReplayMaybe: anEvent) ifTrue: [^ self stopPlayback]. - super invokeHaloOrMove: anEvent. - !

1 0

The Trunk: Morphic-mt.1732.mcz
by commits＠source.squeak.org 02 Mar '21

02 Mar '21

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1732.mcz ==================== Summary ==================== Name: Morphic-mt.1732 Author: mt Time: 2 March 2021, 5:06:00.167687 pm UUID: cb835785-768b-fd48-8eef-af27742a70dc Ancestors: Morphic-mt.1731 Encapsulates most of the logic for halo invocation (and transfer) from Morph and PasteUpMorph into a new MorphicHaloDispatcher. Hopefully no new bugs introduced. Yet, there is still this issue with protruding submorphs due to the logic in #dispatchHalo:createFor: ... :-) PasteUpMorph #tryInvokeHalo: --> #dispatchHalo:createFor: Morph #transferHalo:from: --> #dispatchHalo:transferFrom: It always starts in #dispatchHalo:with: --- either called from the world's event filter or the current halo's mouse-down handling code. =============== Diff against Morphic-mt.1731 =============== Item was removed: - ----- Method: Morph>>addHalo:from: (in category 'halos and balloon help') ----- - addHalo: evt from: formerHaloOwner - "Transfer a halo from the former halo owner to the receiver" - ^self addHalo: evt! Item was added: + ----- Method: Morph>>defaultHaloDispatcher (in category 'halos and balloon help') ----- + defaultHaloDispatcher + + ^ MorphicHaloDispatcher new! Item was removed: - ----- Method: Morph>>invokeHaloOrMove: (in category 'meta-actions') ----- - invokeHaloOrMove: anEvent - "Special gestures (cmd-mouse on the Macintosh; Alt-mouse on Windows and Unix) allow a mouse-sensitive morph to be moved or bring up a halo for the morph." - | h tfm doNotDrag | - h := anEvent hand halo. - "Prevent wrap around halo transfers originating from throwing the event back in" - doNotDrag := false. - h ifNotNil:[ - (h innerTarget == self) ifTrue:[doNotDrag := true]. - (h innerTarget hasOwner: self) ifTrue:[doNotDrag := true]. - (self hasOwner: h target) ifTrue:[doNotDrag := true]]. - - tfm := (self transformedFrom: nil) inverseTransformation. - - "cmd-drag on flexed morphs works better this way" - h := self addHalo: (anEvent transformedBy: tfm). - h ifNil: [^ self]. - doNotDrag ifTrue:[^self]. - "Initiate drag transition if requested" - anEvent hand - waitForClicksOrDrag: h - event: (anEvent transformedBy: tfm) - selectors: { nil. nil. nil. #startDragTarget:. } - threshold: HandMorph dragThreshold. - "Pass focus explicitly here" - anEvent hand newMouseFocus: h. - "Reset temporary cursors to make available halo interaction visible." - anEvent hand showTemporaryCursor: nil.! Item was added: + ----- Method: Morph>>transferHalo: (in category 'halos and balloon help') ----- + transferHalo: event + + ^ self transferHalo: event using: self defaultHaloDispatcher! Item was removed: - ----- Method: Morph>>transferHalo:from: (in category 'halos and balloon help') ----- - transferHalo: event from: formerHaloOwner - "Progressively transfer the halo to the next likely recipient" - | localEvt w target | - - self flag: #workAround. "For halo's distinction between 'target' and 'innerTarget' we need to bypass any renderers." - (formerHaloOwner == self and:[self isRenderer and:[self wantsHaloFromClick not]]) ifTrue:[ - event shiftPressed ifTrue:[ - target := owner. - localEvt := event transformedBy: (self transformedFrom: owner). - ] ifFalse:[ - target := self renderedMorph. - localEvt := event transformedBy: (target transformedFrom: self). - ]. - ^target transferHalo: localEvt from: target]. - - " formerHaloOwner == self ifTrue:[^ self removeHalo]." - - "Never transfer halo to top-most world" - (self isWorldMorph and:[owner isNil]) ifFalse:[ - (self wantsHaloFromClick and:[formerHaloOwner ~~ self]) - ifTrue:[^self addHalo: event from: formerHaloOwner]]. - - event shiftPressed ifTrue:[ - "Pass it outwards" - owner ifNotNil:[^owner transferHalo: event from: formerHaloOwner]. - "We're at the top level; throw the event back in to find recipient" - formerHaloOwner removeHalo. - ^self processEvent: event copy resetHandlerFields. - ]. - self submorphsDo:[:m| - localEvt := event transformedBy: (m transformedFrom: self). - (m fullContainsPoint: localEvt position) - ifTrue:[^m transferHalo: event from: formerHaloOwner]. - ]. - "We're at the bottom most level; throw the event back up to the root to find recipient" - formerHaloOwner removeHalo. - - Preferences maintainHalos ifFalse:[ - (w := self world) ifNil: [ ^self ]. - localEvt := event transformedBy: (self transformedFrom: w) inverseTransformation. - ^w processEvent: localEvt resetHandlerFields. - ]. - ! Item was added: + ----- Method: Morph>>transferHalo:using: (in category 'halos and balloon help') ----- + transferHalo: event using: dispatcher + + ^ dispatcher dispatchHalo: event with: self! Item was added: + Object subclass: #MorphicHaloDispatcher + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Morphic-Events'! Item was added: + ----- Method: MorphicHaloDispatcher>>dispatchHalo:createFor: (in category 'dispatching') ----- + dispatchHalo: anEvent createFor: aMorph + "Invoke halos around the top-most world container at aUserInputEvent's #position. If it was already halo'd, zero-in on its next inward component morph at that position. Holding Shift during the click reverses this traversal order." + + | stack innermost haloTarget | + "the stack is the top-most morph to bottom-most." + stack := (aMorph morphsAt: anEvent position unlocked: true) select: + [ : each | each wantsHaloFromClick or: [ each handlesMouseDown: anEvent ] ]. + innermost := anEvent hand halo + ifNil: [ stack first ] + ifNotNil: + [ : existingHalo | + (stack := stack copyWithout: existingHalo) "No halos on halos" + detect: [ : each | each owner == aMorph ] + ifFound: + [ : worldContainer | "Is existingHalo's target part of the same worldContainer as the morph clicked?" + (existingHalo target withAllOwners includes: worldContainer) + ifTrue: [ "same hierarchy, let #transferHalo: continue to handle it for now." ^ false ] + ifFalse: + [ "different hierarchy, remove + add." + anEvent hand removeHalo. + anEvent shiftPressed + ifTrue: [ stack first ] + ifFalse: [ worldContainer ] ] ] + ifNone: [ "existingHalo is on the World, defer to #transferHalo: for now." ^ false ] ]. + + "If modifier key is pressed, start at innermost (the target), otherwise the outermost (direct child of the world (self))." + haloTarget := (innermost == aMorph or: [anEvent shiftPressed]) + ifTrue: [ innermost ] + ifFalse: + [ "Find the outermost owner that wants it." + innermost withAllOwners reversed allButFirst + detect: [ : each | each wantsHaloFromClick ] + ifNone: [ "haloTarget has its own mouseDown handler, don't halo." ^ false ] ]. + "Now that we have the haloTarget, show the halo." + self invokeHaloOrMove: anEvent on: haloTarget. + ^ true! Item was added: + ----- Method: MorphicHaloDispatcher>>dispatchHalo:transferFrom: (in category 'dispatching') ----- + dispatchHalo: event transferFrom: morph + "Progressively transfer the halo to the next likely recipient" + + ^ event shiftPressed + ifTrue: [self dispatchHalo: event transferOutwardsFrom: morph] + ifFalse: [self dispatchHalo: event transferInwardsFrom: morph]! Item was added: + ----- Method: MorphicHaloDispatcher>>dispatchHalo:transferInwardsFrom: (in category 'dispatching') ----- + dispatchHalo: event transferInwardsFrom: currentTarget + + | localEvent world | + currentTarget submorphsDo: [:nextTarget | + localEvent := event transformedBy: (nextTarget transformedFrom: currentTarget). + (nextTarget fullContainsPoint: localEvent position) ifTrue: [ + ^ nextTarget wantsHaloFromClick + ifTrue: [self invokeHalo: localEvent on: nextTarget] + ifFalse: [self dispatchHalo: localEvent transferInwardsFrom: nextTarget]]]. + + "We're at the bottom most level; throw the event back up to the root to find recipient" + event hand removeHalo. + Preferences maintainHalos ifFalse: [ + (world := currentTarget world) ifNil: [ ^ false ]. + localEvent := event transformedBy: (currentTarget transformedFrom: world) inverseTransformation. + world processEvent: localEvent resetHandlerFields]. + + ^ false! Item was added: + ----- Method: MorphicHaloDispatcher>>dispatchHalo:transferOutwardsFrom: (in category 'dispatching') ----- + dispatchHalo: event transferOutwardsFrom: currentTarget + + | localEvent | + currentTarget owner ifNotNil: [:nextTarget | + localEvent := event transformedBy: (currentTarget transformedFrom: nextTarget). + "Never transfer halo to top-most world" + ^ (nextTarget isWorldMorph not and: [nextTarget wantsHaloFromClick]) + ifTrue: [self invokeHalo: localEvent on: nextTarget] + ifFalse: [self dispatchHalo: localEvent transferOutwardsFrom: nextTarget]]. + + "We're at the top level; throw the event back in to find recipient" + event hand removeHalo. + currentTarget isWorldMorph + ifTrue: [currentTarget processEvent: event copy resetHandlerFields]. + + ^ false! Item was added: + ----- Method: MorphicHaloDispatcher>>dispatchHalo:with: (in category 'dispatching') ----- + dispatchHalo: anEvent with: aMorph + + | halo successful | + halo := anEvent hand halo. + successful := (halo isNil or: [halo target ~~ aMorph]) + ifTrue: [self dispatchHalo: anEvent createFor: aMorph] + ifFalse: [self dispatchHalo: anEvent transferFrom: aMorph]. + successful ifTrue: [ + self assert: [halo ~~ anEvent hand halo]. + anEvent hand halo setProperty: #lastHaloDispatcher toValue: self]. + ^ successful! Item was added: + ----- Method: MorphicHaloDispatcher>>invokeHalo:on: (in category 'invoking') ----- + invokeHalo: anEvent on: aMorph + + aMorph addHalo: anEvent. + ^ true! Item was added: + ----- Method: MorphicHaloDispatcher>>invokeHaloOrMove:on: (in category 'invoking') ----- + invokeHaloOrMove: anEvent on: aMorph + "Special gestures (cmd-mouse on the Macintosh; Alt-mouse on Windows and Unix) allow a mouse-sensitive morph to be moved or bring up a halo for the morph." + | h tfm doNotDrag | + anEvent hand newMouseFocus: aMorph event: anEvent. + h := anEvent hand halo. + "Prevent wrap around halo transfers originating from throwing the event back in" + doNotDrag := false. + h ifNotNil:[ + (h innerTarget == aMorph) ifTrue:[doNotDrag := true]. + (h innerTarget hasOwner: aMorph) ifTrue:[doNotDrag := true]. + (aMorph hasOwner: h target) ifTrue:[doNotDrag := true]]. + + tfm := (aMorph transformedFrom: nil) inverseTransformation. + + "cmd-drag on flexed morphs works better this way" + h := aMorph addHalo: (anEvent transformedBy: tfm). + h setProperty: #lastHaloDispatcher toValue: self. + doNotDrag ifTrue:[^ true]. + "Initiate drag transition if requested" + anEvent hand + waitForClicksOrDrag: h + event: (anEvent transformedBy: tfm) + selectors: { nil. nil. nil. #startDragTarget:. } + threshold: HandMorph dragThreshold. + "Pass focus explicitly here" + anEvent hand newMouseFocus: h. + "Reset temporary cursors to make available halo interaction visible." + anEvent hand showTemporaryCursor: nil. + ^ true! Item was changed: ----- Method: PasteUpMorph>>tryInvokeHalo: (in category 'events-processing') ----- tryInvokeHalo: aUserInputEvent + - "Invoke halos around the top-most world container at aUserInputEvent's #position. If it was already halo'd, zero-in on its next inward component morph at that position. Holding Shift during the click reverses this traversal order." - | stack innermost haloTarget | Preferences noviceMode ifTrue: [ ^ self ]. Morph haloForAll ifFalse: [ ^ self ]. + + (self transferHalo: aUserInputEvent) + ifTrue: "The event was handled, don't let it cause any further side-effects." + [ aUserInputEvent ignore ].! - "the stack is the top-most morph to bottom-most." - stack := (self morphsAt: aUserInputEvent position unlocked: true) select: - [ : each | each wantsHaloFromClick or: [ each handlesMouseDown: aUserInputEvent ] ]. - innermost := aUserInputEvent hand halo - ifNil: [ stack first ] - ifNotNil: - [ : existingHalo | (stack copyWithout: existingHalo) "No halos on halos" - detect: [ : each | each owner == self ] - ifFound: - [ : worldContainer | "Is existingHalo's target part of the same worldContainer as the morph clicked?" - (existingHalo target withAllOwners includes: worldContainer) - ifTrue: [ "same hierarchy, let #transferHalo: continue to handle it for now." ^self ] - ifFalse: - [ "different hierarchy, remove + add." - aUserInputEvent hand removeHalo. - aUserInputEvent shiftPressed - ifTrue: [ stack second "first is still the just removed halo" ] - ifFalse: [ worldContainer ] ] ] - ifNone: [ "existingHalo is on the World, defer to #transferHalo: for now." ^self ] ]. - "If modifier key is pressed, start at innermost (the target), otherwise the outermost (direct child of the world (self))." - haloTarget := (innermost == self or: [aUserInputEvent shiftPressed]) - ifTrue: [ innermost ] - ifFalse: - [ "Find the outermost owner that wants it." - innermost withAllOwners reversed allButFirst - detect: [ : each | each wantsHaloFromClick ] - ifNone: [ "haloTarget has its own mouseDown handler, don't halo." ^ self ] ]. - "Now that we have the haloTarget, show the halo." - aUserInputEvent hand - newMouseFocus: haloTarget - event: aUserInputEvent. - haloTarget invokeHaloOrMove: aUserInputEvent. - "aUserInputEvent has been consumed, don't let it cause any further side-effects." - aUserInputEvent ignore! Item was changed: ----- Method: SimpleHaloMorph>>transferHalo: (in category 'pop up') ----- transferHalo: event "Transfer the halo to the next likely recipient" + ^ self + transferHalo: event + using: (self + valueOfProperty: #lastHaloDispatcher + ifAbsent: [self target defaultHaloDispatcher])! - self target - transferHalo: (event transformedBy: (self target transformedFrom: self)) - from: self target.! Item was removed: - ----- Method: SimpleHaloMorph>>transferHalo:from: (in category 'halos and balloon help') ----- - transferHalo: event from: formerHaloOwner - "If my world tries to open on me, pass it on to the next sibling after me." - - formerHaloOwner == self world ifTrue: [ - self world submorphsDo: [:m | - (m ~~ self and: [m fullContainsPoint: event position]) ifTrue: [ - m comeToFront. - ^ m transferHalo: event from: formerHaloOwner]]].! Item was added: + ----- Method: SimpleHaloMorph>>transferHalo:using: (in category 'pop up') ----- + transferHalo: event using: dispatcher + "Transfer the halo to the next likely recipient. Call the target again so that it may change the dispatcher." + + ^ self target + transferHalo: (event transformedBy: (self target transformedFrom: self)) + using: dispatcher! Item was added: + ----- Method: SimpleHaloMorph>>wantsHaloFromClick (in category 'halos and balloon help') ----- + wantsHaloFromClick + + ^ false!

1 0

The Inbox: Collections-ct.925.mcz
by commits＠source.squeak.org 02 Mar '21

02 Mar '21

Christoph Thiede uploaded a new version of Collections to project The Inbox: http://source.squeak.org/inbox/Collections-ct.925.mcz ==================== Summary ==================== Name: Collections-ct.925 Author: ct Time: 2 March 2021, 5:03:16.49317 pm UUID: 5f3ec2e0-cb35-a74d-9a02-1ef8f9f78aeb Ancestors: Collections-jar.924 Refines String>>#asPluralBasedOn: to avoid ugly spellings such as 'classs'. This approach does not scale very far, of course, but it's better than nothing. Maybe we also want to move this into System-Localization at some other day and build language-specific plurals. :-) =============== Diff against Collections-jar.924 =============== Item was changed: ----- Method: String>>asPluralBasedOn: (in category 'converting') ----- asPluralBasedOn: aNumberOrCollection "Append an 's' to this string based on whether aNumberOrCollection is 1 or of size 1." + aNumberOrCollection = 1 + ifTrue: [^ self]. + (aNumberOrCollection isCollection and: [aNumberOrCollection size = 1]) + ifTrue: [^ self]. + + ^ (self endsWith: 's') + ifTrue: [self , 'es'] + ifFalse: [self , 's'] - ^ (aNumberOrCollection = 1 or: - [aNumberOrCollection isCollection and: [aNumberOrCollection size = 1]]) - ifTrue: [self] - ifFalse: [self, 's'] !

1 0

The Inbox: Protocols-ct.79.mcz
by commits＠source.squeak.org 02 Mar '21

02 Mar '21

Christoph Thiede uploaded a new version of Protocols to project The Inbox: http://source.squeak.org/inbox/Protocols-ct.79.mcz ==================== Summary ==================== Name: Protocols-ct.79 Author: ct Time: 2 March 2021, 3:54:08.19017 pm UUID: e33c4359-8d90-8e4f-9c3d-b2ed45ee3ac9 Ancestors: Protocols-mt.77 In the protocol lexicon, fall back to the "all" category if no certain protocol is selected. =============== Diff against Protocols-mt.77 =============== Item was changed: ----- Method: Lexicon>>categoryListIndex: (in category 'category list') ----- categoryListIndex: anIndex "Set the category list index as indicated" | categoryName aList found existingSelector | existingSelector := self selectedMessageName. categoryListIndex := anIndex. + categoryName := anIndex > 0 - anIndex > 0 ifTrue: + [categoryList at: anIndex] - [categoryName := categoryList at: anIndex] ifFalse: + [categoryList last "self class allCategoryName"]. - [contents := nil]. self changed: #categoryListIndex. found := false. #( (viewedCategoryName selectorsVisited) (queryCategoryName selectorsRetrieved)) do: [:pair | categoryName = (self class perform: pair first) ifTrue: [aList := self perform: pair second. found := true]]. found ifFalse: [aList := currentVocabulary allMethodsInCategory: categoryName forInstance: self targetObject ofClass: targetClass]. categoryName = self class queryCategoryName ifFalse: [autoSelectString := nil]. self initListFrom: aList highlighting: targetClass. messageListIndex := 0. self changed: #messageList. contents := nil. self contentsChanged. self selectWithinCurrentCategoryIfPossible: existingSelector. self adjustWindowTitle!

1 0

The Inbox: System-ct.1221.mcz
by commits＠source.squeak.org 02 Mar '21

02 Mar '21

Christoph Thiede uploaded a new version of System to project The Inbox: http://source.squeak.org/inbox/System-ct.1221.mcz ==================== Summary ==================== Name: System-ct.1221 Author: ct Time: 2 March 2021, 3:43:49.27617 pm UUID: 9d574208-4d9d-9549-b398-2b34b8fce241 Ancestors: System-mt.1219 Refactors removal of selectors. Deprecates #confirmRemovalOf:on: because of its high coupling and magic number return values. Also improves multilingual support. Please only merge together with {Tools-ct.1028. Protocols-ct.78}, (HelpSystem-Core-ct.124 isInTrunk ifTrue: [{HelpSystem-Core-ct.135}] ifFalse: [].) :-) =============== Diff against System-mt.1219 =============== Item was added: + ----- Method: SystemNavigation>>confirmAndRemoveSelector:class: (in category 'ui') ----- + confirmAndRemoveSelector: selector class: aClass + + | method allCalls browse remove | + method := MethodReference class: aClass selector: selector environment: self environment. + allCalls := self allCallsOn: selector. + + remove := true. + browse := false. + (allCalls anySatisfy: [:ea | ea ~= method]) ifTrue: [ + | choice | + choice := UIManager default + chooseFromLabeledValues: (OrderedDictionary newFrom: { + 'Remove it' translated -> []. + 'Remove, then browse senders' translated -> [browse := true]. + 'Don''t remove, but show me those senders' translated -> [remove := false. browse := true]. + 'Forget it -- do nothing -- sorry I asked' translated -> [remove := false] }) + title: ('The message "{1}" has {2}.' translated format: { + selector. + allCalls size > 1 + ifFalse: ['1 sender' translated] + ifTrue: ['{1} senders' translated format: {allCalls size}] }). + choice ifNil: [choice := [remove := false]]. + choice value]. + + remove ifTrue: [ + aClass removeSelector: selector]. + browse ifTrue: [ + self headingAndAutoselectForLiteral: selector do: [ :label :autoSelect | + self + browseMessageList: allCalls + name: label + autoSelect: autoSelect]]. + + ^ remove! Item was changed: ----- Method: SystemNavigation>>confirmRemovalOf:on: (in category 'ui') ----- confirmRemovalOf: aSelector on: aClass "Determine if it is okay to remove the given selector. Answer 1 if it should be removed, 2 if it should be removed followed by a senders browse, and 3 if it should not be removed." | count answer caption allCalls | + self deprecated: 'ct: Use #confirmAndRemoveSelector:class: instead.'. + allCalls := self allCallsOn: aSelector. (count := allCalls size) = 0 ifTrue: [^ 1]. "no senders -- let the removal happen without warning" count = 1 ifTrue: [(allCalls first actualClass == aClass and: [allCalls first methodSymbol == aSelector]) ifTrue: [^ 1]]. "only sender is itself" caption := 'The message "{1}" has {2} sender{3}.' translated format: {aSelector. count. count > 1 ifTrue: ['s'] ifFalse: ['']}. answer := UIManager default chooseFrom: #('Remove it' 'Remove, then browse senders' 'Don''t remove, but show me those senders' 'Forget it -- do nothing -- sorry I asked') title: caption. answer = 3 ifTrue: [self browseMessageList: allCalls name: 'Senders of ' , aSelector autoSelect: aSelector keywords first]. answer = 0 ifTrue: [answer := 3]. "If user didn't answer, treat it as cancel" ^ answer min: 3!

2 1

The Trunk: Kernel-mt.1371.mcz
by commits＠source.squeak.org 02 Mar '21

02 Mar '21

Marcel Taeumel uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-mt.1371.mcz ==================== Summary ==================== Name: Kernel-mt.1371 Author: mt Time: 17 February 2021, 5:56:29.152426 pm UUID: 1e5b05c3-feb7-e945-a253-3218ee358e74 Ancestors: Kernel-mt.1370 Extracts better examples for #valueWithExit from squeak-dev mailing list. =============== Diff against Kernel-mt.1370 =============== Item was changed: ----- Method: BlockClosure>>valueWithExit (in category 'evaluating') ----- valueWithExit + "Provides an exit block to the receiver. Use it to break out of the control flow with an early return. Examples below. + [:break | 1 to: 10 do: [:each | each > 5 ifTrue: [break value]]] valueWithExit. + 1 to: 10 do: [:each | [:continue | each > 5 ifTrue: [continue value]] valueWithExit]." - "Provides an exit block to the receiver. Use it to break out of the control flow with an early return. For example: - [:exit | 1 to: 10 do: [:each | each > 5 ifTrue: [exit value]]] valueWithExit" self value: [ ^nil ]!

3 2

The Inbox: Protocols-ct.78.mcz
by commits＠source.squeak.org 02 Mar '21

02 Mar '21

Christoph Thiede uploaded a new version of Protocols to project The Inbox: http://source.squeak.org/inbox/Protocols-ct.78.mcz ==================== Summary ==================== Name: Protocols-ct.78 Author: ct Time: 2 March 2021, 3:45:36.46717 pm UUID: 0213a785-c806-e344-83fb-4876ec5be7ee Ancestors: Protocols-mt.77 Refactors removal of selectors. Complements System-ct.1221. =============== Diff against Protocols-mt.77 =============== Item was changed: ----- Method: Lexicon>>removeMessage (in category 'menu commands') ----- removeMessage - "Remove the selected message from the system." + super removeMessage ifFalse: [^ false]. + - messageListIndex = 0 ifTrue: [^ self]. - self okToChange ifFalse: [^ self]. - - super removeMessage. "my #reformulateList method, called from the super #removeMethod method, will however try to preserve the selection, so we take pains to clobber it by the below..." messageListIndex := 0. self changed: #messageList. self changed: #messageListIndex. contents := nil. self contentsChanged!

1 0

Jump to page: