Squeak-dev January 2010

squeak-dev@lists.squeakfoundation.org

91 participants
425 discussions

Traits now reloadable
by Andreas Raab 01 Jan '10

01 Jan '10

Folks - With the last set of updates traits have finally become un- and reloadable. To unload traits, execute: Trait unloadTraits. This will flatten any existing traits and convert them into classes. The trait related information is stored in the #traitInfo method (browse the senders of #traitInfo after unloading to see how that looks). If you run the tests, the only new failures should be traits related tests (for the obvious reasons; unload the TraitsTests package to get them out of the way). Reloading simply works by loading the traits package again, for example: (Installer repository: 'http://source.squeak.org/trunk') install: 'Traits'. Once loaded, the original traits will be restored if the information in #traitInfo is still present, meaning that the round trip conversion is lossless. In the process I noticed a problem with MC diff handling of traits. You may have to "flush cached versions" in MC after updating or otherwise the Traits package may be shown as dirty. I think that's our SS server again acting strangely with regards to diffs. Cheers, - Andreas

1 0

The Trunk: Traits-ar.274.mcz
by commits＠source.squeak.org 01 Jan '10

01 Jan '10

Andreas Raab uploaded a new version of Traits to project The Trunk: http://source.squeak.org/trunk/Traits-ar.274.mcz ==================== Summary ==================== Name: Traits-ar.274 Author: ar Time: 1 January 2010, 8:10:03 am UUID: 2f372a19-83fc-7147-958e-ca7e0cd2dc9f Ancestors: Traits-ar.273 Add post-load initialization for reloading traits. =============== Diff against Traits-ar.273 =============== Item was added: + ----- Method: Trait class>>install (in category 'load-unload') ----- + install + "Make me the default Trait implementation" + ClassDescription traitImpl: self. + "And restore any previously flattened traits" + self restoreAllTraits. + ! Item was added: + ----- Method: Trait class>>initialize (in category 'load-unload') ----- + initialize + "Install after loading" + self install.!

1 0

The Trunk: Traits-ar.273.mcz
by commits＠source.squeak.org 01 Jan '10

01 Jan '10

Andreas Raab uploaded a new version of Traits to project The Trunk: http://source.squeak.org/trunk/Traits-ar.273.mcz ==================== Summary ==================== Name: Traits-ar.273 Author: ar Time: 1 January 2010, 7:51:17 am UUID: 80802762-102e-4f46-9678-b16af7aa849d Ancestors: Traits-ar.272 Deprecated the no longer used kernel traits. =============== Diff against Traits-ar.272 =============== Item was changed: SystemOrganization addCategory: #'Traits-Composition'! SystemOrganization addCategory: #'Traits-Kernel'! - SystemOrganization addCategory: #'Traits-Kernel-Traits'!

1 0

The Trunk: 311Deprecated-ar.1.mcz
by commits＠source.squeak.org 01 Jan '10

01 Jan '10

Andreas Raab uploaded a new version of 311Deprecated to project The Trunk: http://source.squeak.org/trunk/311Deprecated-ar.1.mcz ==================== Summary ==================== Name: 311Deprecated-ar.1 Author: ar Time: 1 January 2010, 7:49:53 am UUID: 557903ee-2ed7-4945-9559-0ab2bf732727 Ancestors: Deprecate the no longer used kernel traits. ==================== Snapshot ==================== SystemOrganization addCategory: #'311Deprecated-Traits'!

1 0

The Trunk: Traits-ar.272.mcz
by commits＠source.squeak.org 01 Jan '10

01 Jan '10

Andreas Raab uploaded a new version of Traits to project The Trunk: http://source.squeak.org/trunk/Traits-ar.272.mcz ==================== Summary ==================== Name: Traits-ar.272 Author: ar Time: 1 January 2010, 7:27:09 am UUID: 065dc8bf-9996-f345-8842-76af957c5dd9 Ancestors: Traits-ar.271 Making traits unloadable: Three new operations on class trait to support loading and unloading. - Trait removeAllTraits flattens all classes and traits, converting traits to classes and storing supplemental information to support traits recovery. - Trait restoreAllTraits restores traits from previously flattened classes based on the supplemental information stored via removeAllTraits. - Trait unloadTraits first removes all traits and then unloads the traits package via Monticello. =============== Diff against Traits-ar.271 =============== Item was added: + ----- Method: Trait class>>restoreCompositionOf: (in category 'load-unload') ----- + restoreCompositionOf: aClass + "Restore the trait composition for the given class" + | method requires composition | + method := aClass compiledMethodAt: #traitInfo ifAbsent:[^self]. + aClass removeSelector: #traitInfo. + requires := (method pragmaAt: #traitRequires:) + ifNil:[#()] + ifNotNil:[:pragma| pragma arguments first]. + (requires allSatisfy:[:tn| (Smalltalk at: tn ifAbsent:[nil]) isKindOf: Trait]) + ifFalse:[^self inform: 'Cannot restore composition of ', aClass name]. + composition := (method pragmaAt: #traitComposition:) + ifNil:[^self] + ifNotNil:[:pragma| Compiler evaluate: pragma arguments first]. + aClass uses: composition. + aClass traitComposition selectorsAndMethodsDo:[:sel :meth| + | oldMethod newMethod | + newMethod := meth methodHome compiledMethodAt: sel. + oldMethod := aClass compiledMethodAt: sel ifAbsent:[newMethod]. + oldMethod timeStamp = newMethod timeStamp + ifTrue:[aClass removeSelector: sel]].! Item was added: + ----- Method: Trait class>>storeTraitInfoInClass: (in category 'load-unload') ----- + storeTraitInfoInClass: aClass + "Store trait information in the given class" + | code | + code := WriteStream on: (String new: 100). + code nextPutAll: 'traitInfo + "This method contains information to restore the trait structure + for the receiver when traits are loaded or unloaded"'. + aClass isTrait ifTrue:[ + code crtab; nextPutAll: '"This class was originally a trait"'. + code crtab; nextPutAll: '<traitDefinition: true>'. + ]. + aClass hasTraitComposition ifTrue:[ + code crtab; nextPutAll: '"The trait composition for the receiver"'. + code crtab; nextPutAll: '<traitComposition: ', aClass traitCompositionString storeString,'>'. + code crtab; nextPutAll: '"The required traits for this trait"'. + code crtab; nextPutAll: '<traitRequires: ', (aClass traits collect:[:t| t baseTrait name]),'>'. + ]. + aClass compile: code contents. + ! Item was added: + ----- Method: Trait class>>convertTraitToClass: (in category 'load-unload') ----- + convertTraitToClass: aTrait + "Convert the given trait to a class" + | aClass | + "Move the trait out of the way" + Smalltalk removeKey: aTrait name. + "Create the class in its place" + aClass := Object subclass: aTrait name + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: aTrait category. + + aTrait organization commentRemoteStr ifNotNil:[ + aClass classComment: aTrait organization classComment + stamp: aTrait organization commentStamp]. + + aTrait selectorsAndMethodsDo:[:sel :meth| + aClass compile: (aTrait sourceCodeAt: sel) + classified: (aTrait organization categoryOfElement: sel) + withStamp: (aTrait compiledMethodAt: sel) timeStamp + notifying: nil]. + + aTrait classSide selectorsAndMethodsDo:[:sel :meth| + aClass classSide compile: (aTrait classSide sourceCodeAt: sel) + classified: (aTrait classSide organization categoryOfElement: sel) + withStamp: (aTrait classSide compiledMethodAt: sel) timeStamp + notifying: nil]. + + aTrait obsolete. + ^aClass + ! Item was added: + ----- Method: Trait class>>unloadTraits (in category 'load-unload') ----- + unloadTraits + "Trait unloadTraits" + Trait traitImpl == self ifTrue:[Trait traitImpl: nil]. + self removeAllTraits. + Behavior compileSilently: 'updateTraits' classified: 'accessing'. + (MCPackage named: 'Traits') unload. + Behavior removeSelectorSilently: #updateTraits. + Compiler recompileAll.! Item was added: + ----- Method: Trait class>>removeAllTraits (in category 'load-unload') ----- + removeAllTraits "Trait removeAllTraits" + "Removes all traits currently in use. + Preserves enough information so that traits can be recovered." + | converted remain | + converted := Set new. + Smalltalk allClasses do:[:aClass| + self flattenTraitMethodsInClass: aClass classSide. + self flattenTraitMethodsInClass: aClass. + converted add: aClass. + ] displayingProgress: 'Flattening classes'. + + remain := Smalltalk allTraits asSet. + (1 to: remain size) do:[:i| | trait | + trait := remain + detect:[:any| any users allSatisfy:[:aClass| converted includes: aClass]] + ifNone:[self error: 'Cyclic traits detected']. + remain remove: trait. + self flattenTraitMethodsInClass: trait classSide. + self flattenTraitMethodsInClass: trait. + converted add: trait. + ] displayingProgress: 'Flattening traits'. + + "Convert all traits to classes" + Smalltalk allTraits + do:[:trait| self convertTraitToClass: trait] + displayingProgress:[:trait| 'Converting ', trait name]. + ! Item was added: + ----- Method: Trait class>>convertClassToTrait: (in category 'load-unload') ----- + convertClassToTrait: aClass + "Convert the given class to a trait" + | aTrait | + "Move the class out of the way" + Smalltalk removeKey: aClass name. + + "Create the trait in its place" + aTrait := Trait named: aClass name + uses: {} + category: aClass category. + + aClass organization commentRemoteStr ifNotNil:[ + aTrait classComment: aClass organization classComment + stamp: aClass organization commentStamp]. + + aClass selectorsAndMethodsDo:[:sel :meth| + aTrait compile: (aClass sourceCodeAt: sel) + classified: (aClass organization categoryOfElement: sel) + withStamp: (aClass compiledMethodAt: sel) timeStamp + notifying: nil]. + + aClass classSide selectorsAndMethodsDo:[:sel :meth| + aTrait classSide compile: (aClass classSide sourceCodeAt: sel) + classified: (aClass classSide organization categoryOfElement: sel) + withStamp: (aClass classSide compiledMethodAt: sel) timeStamp + notifying: nil]. + + aClass obsolete. + ^aTrait + ! Item was added: + ----- Method: Trait class>>flattenTraitMethodsInClass: (in category 'load-unload') ----- + flattenTraitMethodsInClass: aClass + "Flatten all the trait methods in the given class" + | oldClass | + (aClass isTrait or:[aClass hasTraitComposition]) ifFalse:[^self]. + self storeTraitInfoInClass: aClass. + aClass selectorsAndMethodsDo:[:sel :meth| + (aClass includesLocalSelector: sel) ifFalse:[ + oldClass := meth methodHome. + aClass compile: (aClass sourceCodeAt: sel) + classified: (aClass organization categoryOfElement: sel) + withStamp: (oldClass compiledMethodAt: sel ifAbsent:[meth]) timeStamp + notifying: nil]]. + aClass traitComposition: #().! Item was added: + ----- Method: Trait class>>restoreAllTraits (in category 'load-unload') ----- + restoreAllTraits "Trait restoreAllTraits" + "Restores traits that had been previously removed. + This is the inverse operation to removeAllTraits." + | classes method | + classes := Smalltalk allClasses select:[:aClass| aClass includesSelector: #traitInfo]. + classes do:[:aClass| + method := aClass compiledMethodAt: #traitInfo. + (method pragmaAt: #traitDefinition:) ifNotNil:[:pragma| + pragma arguments first + ifTrue:[self convertClassToTrait: aClass]]. + ] displayingProgress:[:aClass| 'Creating trait ', aClass name]. + classes := Smalltalk allClassesAndTraits select:[:aClass| + (aClass includesSelector: #traitInfo) + or:[aClass classSide includesSelector: #traitInfo]]. + classes do:[:aClass| + self restoreCompositionOf: aClass. + self restoreCompositionOf: aClass classSide. + ] displayingProgress:[:aClass| 'Updating ', aClass name]. + !

1 0

The Trunk: Monticello-ar.350.mcz
by commits＠source.squeak.org 01 Jan '10

01 Jan '10

Andreas Raab uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-ar.350.mcz ==================== Summary ==================== Name: Monticello-ar.350 Author: ar Time: 1 January 2010, 7:22:28 am UUID: 7e908a5e-3004-2143-a011-4ab25930801b Ancestors: Monticello-nice.349 Making traits unloadable: Slight change to Monticello class creation to function correctly in the absence of traits. =============== Diff against Monticello-nice.349 =============== Item was changed: ----- Method: MCClassDefinition>>createClass (in category 'installing') ----- createClass + | superClass class composition | - | superClass class | superClass := Smalltalk at: superclassName. class := (ClassBuilder new) name: name inEnvironment: superClass environment subclassOf: superClass type: type instanceVariableNames: self instanceVariablesString classVariableNames: self classVariablesString poolDictionaries: self sharedPoolsString category: category. + "The following is written to support traits unloading" + composition := Compiler evaluate: (self traitComposition ifNil:['{}']). + (composition isEmpty and:[class traitComposition isEmpty]) ifFalse:[ + class setTraitComposition: composition asTraitComposition. + ]. - class setTraitComposition: (Compiler - evaluate: (self traitComposition ifNil:['{}'])) asTraitComposition. + composition := Compiler evaluate: (self classTraitComposition ifNil:['{}']). + (composition isEmpty and:[class class traitComposition isEmpty]) ifFalse:[ + class class setTraitComposition: composition asTraitComposition. + ]. - class class setTraitComposition: (Compiler - evaluate: (self classTraitComposition ifNil:['{}'])) asTraitComposition. + ^class! - ^class - !

1 0

The Trunk: KernelTests-ar.128.mcz
by commits＠source.squeak.org 01 Jan '10

01 Jan '10

Andreas Raab uploaded a new version of KernelTests to project The Trunk: http://source.squeak.org/trunk/KernelTests-ar.128.mcz ==================== Summary ==================== Name: KernelTests-ar.128 Author: ar Time: 1 January 2010, 7:21:05 am UUID: 07eeffbc-3c60-5f4b-a1c3-03335122f508 Ancestors: KernelTests-ar.127 Making traits unloadable: Slight change to BasicBehaviorClassMetaclassTest to function correctly in the absence of traits. =============== Diff against KernelTests-ar.127 =============== Item was changed: ----- Method: BasicBehaviorClassMetaclassTest>>testClassDescriptionAllSubInstances (in category 'testing') ----- testClassDescriptionAllSubInstances "self run: #testClassDescriptionAllSubInstances" | cdNo clsNo metaclsNo | cdNo := ClassDescription allSubInstances size. clsNo := Class allSubInstances size . metaclsNo := Metaclass allSubInstances size. - "When traits are present, discount all traits if necessary" - Smalltalk at: #Trait ifPresent:[:aClass| - (aClass inheritsFrom: ClassDescription) ifTrue:[ - cdNo := cdNo - Trait instanceCount - ClassTrait instanceCount. - ]. - ]. - self assert: cdNo = (clsNo + metaclsNo). - - - - - - - - - + "When traits are present, discount all traits if necessary" + Smalltalk at: #Trait ifPresent:[:aClass| + (aClass inheritsFrom: ClassDescription) + ifTrue:[cdNo := cdNo - aClass instanceCount]]. + Smalltalk at: #ClassTrait ifPresent:[:aClass| + (aClass inheritsFrom: ClassDescription) + ifTrue:[cdNo := cdNo - aClass instanceCount]]. + + self assert: cdNo = (clsNo + metaclsNo).! - !

1 0

The Trunk: Kernel-ar.363.mcz
by commits＠source.squeak.org 01 Jan '10

01 Jan '10

Andreas Raab uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-ar.363.mcz ==================== Summary ==================== Name: Kernel-ar.363 Author: ar Time: 1 January 2010, 7:18:12 am UUID: bb277eb0-1fa6-ef4f-94d3-e29d4ebfc9ee Ancestors: Kernel-ul.362 Making traits unloadable: We need three backstop methods in Behavior. =============== Diff against Kernel-ul.362 =============== Item was added: + ----- Method: Behavior>>traitComposition (in category 'traits') ----- + traitComposition + "Backstop. When traits are unloaded we never have a trait composition" + ^#()! Item was changed: ----- Method: Behavior>>superclass:methodDictionary:format: (in category 'initialize-release') ----- superclass: aClass methodDictionary: mDict format: fmt "Basic initialization of the receiver. Must only be sent to a new instance; else we would need Object flushCache." superclass := aClass. format := fmt. + methodDict := mDict.! - methodDict := mDict. - self traitComposition: nil! Item was added: + ----- Method: Behavior>>hasTraitComposition (in category 'traits') ----- + hasTraitComposition + "Backstop. When traits are unloaded we never have a trait composition" + ^false! Item was added: + ----- Method: Behavior>>traitCompositionString (in category 'traits') ----- + traitCompositionString + "Backstop. Monticello needs a traitCompositionString even with traits unloaded" + ^'{}'!

1 0

Mouseover on a touch screen
by Jim Rosenberg 01 Jan '10

01 Jan '10

For many years now I have created artistic content that makes intensive use of mouseovers. About a year ago I got a Nokia N810, and played a bit with Squeak on that device. I've still not recovered from the shock of realizing that on a touch screen, there is no such thing as mouseover!: you cannot get the mouse cursor to move without putting it down. What to do. I can think of two potential approaches to this problem. 1. Subclass or modify HandMorph to "do the right thing in the right circumstances". Clearly some work has to be done to clarify how this should behave. HandMorph seems quite complex -- I don't suppose someone has written a tutorial on it somewhere? 2. A new class which acts as a mouse event proxy. This could either be a "screen" -- something that would fit over an entire PasteUpMorph -- or a "sled" that would be carried around by a HandMorph. In any case, the obvious question is: how should it behave. I haven't really specified this yet, but a rough idea would be something like this: "it" absorbs mouseDown, and records what morph would receive mouseDown if it weren't there. If a mouseUp occurs that would have been given to the same morph then mouse events are replayed and sent to that morph. Otherwise, "it" has to relay mouse events to whatever underlying morph would have gotten them if it were not there. This may not be simple to achieve. Now I've only poked around a little, and it looks to me as though the code for deciding what morph should get an event is in HandMorph. So, if I'm serious about doing something, regardless of how I do this it looks like I will need to get deep into the workings of HandMorph. I've tended to want to do my custom stuff in Squeak by subclassing, and am inclined to do approach 2 above -- at this point I kind of like the idea of a "screen". Am I reinventing a wheel here? If someone knows of work I should look at, I'd appreciate any references. There's a major psychological difference between a mouseOver and a click. The click is a kind of commitment, which a mouseOver isn't. It would be a real shame to have to say that we just have to give up mouseOvers on touch screens. I'm not prepared to do that. -Thanks, Jim --- Jim Rosenberg http://www.well.com/user/jer/ Internet: jr(a)amanue.com

1 3

The Trunk: Monticello-nice.349.mcz
by commits＠source.squeak.org 01 Jan '10

01 Jan '10

Nicolas Cellier uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-nice.349.mcz ==================== Summary ==================== Name: Monticello-nice.349 Author: nice Time: 1 January 2010, 5:43:49 am UUID: 8d156a44-1b3c-4c43-a2eb-7a15cdb54b51 Ancestors: Monticello-ar.348 Remove an assigment to a block argument =============== Diff against Monticello-ar.348 =============== Item was changed: ----- Method: MCMczReader>>associate: (in category 'as yet unclassified') ----- associate: tokens | result | result := Dictionary new. tokens pairsDo: [:key :value | + result at: key put: (value isString + ifTrue: [value] + ifFalse: [value collect: [:ea | self associate: ea]])]. - value isString ifFalse: [value := value collect: [:ea | self associate: ea]]. - result at: key put: value]. ^ result!

1 0

Jump to page: