Nicolas Cellier uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-nice.330.mcz ==================== Summary ==================== Name: Monticello-nice.330 Author: nice Time: 31 October 2009, 1:55:51 am UUID: ff29814c-6499-4bf1-acaf-f54d31ab3582 Ancestors: Monticello-nice.329 Add a protection in order to be able to evaluate (MCDefinition classPool at: #Instances) inspect. While at it, changed some and: [] and: [] into and: [ and: []] I do not see what the former brings but downspeed. =============== Diff against Monticello-nice.329 =============== Item was changed: ----- Method: MCClassTraitDefinition>>= (in category 'accessing') ----- = aDefinition ^ (super = aDefinition) + and: [baseTrait = aDefinition baseTrait + and: [self classTraitCompositionString = aDefinition classTraitCompositionString]] - and: [baseTrait = aDefinition baseTrait] - and: [self classTraitCompositionString = aDefinition classTraitCompositionString] ! Item was changed: ----- Method: MCDefinition>>= (in category 'comparing') ----- = aDefinition + ^(aDefinition isKindOf: MCDefinition) and: [self isRevisionOf: aDefinition]! - ^ self isRevisionOf: aDefinition! Item was changed: ----- Method: MCClassDefinition>>= (in category 'visiting') ----- = aDefinition + ^(super = aDefinition) + and: [superclassName = aDefinition superclassName + and: [self traitCompositionString = aDefinition traitCompositionString + and: [self classTraitCompositionString = aDefinition classTraitCompositionString + and: [category = aDefinition category + and: [type = aDefinition type + and: [self sortedVariables = aDefinition sortedVariables + and: [comment = aDefinition comment]]]]]]]! - ^((super = aDefinition) - and: [superclassName = aDefinition superclassName] - and: [self traitCompositionString = aDefinition traitCompositionString] - and: [self classTraitCompositionString = aDefinition classTraitCompositionString]) - and: [category = aDefinition category] - and: [type = aDefinition type] - and: [self sortedVariables = aDefinition sortedVariables] - and: [comment = aDefinition comment] - ! Item was changed: ----- Method: MCTraitDefinition>>= (in category 'visiting') ----- = aDefinition self flag: #traits. "Ugly we harcoded the super superclass method. We will have to refactor the definition hierarchy" + ^ (aDefinition isKindOf: MCDefinition) + and: [(self isRevisionOf: aDefinition) + and: [self traitCompositionString = aDefinition traitCompositionString + and: [category = aDefinition category + and: [comment = aDefinition comment]]]]! - ^ (self isRevisionOf: aDefinition) - and: [self traitCompositionString = aDefinition traitCompositionString] - and: [category = aDefinition category] - and: [comment = aDefinition comment]! Item was changed: ----- Method: MCMethodDefinition>>= (in category 'comparing') ----- = aDefinition ^(super = aDefinition) + and: [aDefinition source = self source + and: [aDefinition category = self category + and: [aDefinition timeStamp = self timeStamp]]]! - and: [aDefinition source = self source] - and: [aDefinition category = self category] - and: [aDefinition timeStamp = self timeStamp]! |
Free forum by Nabble | Edit this page |