Squeak-dev July 2016

squeak-dev@lists.squeakfoundation.org

38 participants
224 discussions

The Trunk: Monticello-tfel.637.mcz
by commits＠source.squeak.org 25 Jul '16

25 Jul '16

Tim Felgentreff uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-tfel.637.mcz ==================== Summary ==================== Name: Monticello-tfel.637 Author: tfel Time: 25 July 2016, 3:24:24.996828 pm UUID: cf0d6af1-c703-5044-9c57-e798b0cf3abf Ancestors: Monticello-cmm.636 add a button for rejecting all incoming conflicts that only change AST =============== Diff against Monticello-cmm.636 =============== Item was added: + ----- Method: MCConflict>>chooseSameAST (in category 'as yet unclassified') ----- + chooseSameAST + | fromSrc toSrc | + (self definition isNil or: [self definition isMethodDefinition not]) + ifTrue: [^ self]. + fromSrc := (Parser new parse: operation fromSource class: nil class) + generate decompile asString. + toSrc := (Parser new parse: operation toSource class: nil class) + generate decompile asString. + fromSrc = toSrc ifTrue: [self chooseLocal].! Item was changed: ----- Method: MCMergeBrowser>>buttonSpecs (in category 'as yet unclassified') ----- buttonSpecs ^ #((Merge merge 'Proceed with the merge' canMerge) (Cancel cancel 'Cancel the merge') ('All Newer' chooseAllNewerConflicts 'Choose all newer conflict versions') ('All Older' chooseAllOlderConflicts 'Choose all older conflict versions') ('Rest Reject' chooseAllUnchosenLocal 'Choose local versions of all remaining conflicts') ('Rest Accept' chooseAllUnchosenRemote 'Choose remote versions of all remaining conflicts') + ('Accept same source' chooseAllSameAST 'Choose all local conflicting versions that have essentially the same code') )! Item was added: + ----- Method: MCMergeBrowser>>chooseAllSameAST (in category 'as yet unclassified') ----- + chooseAllSameAST + conflicts do: [ :ea | + ea chooseSameAST ]. + self changed: #text; changed: #list.!

1 0

Daily Commit Log
by commits＠source.squeak.org 23 Jul '16

23 Jul '16

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2016-July/068301.html Name: Tools-mt.708 Ancestors: Tools-mt.707 Fixes the small bug where the code holder and browser omitted to communicate the state of their buttons correctly to the pluggable button. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-July/068302.html Name: ToolBuilder-Morphic-mt.170 Ancestors: ToolBuilder-Morphic-mt.169 Action buttons being white was surprising and overridden long time ago in PluggableButtonMorphPlus. Still, retain the hook to build action buttions. Maybe we can distinguish them in the future like tool buttons distinguish from push buttons in other UI frameworks such as Qt. =============================================

1 0

The Inbox: Tests-pre.347.mcz
by commits＠source.squeak.org 23 Jul '16

23 Jul '16

Patrick Rein uploaded a new version of Tests to project The Inbox: http://source.squeak.org/inbox/Tests-pre.347.mcz ==================== Summary ==================== Name: Tests-pre.347 Author: pre Time: 23 July 2016, 2:20:08.768962 pm UUID: 8272055d-5600-c34b-aac4-9c29a9fda5e5 Ancestors: Tests-pre.346 Adds a Compiler test to the list of expected failures as it can not currently work in an image only using the V3PlusClosures encoder. The test is expected to be executable in an image which uses the V3Encoder. =============== Diff against Tests-pre.346 =============== Item was changed: ----- Method: ClosureCompilerTest>>expectedFailures (in category 'failures') ----- expectedFailures + + ^#(testDebuggerTempAccess testInjectIntoDecompilations testInjectIntoDecompiledDebugs) , + (({CompiledMethod classPool at: #SecondaryBytecodeSetEncoderClass . + CompiledMethod classPool at: #PrimaryBytecodeSetEncoderClass} + includes: EncoderForV3) + ifFalse: [#(testSourceRangeAccessForBlueBookInjectInto)] + ifTrue: [#()]) + ! - ^#(testDebuggerTempAccess testInjectIntoDecompilations testInjectIntoDecompiledDebugs)! Item was changed: ----- Method: ClosureCompilerTest>>testSourceRangeAccessForBlueBookInjectInto (in category 'tests') ----- testSourceRangeAccessForBlueBookInjectInto "Test debugger source range selection for inject:into: for a version compiled with closures" "self new testSourceRangeAccessForBlueBookInjectInto" | source method | + [source := (Collection sourceCodeAt: #inject:into:) asString. - source := (Collection sourceCodeAt: #inject:into:) asString. method := (Parser new encoderClass: EncoderForV3; parse: source class: Collection) generate: (Collection compiledMethodAt: #inject:into:) trailer. + self supportTestSourceRangeAccessForInjectInto: method source: source.] + on: Error + do: [:e | self fail: e.]! - self supportTestSourceRangeAccessForInjectInto: method source: source!

1 0

The Trunk: ToolBuilder-Morphic-mt.170.mcz
by commits＠source.squeak.org 23 Jul '16

23 Jul '16

Marcel Taeumel uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-mt.170.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-mt.170 Author: mt Time: 23 July 2016, 11:23:30.185969 am UUID: dd12d103-fc6a-f341-8075-c12e14322142 Ancestors: ToolBuilder-Morphic-mt.169 Action buttons being white was surprising and overridden long time ago in PluggableButtonMorphPlus. Still, retain the hook to build action buttions. Maybe we can distinguish them in the future like tool buttons distinguish from push buttons in other UI frameworks such as Qt. =============== Diff against ToolBuilder-Morphic-mt.169 =============== Item was removed: - ----- Method: MorphicToolBuilder>>buildPluggableActionButton: (in category 'widgets optional') ----- - buildPluggableActionButton: aSpec - | button | - button := self buildPluggableButton: aSpec. - button color: Color white. - ^button! Item was changed: ----- Method: MorphicToolBuilder>>buildPluggableButton: (in category 'widgets required') ----- buildPluggableButton: aSpec | widget label state action enabled | label := aSpec label. state := aSpec state. action := aSpec action. widget := self buttonClass on: aSpec model getState: (state isSymbol ifTrue:[state]) action: nil label: (label isSymbol ifTrue:[label]). widget style: aSpec style. aSpec changeLabelWhen ifNotNilDo: [ :event | widget whenChanged: event update: aSpec label]. self register: widget id: aSpec name. enabled := aSpec enabled. enabled isSymbol ifTrue:[widget getEnabledSelector: enabled] ifFalse:[widget enabled:enabled]. widget action: action. aSpec color isColor + ifTrue: [widget offColor: aSpec color] + ifFalse: [widget getColorSelector: aSpec color]. - ifTrue: [widget - onColor: aSpec color - offColor: aSpec color] - ifFalse: [ - widget getColorSelector: aSpec color. - widget update: aSpec color]. self buildHelpFor: widget spec: aSpec. (label isSymbol or:[label == nil]) ifFalse:[widget label: label]. self setFrame: aSpec frame in: widget. self setLayoutHintsFor: widget spec: aSpec. parent ifNotNil:[self add: widget to: parent]. ^widget!

1 0

The Trunk: Tools-mt.708.mcz
by commits＠source.squeak.org 23 Jul '16

23 Jul '16

Marcel Taeumel uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-mt.708.mcz ==================== Summary ==================== Name: Tools-mt.708 Author: mt Time: 23 July 2016, 11:20:24.615969 am UUID: aa8c41ed-8fea-9649-8d36-a44b5f1c73c3 Ancestors: Tools-mt.707 Fixes the small bug where the code holder and browser omitted to communicate the state of their buttons correctly to the pluggable button. =============== Diff against Tools-mt.707 =============== Item was added: + ----- Method: Browser>>decorateButtons (in category 'controls') ----- + decorateButtons + + super decorateButtons. + + self changed: #classCommentIndicated. + self changed: #instanceMessagesIndicated. + self changed: #classMessagesIndicated.! Item was changed: ----- Method: Browser>>plusButtonHit (in category 'class functions') ----- plusButtonHit "Cycle among definition, comment, and hierachy" + editSelection == #editComment ifTrue: [ + self hierarchy. + self decorateButtons. + ^ self]. + + editSelection == #hierarchy ifTrue: [ + self editSelection: #editClass. + (self hasClassSelected and: [self okToChange]) ifTrue: [ - editSelection == #editComment - ifTrue: [self hierarchy. ^ self]. - editSelection == #hierarchy - ifTrue: [self editSelection: #editClass. - self hasClassSelected ifFalse: [^ self]. - self okToChange ifFalse: [^ self]. self changed: #editComment. + self contentsChanged]. + self decorateButtons. + ^ self]. + + self editComment. + self decorateButtons.! - self contentsChanged. - ^ self]. - self editComment! Item was changed: ----- Method: CodeHolder>>decorateButtons (in category 'controls') ----- decorateButtons "Change screen feedback for any buttons in the UI of the receiver that may wish it. Initially, it is only the Inheritance button that is decorated, but one can imagine others." + self changed: #inheritanceButtonColor. + self changed: #inheritanceButtonEnabled. + self changed: #versionsButtonEnabled.! - self changed: #inheritanceButtonColor.!

1 0

Daily Commit Log
by commits＠source.squeak.org 22 Jul '16

22 Jul '16

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2016-July/068296.html Name: Graphics-tpr.354 Ancestors: Graphics-mt.353 Extend Color class>>fromString parsing to allow also a string of the forrm 'r,g,b' where each item can be the string representation of an integer between 0 and 255 ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-July/068297.html Name: Files-cmm.160 Ancestors: Files-cmm.159 Enable DirectoryEntry's with directory-tree enumeration and content stream access. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-July/068298.html Name: System-mt.840 Ancestors: System-mt.839 Fixes a bug when filing out change sets with changed class definitions. The bug was that the concept of "fat class definition", which merges old and new inst vars for the loading process, did not account for existing vars in the super class. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-July/068299.html Name: System-mt.841 Ancestors: System-mt.840 Make the file-drop-service-menu more descriptive. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-July/068300.html Name: Morphic-mt.1198 Ancestors: Morphic-mt.1197 Make system progress morph use accessors instead of direct instVar accesses to support smooth feature updates in the future. Especially #position:label:min:max: is problematic if we add or remove instVars in SystemProgressMorph because that morph is used when loading code. We had a similar issue with HandMorph in the recent past. Still, bugs can occur when updating from older Squeak images. Hence, we might want to consider "restarting" the update process for each entry in an update map. =============================================

1 0

The Trunk: Morphic-mt.1198.mcz
by commits＠source.squeak.org 22 Jul '16

22 Jul '16

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1198.mcz ==================== Summary ==================== Name: Morphic-mt.1198 Author: mt Time: 22 July 2016, 1:24:23.585873 pm UUID: 052d96c3-da19-7d4e-9448-5c3fd07148db Ancestors: Morphic-mt.1197 Make system progress morph use accessors instead of direct instVar accesses to support smooth feature updates in the future. Especially #position:label:min:max: is problematic if we add or remove instVars in SystemProgressMorph because that morph is used when loading code. We had a similar issue with HandMorph in the recent past. Still, bugs can occur when updating from older Squeak images. Hence, we might want to consider "restarting" the update process for each entry in an update map. =============== Diff against Morphic-mt.1197 =============== Item was added: + ----- Method: SystemProgressMorph>>activeSlots (in category 'accessing') ----- + activeSlots + + ^ activeSlots! Item was added: + ----- Method: SystemProgressMorph>>activeSlots: (in category 'accessing') ----- + activeSlots: anObject + + activeSlots := anObject! Item was added: + ----- Method: SystemProgressMorph>>bars (in category 'accessing') ----- + bars + + ^ bars! Item was added: + ----- Method: SystemProgressMorph>>bars: (in category 'accessing') ----- + bars: anObject + + bars := anObject! Item was added: + ----- Method: SystemProgressMorph>>font (in category 'accessing') ----- + font + + ^ font! Item was added: + ----- Method: SystemProgressMorph>>font: (in category 'accessing') ----- + font: anObject + + font := anObject! Item was changed: ----- Method: SystemProgressMorph>>freeSlot: (in category 'private') ----- freeSlot: number number > 0 ifFalse: [^self]. lock critical: [| label | + label := self labels at: number. - label := labels at: number. (label isNil or: [label owner isNil]) ifTrue: [^self]. "Has been freed before" label delete. + (self bars at: number) delete. + self activeSlots: self activeSlots - 1. + self activeSlots = 0 - (bars at: number) delete. - activeSlots := activeSlots - 1. - activeSlots = 0 ifTrue: [self delete] ifFalse: [self reposition]]! Item was added: + ----- Method: SystemProgressMorph>>labels (in category 'accessing') ----- + labels + + ^ labels! Item was added: + ----- Method: SystemProgressMorph>>labels: (in category 'accessing') ----- + labels: anObject + + labels := anObject! Item was changed: ----- Method: SystemProgressMorph>>nextSlotFor: (in category 'private') ----- nextSlotFor: shortDescription lock critical: [ | label bar slots | + slots := self labels size. + self activeSlots = slots ifTrue: [^0]. + self activeSlots: self activeSlots + 1. - slots := labels size. - activeSlots = slots ifTrue: [^0]. - activeSlots := activeSlots + 1. 1 to: slots do: [:index | + label := (self labels at: index). - label := (labels at: index). label ifNil: [ + bar := self bars at: index put: (SystemProgressBarMorph new extent: BarWidth@BarHeight). + label := self labels at: index put: (StringMorph contents: shortDescription font: self font). - bar := bars at: index put: (SystemProgressBarMorph new extent: BarWidth@BarHeight). - label := labels at: index put: (StringMorph contents: shortDescription font: font). self addMorphBack: label; addMorphBack: bar. ^index]. label owner ifNil: [ + bar := self bars at: index. + label := self labels at: index. - bar := bars at: index. - label := labels at: index. self addMorphBack: (label contents: shortDescription); addMorphBack: (bar barSize: 0). ^index]]] ! Item was changed: ----- Method: SystemProgressMorph>>position:label:min:max: (in category 'private') ----- position: aPoint label: shortDescription min: minValue max: maxValue | slot range barSize lastRefresh | + self requestedPosition: aPoint. - requestedPosition := aPoint. ((range := maxValue - minValue) < 0 or: [(slot := self nextSlotFor: shortDescription) = 0]) ifTrue: [^[:barVal| 0 ]]. + range <= 0 ifTrue: [self removeMorph: (self bars at: slot)]. - range <= 0 ifTrue: [self removeMorph: (bars at: slot)]. self reposition. self openInWorld. barSize := -1. "Enforces a inital draw of the morph" lastRefresh := 0. ^[:barVal | | newBarSize | barVal isString ifTrue: [ self setLabel: barVal at: slot. self currentWorld displayWorld]. (barVal isNumber and: [range >= 1 and: [barVal between: minValue and: maxValue]]) ifTrue: [ newBarSize := (barVal - minValue / range * BarWidth) truncated. newBarSize = barSize ifFalse: [ barSize := newBarSize. + (self bars at: slot) barSize: barSize. - (bars at: slot) barSize: barSize. Time utcMicrosecondClock - lastRefresh > 25000 ifTrue: [ self currentWorld displayWorld. lastRefresh := Time utcMicrosecondClock]]]. slot]! Item was changed: ----- Method: SystemProgressMorph>>reposition (in category 'private') ----- reposition "Put ourself in the requested position on the display, but ensure completely within the bounds of the display" | position | self bounds: ((self fullBounds align: self fullBounds center + with: (self requestedPosition ifNil: [ self fullBounds center ])) translatedToBeWithin: Display boundingBox). - with: (requestedPosition ifNil: [ self fullBounds center ])) translatedToBeWithin: Display boundingBox). "Check to see if labels are wider than progress bars. In that case do a centered instead of the default left aligned layout." position := self width > (Inset x * 2 + (self borderWidth * 2) + BarWidth) ifTrue: [ #topCenter ] ifFalse: [ #leftCenter ]. self cellPositioning: position! Item was added: + ----- Method: SystemProgressMorph>>requestedPosition (in category 'accessing') ----- + requestedPosition + + ^ requestedPosition! Item was added: + ----- Method: SystemProgressMorph>>requestedPosition: (in category 'accessing') ----- + requestedPosition: anObject + + requestedPosition := anObject! Item was changed: ----- Method: SystemProgressMorph>>setLabel:at: (in category 'labelling') ----- setLabel: shortDescription at: slot + (self labels at: slot) contents: shortDescription. - (labels at: slot) contents: shortDescription. self reposition!

1 0

The Trunk: System-mt.841.mcz
by commits＠source.squeak.org 22 Jul '16

22 Jul '16

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.841.mcz ==================== Summary ==================== Name: System-mt.841 Author: mt Time: 22 July 2016, 11:48:11.810945 am UUID: b1354fd5-23af-774d-a0df-a39882b25093 Ancestors: System-mt.840 Make the file-drop-service-menu more descriptive. =============== Diff against System-mt.840 =============== Item was changed: ----- Method: DefaultExternalDropHandler>>chooseServiceFrom: (in category 'private') ----- chooseServiceFrom: aCollection "private - choose a service from aCollection asking the user if needed" ^aCollection size = 1 ifTrue: [aCollection anyOne] ifFalse:[UIManager default chooseFrom: (aCollection collect:[:each| each label]) + values: aCollection + title: 'You dropped a file. Please choose a service:' translated withCRs].! - values: aCollection].! Item was changed: ----- Method: ExternalDropHandler class>>chooseServiceFrom: (in category 'private') ----- chooseServiceFrom: aCollection "private - choose a service from aCollection asking the user if needed" ^aCollection size = 1 ifTrue: [aCollection anyOne] ifFalse:[UIManager default chooseFrom: (aCollection collect:[:each| each label]) + values: aCollection + title: 'You dropped a file. Please choose a service:' translated withCRs].! - values: aCollection].!

1 0

The Trunk: System-mt.840.mcz
by commits＠source.squeak.org 22 Jul '16

22 Jul '16

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.840.mcz ==================== Summary ==================== Name: System-mt.840 Author: mt Time: 22 July 2016, 10:38:45.135908 am UUID: 6ab5c492-6207-3e4f-b2df-8028d64fcf94 Ancestors: System-mt.839 Fixes a bug when filing out change sets with changed class definitions. The bug was that the concept of "fat class definition", which merges old and new inst vars for the loading process, did not account for existing vars in the super class. =============== Diff against System-mt.839 =============== Item was changed: ----- Method: ChangeSet>>fatDefForClass: (in category 'class changes') ----- fatDefForClass: class + | newDef oldDef oldStrm newStrm outStrm oldVars newVars addedVars superVars | - | newDef oldDef oldStrm newStrm outStrm oldVars newVars addedVars | class isBehavior ifFalse: [^class definition]. newDef := class definition. oldDef := (self changeRecorderFor: class) priorDefinition. oldDef ifNil: [^ newDef]. oldDef = newDef ifTrue: [^ newDef]. oldStrm := ReadStream on: oldDef. newStrm := ReadStream on: newDef. outStrm := WriteStream on: (String new: newDef size * 2). "Merge inst vars from old and new defs..." oldStrm upToAll: 'instanceVariableNames'; upTo: $'. outStrm nextPutAll: (newStrm upToAll: 'instanceVariableNames'); nextPutAll: 'instanceVariableNames:'. newStrm peek = $: ifTrue: [newStrm next]. "may or may not be there, but already written" outStrm nextPutAll: (newStrm upTo: $'); nextPut: $'. oldVars := (oldStrm upTo: $') findTokens: Character separators. newVars := (newStrm upTo: $') findTokens: Character separators. addedVars := oldVars asSet addAll: newVars; removeAll: oldVars; asOrderedCollection. + superVars := class allInstVarNames copyWithoutAll: class instVarNames. + oldVars := oldVars copyWithoutAll: superVars. oldVars , addedVars do: [:var | outStrm nextPutAll: var; space]. outStrm nextPut: $'. class isMeta ifFalse: ["Merge class vars from old and new defs..." oldStrm upToAll: 'classVariableNames:'; upTo: $'. outStrm nextPutAll: (newStrm upToAll: 'classVariableNames:'); nextPutAll: 'classVariableNames:'; nextPutAll: (newStrm upTo: $'); nextPut: $'. oldVars := (oldStrm upTo: $') findTokens: Character separators. newVars := (newStrm upTo: $') findTokens: Character separators. addedVars := oldVars asSet addAll: newVars; removeAll: oldVars; asOrderedCollection. + superVars := class allClassVarNames copyWithoutAll: class classVarNames. + oldVars := oldVars copyWithoutAll: superVars. oldVars , addedVars do: [:var | outStrm nextPutAll: var; space]. outStrm nextPut: $']. outStrm nextPutAll: newStrm upToEnd. ^ outStrm contents !

1 0

Re: [squeak-dev] The Trunk: Files-cmm.159.mcz
by Chris Muller 22 Jul '16

22 Jul '16

This does change the return type in the case of a directory from a FileDirectory to a DirectoryEntryDirectory. The intention is to gradually migrate most of FileDirectory's public api to DirectoryEntryDirectory, and let FileDirectory be concerned with the platform-specific access issues. In the meantime, the most compatible thing to do for backward compatibility with the old #/ is to send #asFileDirectory to the result. On Thu, Jul 21, 2016 at 3:44 PM, <commits(a)source.squeak.org> wrote: > Chris Muller uploaded a new version of Files to project The Trunk: > http://source.squeak.org/trunk/Files-cmm.159.mcz > > ==================== Summary ==================== > > Name: Files-cmm.159 > Author: cmm > Time: 21 July 2016, 3:44:04.16263 pm > UUID: 52077283-7106-4ab6-8368-d5f4b5f6f641 > Ancestors: Files-eem.158 > > Fix FileDirectory>>#/ to not assume the argument represents another directory; it could be a file. > > =============== Diff against Files-eem.158 =============== > > Item was changed: > ----- Method: FileDirectory>>/ (in category 'path access') ----- > / aString > "Answer a FileDirectory on a subdirectory named aString, of the receiver." > + ^ FileDirectory directoryEntryFor: (self fullNameFor: aString)! > - ^ FileDirectory on: (self fullNameFor: aString)! > >

4 3

← Newer
1
...
9
10
11
12
13
14
15
...
23
Older →

Jump to page: