The Trunk: Monticello-eem.673.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Monticello-eem.673.mcz

commits-2
Eliot Miranda uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-eem.673.mcz

==================== Summary ====================

Name: Monticello-eem.673
Author: eem
Time: 9 August 2017, 10:07:15.978716 am
UUID: 38e0acab-e610-4613-8483-63a2b9c34a12
Ancestors: Monticello-dtl.672

No longer hard-code the typeOfClass for compiled code MCClassDefinitions.  Instead trust the typeSymbol argument.

=============== Diff against Monticello-dtl.672 ===============

Item was changed:
  ----- Method: MCClassDefinition>>initializeWithName:superclassName:category:instVarNames:classVarNames:poolDictionaryNames:classInstVarNames:type:comment:commentStamp: (in category 'initializing') -----
  initializeWithName: nameString
  superclassName: superclassString
  category: categoryString
  instVarNames: ivarArray
  classVarNames: cvarArray
  poolDictionaryNames: poolArray
  classInstVarNames: civarArray
  type: typeSymbol
  comment: commentString
  commentStamp: stampStringOrNil
  name := nameString asSymbol.
  superclassName := superclassString ifNil: ['nil'] ifNotNil: [superclassString asSymbol].
  category := categoryString.
+ type := typeSymbol.
- (self isCompiledCode: name) ifTrue: [type := #compiledMethod] ifFalse: [type := typeSymbol].
  comment := commentString withSqueakLineEndings.
  commentStamp := stampStringOrNil ifNil: [self defaultCommentStamp].
  variables := OrderedCollection  new.
  self addVariables: ivarArray ofType: MCInstanceVariableDefinition.
  self addVariables: cvarArray sorted ofType: MCClassVariableDefinition.
  self addVariables: poolArray sorted ofType: MCPoolImportDefinition.
+ self addVariables: civarArray ofType: MCClassInstanceVariableDefinition!
- self addVariables: civarArray ofType: MCClassInstanceVariableDefinition.!

Item was changed:
  ----- Method: MCClassDefinition>>initializeWithName:superclassName:traitComposition:classTraitComposition:category:instVarNames:classVarNames:poolDictionaryNames:classInstVarNames:type:comment:commentStamp: (in category 'initializing') -----
  initializeWithName: nameString
  superclassName: superclassString
  traitComposition: traitCompositionString
  classTraitComposition: classTraitCompositionString
  category: categoryString
  instVarNames: ivarArray
  classVarNames: cvarArray
  poolDictionaryNames: poolArray
  classInstVarNames: civarArray
  type: typeSymbol
  comment: commentString
  commentStamp: stampStringOrNil
  name := nameString asSymbol.
  superclassName := superclassString ifNil: ['nil'] ifNotNil: [superclassString asSymbol].
  traitComposition := traitCompositionString.
  classTraitComposition := classTraitCompositionString.
  category := categoryString.
+ type := typeSymbol.
- (self isCompiledCode: name) ifTrue: [type := #compiledMethod] ifFalse: [type := typeSymbol].
  comment := commentString withSqueakLineEndings.
  commentStamp := stampStringOrNil ifNil: [self defaultCommentStamp].
  variables := OrderedCollection  new.
  self addVariables: ivarArray ofType: MCInstanceVariableDefinition.
  self addVariables: cvarArray sorted ofType: MCClassVariableDefinition.
  self addVariables: poolArray sorted ofType: MCPoolImportDefinition.
+ self addVariables: civarArray ofType: MCClassInstanceVariableDefinition!
- self addVariables: civarArray ofType: MCClassInstanceVariableDefinition.!

Item was removed:
- ----- Method: MCClassDefinition>>isCompiledCode: (in category 'initializing') -----
- isCompiledCode: className
- "Classes of type #compiledMethod are treated specially. CompiledCode
- and all of its subclasses, including CompiledMethod, should have this
- special type."
-
- CompiledCode
- withAllSubclassesDo: [ :cls | (className = cls name)
- ifTrue: [ ^true ]].
- ^ false
- !