Squeak-dev July 2016

squeak-dev@lists.squeakfoundation.org

38 participants
224 discussions

The Trunk: Network-bp.178.mcz
by commits＠source.squeak.org 03 Jul '16

03 Jul '16

Bernhard Pieber uploaded a new version of Network to project The Trunk: http://source.squeak.org/trunk/Network-bp.178.mcz ==================== Summary ==================== Name: Network-bp.178 Author: bp Time: 3 July 2016, 11:48:20.491006 am UUID: d0d328ad-a743-44cc-a912-853edf7bcf02 Ancestors: Network-ul.177 fix endless recursion on parsing e-mail addresses including an ampersand =============== Diff against Network-ul.177 =============== Item was changed: ----- Method: MailAddressTokenizer class>>nonAtomSet (in category 'class initialization') ----- nonAtomSet "(from RFC 2822)" ^CSNonAtom ifNil: [ CSNonAtom := CharacterSet new addAll: ($A to: $Z); addAll: ($a to: $z); addAll: ($0 to: $9); + addAll: '!!#$%&''*+-/=?^_`{|}~'; - addAll: '!!#$%^''*+-/=?^_`{|}~'; complement ]! Item was added: + (PackageInfo named: 'Network') postscript: '"below, add code to be run after the loading of this package" + MailAddressTokenizer cleanUp: false'!

1 0

Re: [squeak-dev] The Trunk: Traits-pre.307.mcz
by David T. Lewis 03 Jul '16

03 Jul '16

On Fri, Jul 01, 2016 at 03:50:19PM +0000, commits(a)source.squeak.org wrote: > Patrick Rein uploaded a new version of Traits to project The Trunk: > http://source.squeak.org/trunk/Traits-pre.307.mcz > > ==================== Summary ==================== > > Name: Traits-pre.307 > Author: pre > Time: 20 November 2015, 2:58:26.562 pm > UUID: f0955b2d-775c-4862-85b9-5d6e616cd2e4 > Ancestors: Traits-eem.306 > > This fixes http://bugs.squeak.org/view.php?id=7767 which is about the - and @ operator of Trait compositions ignoring brackets. This implementation uses the normal left to right evaluation order of Smalltalk to avoid confusions about the way trait composition expressions are evaluated. > I set the issue status to "resolved" in Mantis. Thanks! Dave

1 0

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

02 Jul '16

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2016-July/068249.html Name: Monticello-cmm.635 Ancestors: Monticello-cmm.634 The old indexed "trunkBackup" implementation being replaced with the possibility for any HTTP repository to be indexed. It is useful for MCHttpRepository's to cache whether their backends are indexed or not. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-July/068250.html Name: Installer-Core-cmm.407 Ancestors: Installer-Core-cmm.406 When the user specifies to #useLocalRepository for configuration, but hasn't overridden their 'localRepository', calculate the #defaultLocalRepository based on the availability of a personal SqueakSource server (for history on one's own proprietary code), or not. =============================================

1 0

The Trunk: Installer-Core-cmm.407.mcz
by commits＠source.squeak.org 02 Jul '16

02 Jul '16

Chris Muller uploaded a new version of Installer-Core to project The Trunk: http://source.squeak.org/trunk/Installer-Core-cmm.407.mcz ==================== Summary ==================== Name: Installer-Core-cmm.407 Author: cmm Time: 2 July 2016, 2:58:33.524279 pm UUID: 1d241bec-9f9c-4678-8692-3cf3f50c26e6 Ancestors: Installer-Core-cmm.406 When the user specifies to #useLocalRepository for configuration, but hasn't overridden their 'localRepository', calculate the #defaultLocalRepository based on the availability of a personal SqueakSource server (for history on one's own proprietary code), or not. =============== Diff against Installer-Core-cmm.406 =============== Item was added: + ----- Method: Installer class>>defaultLocalRepository (in category 'repository-overrides') ----- + defaultLocalRepository + "Check for a personal, Magma-indexed SqueakSource server first, if none running, the the 'mc' directory in the current directory." + | localSqueaksource | + localSqueaksource := Installer monticello http: 'http://localhost:8888'. + ^ localSqueaksource mc isIndexed + ifTrue: [localSqueaksource] + ifFalse: [Installer monticello directory: FileDirectory default / 'mc']! Item was changed: ----- Method: Installer class>>localRepository (in category 'repository-overrides') ----- localRepository + ^ localRepository ifNil: [self defaultLocalRepository]! - ^ localRepository ifNil: [ Installer monticello directory: FileDirectory default / 'mc' ]!

1 0

The Trunk: Monticello-cmm.635.mcz
by commits＠source.squeak.org 02 Jul '16

02 Jul '16

Chris Muller uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-cmm.635.mcz ==================== Summary ==================== Name: Monticello-cmm.635 Author: cmm Time: 2 July 2016, 2:33:00.947878 pm UUID: fe818a1e-1589-4782-b7d2-7848676e8630 Ancestors: Monticello-cmm.634 The old indexed "trunkBackup" implementation being replaced with the possibility for any HTTP repository to be indexed. It is useful for MCHttpRepository's to cache whether their backends are indexed or not. =============== Diff against Monticello-cmm.634 =============== Item was changed: MCFileBasedRepository subclass: #MCHttpRepository + instanceVariableNames: 'location user password readerCache indexed' - instanceVariableNames: 'location user password readerCache' classVariableNames: '' poolDictionaries: '' category: 'Monticello-Repositories'! Item was removed: - ----- Method: MCHttpRepository class>>trunkBackup (in category 'well-known repositories') ----- - trunkBackup - ^ MCRepositoryGroup default repositories - detect: - [ : each | each isTrunkBackup ] - ifNone: - [ MCHttpRepository - location: MCHttpRepository trunkBackupUrlString - user: 'squeak' - password: 'squeak' ]! Item was removed: - ----- Method: MCHttpRepository class>>trunkBackupUrlString (in category 'accessing') ----- - trunkBackupUrlString - ^ 'http://box4.squeak.org:8888/trunk'! Item was changed: ----- Method: MCHttpRepository>>clearCredentials (in category 'accessing') ----- clearCredentials + user ifNotNil: [user atAllPut: $x]. + password ifNotNil: [password atAllPut: $x]. - user atAllPut: $x. - password atAllPut: $x. user := password := String empty! Item was added: + ----- Method: MCHttpRepository>>isIndexed (in category 'private') ----- + isIndexed + ^ indexed ifNil: + [indexed := [(HTTPSocket + httpGet: self locationWithTrailingSlash + args: {'query' -> {'isHistorySupported'}} + user: self user + passwd: self password) contents = 'true'] + on: Error + do: + [:err | false]]! Item was removed: - ----- Method: MCHttpRepository>>isTrunkBackup (in category 'testing') ----- - isTrunkBackup - ^ location = self class trunkBackupUrlString! Item was changed: ----- Method: MCHttpRepository>>mcModel (in category 'overriding') ----- mcModel + "Answer the object which can respond to #historyOf: and #originOf: or nil, if none." + ^ self isIndexed ifTrue: [self]! - "Answer the object which can respond to #historyOf: and #originOf:." - ^ self! Item was added: + ----- Method: MCHttpRepository>>refresh (in category 'overriding') ----- + refresh + super refresh. + indexed := nil!

1 0

Stable VMs now that we use git?
by Bernhard Pieber 02 Jul '16

02 Jul '16

Dear Squeakers, I think it is great that VM development is now on GitHub. Congratulations and thank for all the hard work. I saw that there is a download button that points to the latest build artifacts on Bintray. I assume these are not necessarily considered to be stable, or are they? So the latest stable VMs would still be those in http://www.mirandabanda.org/files/Cog/VM/VM.r3732/? Cheers, Bernhard

2 1

Re: [Pharo-dev] [squeak-dev] The .changes file should be bound to a single image
by Max Leske 02 Jul '16

02 Jul '16

It’s nice to see the enthusiasm (both pro and con) on this issue. I just want to clarify that it has nothing to do with a class room setting, where the changes file is being shared or copied so students have access. I have run into the corrupted .changes file problem myself a couple of times for two reasons mainly: a) I’ve done a lot of work but need to check something against code that wasn’t modified (and no, checking package changes in Monticello wouldn’t help in the case I’m thinking of. Imagine for example a huge refactoring across multiple packages). So I open a second copy of the image. I keep both images open because its convenient but at some point I accidentally make a change in the wrong image. Now I’m screwed. b) I forgot that I already had the image running (e.g. minimised). I start a fresh copy and work on it until I realise that some of my method sources are broken. Again: screwed. Another thing I want to mention is that the semantics of flush depend on the operating / file system (I have experienced this first hand between Linux (ext4) and OS X (HSF+)). Just because you’ve flushed you’re buffer doesn’t mean that the contents have actually been written to the file. So while it may be true that there is a #flush missing somewhere I would not expect that adding the #flush will solve the problem entirely (which is one reason for proposing a locking mechanism in the first place). Cheers, Max

1 0

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

01 Jul '16

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2016-June/068243.html Name: Monticello-cmm.634 Ancestors: Monticello-kfr.633 Update client-side Monticello history access. Soon, any properly configured HTTP server can provide MC history, not just trunk. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-July/068244.html Name: SystemChangeNotification-Tests-pre.24 Ancestors: SystemChangeNotification-Tests-nice.23 Fixes system notifcation tests to not polute the existing kernel packages with changes by writing new classes into a temporary package ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-July/068245.html Name: SystemChangeNotification-Tests-pre.25 Ancestors: SystemChangeNotification-Tests-pre.24 Implements clean tests for SystemChangeFileTest and isolates a test in ChangeHooksTest ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-July/068246.html Name: Tests-pre.345 Ancestors: Tests-pre.344 Cleans up after ChangeSetClassChangesTest ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-July/068247.html Name: Traits-pre.307 Ancestors: Traits-eem.306 This fixes http://bugs.squeak.org/view.php?id=7767 which is about the - and @ operator of Trait compositions ignoring brackets. This implementation uses the normal left to right evaluation order of Smalltalk to avoid confusions about the way trait composition expressions are evaluated. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-July/068248.html Name: TraitsTests-pre.15 Ancestors: TraitsTests-nice.14 Updates the Traits tests to reflect the changes to the trait composition operator evaluation order =============================================

1 0

The Trunk: TraitsTests-pre.15.mcz
by commits＠source.squeak.org 01 Jul '16

01 Jul '16

Patrick Rein uploaded a new version of TraitsTests to project The Trunk: http://source.squeak.org/trunk/TraitsTests-pre.15.mcz ==================== Summary ==================== Name: TraitsTests-pre.15 Author: pre Time: 20 November 2015, 3:00:52.59 pm UUID: 3faad7d5-71f7-48d2-9ccb-4162d332c62a Ancestors: TraitsTests-nice.14 Updates the Traits tests to reflect the changes to the trait composition operator evaluation order =============== Diff against TraitsTests-nice.14 =============== Item was changed: ----- Method: ClassTraitTest>>testConflictsAliasesAndExclusions (in category 'testing') ----- testConflictsAliasesAndExclusions "conflict" self t1 classTrait compile: 'm2ClassSide: x ^99' classified: 'mycategory'. self assert: (self t1 classTrait includesLocalSelector: #m2ClassSide:). self assert: (self t5 classTrait >> #m2ClassSide:) isConflict. self assert: (self c2 class >> #m2ClassSide:) isConflict. "exclusion and alias" self assert: self t5 classSide traitComposition asString = 'T1 classTrait + T2 classTrait'. self t5 classSide uses: (self t1 classTrait @ { (#m2ClassSideAlias1: -> #m2ClassSide:) } + + (self t2 classTrait @ { (#m2ClassSideAlias2: -> #m2ClassSide:) } - { #m2ClassSide: })). - + self t2 classTrait) @ { (#m2ClassSideAlias2: -> #m2ClassSide:) } - - { #m2ClassSide: }. self deny: (self t5 classTrait >> #m2ClassSide:) isConflict. self deny: (self c2 class >> #m2ClassSide:) isConflict. self assert: (self c2 m2ClassSideAlias1: 13) = 99. self assert: (self c2 m2ClassSideAlias2: 13) = 13! Item was changed: ----- Method: PureBehaviorTest>>testChangeSuperclass (in category 'testing-applying trait composition') ----- testChangeSuperclass "self run: #testChangeSuperclass" "Test that when the superclass of a class is changed the non-local methods of the class sending super are recompiled to correctly store the new superclass." | aC2 newSuperclass | aC2 := self c2 new. "C1 is current superclass of C2" self assert: aC2 m51. self assert: self c2 superclass == self c1. self deny: (self c2 localSelectors includes: #m51). self deny: (self c2 >> #m52) == (self t5 >> #m52). "no sharing!!" + self assert: self c2 traitCompositionString = '(T5 - {#m11})'. - self assert: self c2 traitCompositionString = 'T5 - {#m11}'. self assert: self c2 selectors sort = #(bar foo m12 m13 m21 m22 m51 m52 m53). self assert: self c2 localSelectors sort = #(bar foo). "change superclass of C2 from C1 to X" newSuperclass := self createClassNamed: #X superclass: Object uses: {}. newSuperclass subclass: self c2 name uses: self c2 traitComposition instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: self c2 category. self assert: self c2 superclass == newSuperclass. newSuperclass compile: 'foo ^17'. self assert: aC2 m51 = 17. self deny: (self c2 localSelectors includes: #m51). self c2 compile: 'm51 ^19'. self assert: aC2 m51 = 19. self deny: (self c2 >> #m52) == (self t5 >> #m52). "no sharing!!" + self assert: self c2 traitCompositionString = '(T5 - {#m11})'. - self assert: self c2 traitCompositionString = 'T5 - {#m11}'. self assert: self c2 selectors sort = #(bar foo m12 m13 m21 m22 m51 m52 m53). self assert: self c2 localSelectors sort = #(bar foo m51). "change superclass of C2 back to C1" self c1 subclass: self c2 name uses: self c2 traitComposition instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: self c2 category. self assert: (aC2 m51 = 19). self assert: self c2 superclass == self c1. self assert: (self c2 localSelectors includes: #m51). self deny: (self c2 >> #m52) == (self t5 >> #m52). "no sharing!!" + self assert: self c2 traitCompositionString = '(T5 - {#m11})'. - self assert: self c2 traitCompositionString = 'T5 - {#m11}'. self assert: self c2 selectors sort = #(bar foo m12 m13 m21 m22 m51 m52 m53). self assert: self c2 localSelectors sort = #(bar foo m51). ! Item was changed: ----- Method: PureBehaviorTest>>testPropagationWhenTraitCompositionModifications (in category 'testing-applying trait composition') ----- testPropagationWhenTraitCompositionModifications "Test that the propagation mechanism works when setting new traitCompositions." self assert: self c2 methodDict size = 9. "2 + (3+(3+2))-1" "removing methods" self createTraitNamed: #T5 + uses: self t1 + (self t2 - { #m21. #m22 }). - uses: self t1 + self t2 - { #m21. #m22 }. self assert: self c2 methodDict size = 7. "adding methods" self createTraitNamed: #T2 uses: self t3. self assert: self c2 methodDict size = 10. self assert: (self c2 methodDict keys includesAllOf: #(#m31 #m32 #m33 ))! Item was changed: ----- Method: PureBehaviorTest>>testReshapeClass (in category 'testing-applying trait composition') ----- testReshapeClass "self run: #testReshapeClass" "Ensure that reshaping a class has no impact on its traits" + self assert: self c2 traitCompositionString = '(T5 - {#m11})'. - self assert: self c2 traitCompositionString = 'T5 - {#m11}'. self assert: self c2 selectors sort = #(bar foo m12 m13 m21 m22 m51 m52 m53). self assert: self c2 localSelectors sort = #(bar foo). self c2 addInstVarName: 'foobar'. + self assert: self c2 traitCompositionString = '(T5 - {#m11})'. - self assert: self c2 traitCompositionString = 'T5 - {#m11}'. self assert: self c2 selectors sort = #(bar foo m12 m13 m21 m22 m51 m52 m53). self assert: self c2 localSelectors sort = #(bar foo). self c2 removeInstVarName: 'foobar'. + self assert: self c2 traitCompositionString = '(T5 - {#m11})'. - self assert: self c2 traitCompositionString = 'T5 - {#m11}'. self assert: self c2 selectors sort = #(bar foo m12 m13 m21 m22 m51 m52 m53). self assert: self c2 localSelectors sort = #(bar foo). ! Item was changed: ----- Method: TraitCompositionTest>>testInvalidComposition (in category 'testing-basic') ----- testInvalidComposition self shouldnt: [self t1 @ { (#a -> #b) } @ { (#x -> #y) }] raise: TraitCompositionException. self shouldnt: [(self t1 + self t2) @ { (#a -> #b) } @ { (#x -> #y) }] raise: TraitCompositionException. self shouldnt: [self t1 - { #a } - { #b }] raise: TraitCompositionException. self shouldnt: [self t1 + self t2 - { #a } - { #b }] raise: TraitCompositionException. self should: [(self t1 - { #x }) @ { (#a -> #b) }] raise: TraitCompositionException. + self should: [(self t1 + (self t2 - { #x } @ { (#a -> #b) }))] - self should: [(self t1 + self t2 - { #x }) @ { (#a -> #b) }] raise: TraitCompositionException. self should: [self t1 + self t1] raise: TraitCompositionException. self should: [(self t1 + self t2) @ { (#a -> #b) } + self t1] raise: TraitCompositionException. self should: [self t1 @ { (#a -> #m11). (#a -> #m12) }] raise: TraitCompositionException. self should: [self t1 @ { (#a -> #m11). (#b -> #a) }] raise: TraitCompositionException! Item was changed: ----- Method: TraitCompositionTest>>testPrinting (in category 'testing-basic') ----- testPrinting | composition1 composition2 | + composition1 := ((self t1 - { #a } + (self t2 @ { (#z -> #c) } - { #b. #c })) + + (self t3 - { #d. #e }) + + (self t4 @ { (#x -> #a). (#y -> #b) })). + composition2 := (self t4 @ { (#x -> #a). (#y -> #b) }) + (self t1 - { #a }) + + (self t3 - { #d. #e }) + + (self t2 - { #b. #c }). - composition1 := ((self t1 - { #a } + self t2) @ { (#z -> #c) } - { #b. #c } - + self t3 - { #d. #e } - + self t4) @ { (#x -> #a). (#y -> #b) }. - composition2 := self t4 @ { (#x -> #a). (#y -> #b) } + self t1 - { #a } - + self t3 - { #d. #e } - + self t2 - { #b. #c }. self assertPrints: composition1 printString + like: '(T1 - {#a}) + ((T2 @ {#z->#c}) - {#b. #c}) + (T3 - {#d. #e}) + (T4 @ {#x->#a. #y->#b})'. - like: 'T1 - {#a} + T2 @ {#z->#c} - {#b. #c} + T3 - {#d. #e} + T4 @ {#x->#a. #y->#b}'. self assertPrints: composition2 printString + like: '(T4 @ {#x->#a. #y->#b}) + (T1 - {#a}) + (T3 - {#d. #e}) + (T2 - {#b. #c})'! - like: 'T4 @ {#x->#a. #y->#b} + T1 - {#a} + T3 - {#d. #e} + T2 - {#b. #c}'! Item was changed: ----- Method: TraitFileOutTest>>setUp (in category 'running') ----- setUp super setUp. SystemOrganization addCategory: self categoryName. td := self createTraitNamed: #TD uses: {}. td compile: 'd' classified: #cat1. tc := self createTraitNamed: #TC uses: td. tc compile: 'c' classified: #cat1. tb := self createTraitNamed: #TB uses: td. tb compile: 'b' classified: #cat1. + ta := self createTraitNamed: #TA uses: tb + ((tc @ {#cc->#c}) - {#c}). - ta := self createTraitNamed: #TA uses: tb + tc @ {#cc->#c} - {#c}. ta compile: 'a' classified: #cat1. ca := self createClassNamed: #CA superclass: Object uses: {}. ca compile: 'ca' classified: #cat1. cb := self createClassNamed: #CB superclass: ca uses: ta. cb compile: 'cb' classified: #cat1. "make the class of cb also use tc:" cb class uses: ta classTrait + tc instanceVariableNames: ''.! Item was changed: ----- Method: TraitFileOutTest>>testFileOutCategory (in category 'testing') ----- testFileOutCategory "File out whole system category, delete all classes and traits and then file them in again." "self run: #testFileOutCategory" SystemOrganization fileOutCategory: self categoryName. SystemOrganization removeSystemCategory: self categoryName. self deny: (Smalltalk globals keys includesAnyOf: #(CA CB TA TB TC TD)). self fileIn: self categoryName , '.st'.. self assert: (Smalltalk globals keys includesAllOf: #(CA CB TA TB TC TD)). ta := Smalltalk at: #TA. self assert: (ta isKindOf: Trait). + self assert: 'TB + ((TC @ {#cc->#c}) - {#c})' equals: ta traitComposition asString. - self assert: 'TB + TC @ {#cc->#c} - {#c}' equals: ta traitComposition asString. self assert: (ta methodDict keys includesAllOf: #(a b cc)). cb := Smalltalk at: #CB. self assert: (cb isKindOf: Class). self assert: 'TA' equals: cb traitComposition asString. self assert: (cb methodDict keys includesAllOf: #(cb a b cc)). "test classSide traitComposition of CB" self assert: 'TA classTrait + TC' equals: cb classSide traitComposition asString. self assert: (cb classSide methodDict keys includesAllOf: #(d c)) ! Item was changed: ----- Method: TraitFileOutTest>>testFileOutTrait (in category 'testing') ----- testFileOutTrait "fileOut trait T6, remove it from system and then file it in again" "self run: #testFileOutTrait" | fileName | self t6 compile: 'localMethod: argument ^argument'. self t6 classSide compile: 'localClassSideMethod: argument ^argument'. self t6 fileOut. fileName := self t6 asString , '.st'. self resourceClassesAndTraits remove: self t6. self t6 removeFromSystem. self fileIn: fileName. self assert: (Smalltalk includesKey: #T6). TraitsResource current t6: (Smalltalk at: #T6). self resourceClassesAndTraits add: self t6. self assert: (self t6 isKindOf: Trait). + self assert: 'T1 + (T2 @ {#m22Alias->#m22})' equals: self t6 traitComposition asString. - self assert: 'T1 + T2 @ {#m22Alias->#m22}' equals: self t6 traitComposition asString. self assert: (self t6 methodDict keys includesAllOf: #( #localMethod: #m11 #m12 #m13 #m21 #m22 #m22Alias )). self assert: 2 equals: self t6 classSide methodDict size. self assert: (self t6 classSide methodDict keys includes: #localClassSideMethod:) description: 'Missing selector #localClassSideMethod:'. self assert: (self t6 classSide methodDict keys includes: #m2ClassSide:) description: 'Missing selector #m2ClassSide:'.! Item was changed: ----- Method: TraitTest>>testPrinting (in category 'testing') ----- testPrinting self assertPrints: self t6 definition like: 'Trait named: #T6 + uses: T1 + (T2 @ {#m22Alias->#m22}) - uses: T1 + T2 @ {#m22Alias->#m22} category: ''TraitsTests-Kernel'''! Item was changed: ----- Method: TraitsResource>>setUp (in category 'as yet unclassified') ----- setUp "Please note, that most tests rely on this setup of traits and classes - and that especially the order of the definitions matters." "SetUpCount := SetUpCount + 1." dirty := false. SystemChangeNotifier uniqueInstance doSilently: [self t1: (self createTraitNamed: #T1 uses: { }). self t1 comment: 'I am the trait T1'. self t2: (self createTraitNamed: #T2 uses: { }). self t2 compile: 'm21 ^21' classified: #cat1. self t2 compile: 'm22 ^22' classified: #cat2. self t2 classSide compile: 'm2ClassSide: a ^a'. self t3: (self createTraitNamed: #T3 uses: { }). self t3 compile: 'm31 ^31' classified: #cat1. self t3 compile: 'm32 ^32' classified: #cat2. self t3 compile: 'm33 ^33' classified: #cat3. self t4: (self createTraitNamed: #T4 uses: { (self t1). (self t2) }). self t4 compile: 'm11 ^41' classified: #catX. "overrides T1>>m11" self t4 compile: 'm42 ^42' classified: #cat2. self t5: (self createTraitNamed: #T5 uses: self t1 + self t2). self t5 compile: 'm51 ^super foo' classified: #cat1. self t5 compile: 'm52 ^ self class bar' classified: #cat1. self t5 compile: 'm53 ^ self class bar' classified: #cat1. self t6: (self createTraitNamed: #T6 + uses: (self t1 + (self t2 @ { (#m22Alias -> #m22) }))). - uses: (self t1 + self t2) @ { (#m22Alias -> #m22) }). self c1: (self createClassNamed: #C1 superclass: Object uses: { }). self c1 compile: 'foo ^true' classified: #accessing. self t1 compile: 'm11 ^11' classified: #cat1. self t1 compile: 'm12 ^12' classified: #cat2. self t1 compile: 'm13 ^self m12' classified: #cat3. self c2: (self createClassNamed: #C2 superclass: self c1 uses: self t5 - { #m11 }). self c2 compile: 'foo ^false' classified: #private. self c2 compile: 'bar ^self foo' classified: #private. self setUpTrivialRequiresFixture. self setUpTwoLevelRequiresFixture. self setUpTranslatingRequiresFixture]. SystemChangeNotifier uniqueInstance notify: self ofAllSystemChangesUsing: #codeChangedEvent:!

1 0

The Trunk: Traits-pre.307.mcz
by commits＠source.squeak.org 01 Jul '16

01 Jul '16

Patrick Rein uploaded a new version of Traits to project The Trunk: http://source.squeak.org/trunk/Traits-pre.307.mcz ==================== Summary ==================== Name: Traits-pre.307 Author: pre Time: 20 November 2015, 2:58:26.562 pm UUID: f0955b2d-775c-4862-85b9-5d6e616cd2e4 Ancestors: Traits-eem.306 This fixes http://bugs.squeak.org/view.php?id=7767 which is about the - and @ operator of Trait compositions ignoring brackets. This implementation uses the normal left to right evaluation order of Smalltalk to avoid confusions about the way trait composition expressions are evaluated. =============== Diff against Traits-eem.306 =============== Item was changed: ----- Method: TraitAlias>>printOn: (in category 'operations') ----- printOn: s "Answer the trait composition string (used for class definitions)" + s nextPutAll: '('. s nextPutAll: subject asString. s nextPutAll: ' @ {'. aliases do:[:assoc| s print: assoc] separatedBy:[s nextPutAll:'. ']. s nextPutAll: '}'. + s nextPutAll: ')'.! - ! Item was changed: ----- Method: TraitComposition>>- (in category 'converting') ----- - anArray - "the modifier operators #@ and #- bind stronger than +. - Thus, #@ or #- sent to a sum will only affect the most right summand" + self updateTraits: (self traitsCollect: [:aTrait | aTrait - anArray ])! - self addLast: (self removeLast - anArray)! Item was changed: ----- Method: TraitComposition>>@ (in category 'converting') ----- @ anArrayOfAssociations + + self updateTraits: (self traitsCollect: [:aTrait | aTrait @ anArrayOfAssociations ])! - "the modifier operators #@ and #- bind stronger than +. - Thus, #@ or #- sent to a sum will only affect the most right summand" - - self addLast: (self removeLast @ anArrayOfAssociations)! Item was added: + ----- Method: TraitComposition>>traitsCollect: (in category 'accessing') ----- + traitsCollect: aBlock + ^self collect: [:each| each traitsDo: aBlock]! Item was changed: ----- Method: TraitComposition>>traitsDo: (in category 'accessing') ----- traitsDo: aBlock + ^self do: [:each| each traitsDo: aBlock]! - ^self do:[:each| each traitsDo: aBlock]! Item was added: + ----- Method: TraitComposition>>updateTraits: (in category 'converting') ----- + updateTraits: aCollection + + self + removeAll; + addAll: aCollection! Item was changed: ----- Method: TraitExclusion>>printOn: (in category 'composition') ----- printOn: aStream "Answer the trait composition string (used for class definitions)" + aStream nextPutAll: '('. aStream nextPutAll: subject asString. aStream nextPutAll: ' - {'. exclusions asArray sort do:[:exc| aStream store: exc] separatedBy:[aStream nextPutAll: '. ']. + aStream nextPutAll: '}'. + aStream nextPutAll: ')'.! - aStream nextPutAll: '}'.!

1 0

Jump to page: