Merge pull request #761 from moosetechnology/speed-up-model-generation

Speed up model generation + clean flags

Author: jecisc

src/Famix-MetamodelBuilder-Core/FamixMetamodelBuilder.class.st

@@ -272,40 +272,26 @@ FamixMetamodelBuilder >> generator: aGenerator [
 
 { #category : #initialization }
 FamixMetamodelBuilder >> getTraitNamed: aSymbol [
-
 	"Check if I contain a trait of this name. If yes, return it. 
-	If I do not contain a trait of this name, check if one of my subMM has a trait of this name. If one is found, return it. If more is found raise an error. If non is found, create a new trait of this name and return it."
+	If no, check if one of my subMM has a trait of this name. If one is found, return it. If more is found raise an error. If non is found, create a new trait of this name and return it."
 
 	| remoteTraits |
-	self flag: #todo. "Maybe we could cache the sub MM entities."
 	remoteTraits := Dictionary new.
-	self allSubBuilders do: [ :builder | 
+	self allSubBuilders do: [ :builder |
 		builder traits
 			detect: [ :each | each name = aSymbol ]
 			ifFound: [ :trait | remoteTraits at: builder put: trait ] ].
-	remoteTraits size = 1 ifTrue: [ 
+	remoteTraits size = 1 ifTrue: [
 		^ remoteTraits values anyOne
 			  isRemote: true;
 			  remoteBuilder: self;
 			  yourself ].
-	remoteTraits size > 1 ifTrue: [ 
-		self error:
-			('Multiple remote traits named {1} where found in sub metamodels. Found in: {2}.
-In order to fix the issue you should use #remoteTrait:withPrefix: in your generator to select yourself the right trait to use. If you want to create an entity of this name in your model and not use the trait of this name from a sub metamodel, declare this trait before referencing it.' 
-				 format: { 
+	remoteTraits size > 1 ifTrue: [
+		self error: ('Multiple remote traits named {1} where found in sub metamodels. Found in: {2}.
+In order to fix the issue you should use #remoteTrait:withPrefix: in your generator to select yourself the right trait to use. If you want to create an entity of this name in your model and not use the trait of this name from a sub metamodel, declare this trait before referencing it.'
+				 format: {
 						 aSymbol.
-						 (', ' join:
-							  (remoteTraits keys collect: [ :builder | 
-								   builder generator asString ])) }) ].
-
-	self flag: #todo. "Cyril: I introduced this warning in the development of Moose 8 to not break every existing generators. We should remove the full detect in the future, for example in the development of Moose 9 (not before!) and revome the warning class."
-	self traits
-		detect: [ :each | each name = aSymbol ]
-		ifFound: [ :trait | 
-			FamixShouldNotUseSymbolsToAccessLocalEntities
-				signalFor: aSymbol
-				from: self generator.
-			^ trait ].
+						 (', ' join: (remoteTraits keys collect: [ :builder | builder generator asString ])) }) ].
 
 	^ self traitNamed: aSymbol
 ]

src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st

@@ -33,6 +33,14 @@ FmxMBBehavior >> <|-- anObject [
 	^ anObject
 ]
 
+{ #category : #accessing }
+FmxMBBehavior >> addAllTransitiveTraitsIn: aCollection [
+
+	aCollection add: self.
+	self allLocalTraits do: [ :trait | trait addAllTransitiveTraitsIn: aCollection ].
+	^ aCollection
+]
+
 { #category : #accessing }
 FmxMBBehavior >> addRelation: aRelation with: anotherClass [
 
@@ -92,9 +100,8 @@ FmxMBBehavior >> allTraitNames [
 
 { #category : #accessing }
 FmxMBBehavior >> allTransitiveTraits [
-	^ (Set with: self)
-		addAll: (self allLocalTraits flatCollect: [ :trait | trait allTransitiveTraits ]);
-		yourself
+
+	^ self addAllTransitiveTraitsIn: Set new
 ]
 
 { #category : #converting }