Skip to content

Commit 35bc48c

Browse files
ClotildeToullecClotildeToullec
authored
Merge pull request #893 from moosetechnology/generator-cleaning
Associate visitor generation to the generator.
2 parents bc822c8 + 406cc90 commit 35bc48c

File tree

190 files changed

+1926
-2273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+1926
-2273
lines changed

‎src/BaselineOfFamix/BaselineOfFamix.class.st

+3-2
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,9 @@ BaselineOfFamix >> packages: spec [
159159
package: 'Moose-Query-Extensions' with: [ spec requires: #( 'Moose-Query' 'BasicTraits' ) ];
160160
package: 'Famix-Traits' with: [ spec requires: #( 'Moose-Core' ) ];
161161
package: 'Famix-Visitor' with: [ spec requires: #( 'Famix-Traits' ) ];
162+
package: 'Famix-Visitor-Generation' with: [ spec requires: #( 'Famix-MetamodelBuilder-Core' ) ];
162163
package: 'Famix-MetamodelBuilder-Core' with: [ spec requires: #( 'Moose-Core' 'SingularizePluralize' ) ];
163-
package: 'Famix-MetamodelGeneration' with: [ spec requires: #( 'Famix-MetamodelBuilder-Core' ) ];
164+
package: 'Famix-MetamodelGeneration' with: [ spec requires: #( 'Famix-MetamodelBuilder-Core' 'Famix-Visitor-Generation' ) ];
164165
package: 'Famix-Visualizations' with: [ spec requires: #( 'Famix-Traits' 'Fame' 'Moose-Core' ) ];
165166
package: 'Famix-BasicInfrastructure' with: [ spec requires: #( 'Famix-MetamodelGeneration' ) ];
166167
package: 'Famix-Smalltalk-Utils' with: [ spec requires: #( 'Moose-Core' ) ];
@@ -173,7 +174,7 @@ BaselineOfFamix >> packages: spec [
173174
spec requires:
174175
#( 'Famix-PharoSmalltalk-Entities' 'Moose-SmalltalkImporter-Core-Tests' 'PackageBlueprintTestResources' 'Moose-TestResources-LCOM'
175176
'KGBTestResources' ) ];
176-
package: 'Famix-Java-Generator' with: [ spec requires: #( 'Basic' ) ];
177+
package: 'Famix-Java-Generator' with: [ spec requires: #( 'Basic' 'Famix-Visitor-Generation' ) ];
177178
package: 'Famix-Java-Entities' with: [ spec requires: #( 'BasicTraits' ) ];
178179
package: 'Famix-Java-Visitor' with: [ spec requires: #( 'Famix-Java-Entities' ) ];
179180
package: 'Famix-Java-Fusionner' with: [ spec requires: #( 'Famix-Java-Visitor' ) ];

‎src/Famix-Java-Fusionner/FamixFusionnerJava.class.st

+19-21
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Not: This is not a real visitor, it uses trait `FamixJavaVisitor` for the double
1919
Class {
2020
#name : #FamixFusionnerJava,
2121
#superclass : #Object,
22-
#traits : 'FamixJavaVisitor',
23-
#classTraits : 'FamixJavaVisitor classTrait',
22+
#traits : 'FamixJavaTVisitor',
23+
#classTraits : 'FamixJavaTVisitor classTrait',
2424
#instVars : [
2525
'resourceModel',
2626
'consumerModel',
@@ -29,15 +29,6 @@ Class {
2929
#category : #'Famix-Java-Fusionner'
3030
}
3131

32-
{ #category : #'visiting - traits' }
33-
FamixFusionnerJava >> acceptMeIfNotNil: aFamixEntity [
34-
"This is not a real visitor, the #accept: methods are used for double-dispatch
35-
so no visting of entities relations"
36-
37-
"^aFamixEntity ifNil: [ nil ] ifNotNil: [ aFamixEntity accept: self ]"
38-
39-
]
40-
4132
{ #category : #accessing }
4233
FamixFusionnerJava >> consumerModel [
4334

@@ -102,6 +93,22 @@ FamixFusionnerJava >> resourceModel: anObject [
10293
resourceModel := anObject
10394
]
10495

96+
{ #category : #visiting }
97+
FamixFusionnerJava >> visitCollection: aCollection [
98+
"This is not a real visitor, the #accept: methods are used for double-dispatch
99+
so no visting of entities relations - N.Anquetil - Initially comment for #visitList:"
100+
101+
102+
]
103+
104+
{ #category : #visiting }
105+
FamixFusionnerJava >> visitEntity: aFamixEntity [
106+
"This is not a real visitor, the #accept: methods are used for double-dispatch
107+
so no visting of entities relations - N.Anquetil - Initially comment for #acceptMeIfNotNil:"
108+
109+
110+
]
111+
105112
{ #category : #'visiting - traits' }
106113
FamixFusionnerJava >> visitFamixTAccessible: aFamixTAccessible [
107114
"#visitList: does not do anything, so must reimplement it here"
@@ -235,7 +242,7 @@ FamixFusionnerJava >> visitFamixTType: aFamixTType [
235242
self visitFamixTNamedEntity: aFamixTType.
236243
self visitFamixTReferenceable: aFamixTType.
237244
self visitTEntityMetaLevelDependency: aFamixTType.
238-
self acceptMeIfNotNil: aFamixTType typeContainer.
245+
self visitEntity: aFamixTType typeContainer.
239246
"self visitList: aFamixTType typedEntities."
240247

241248
aFamixTType typedEntities copy
@@ -253,12 +260,3 @@ FamixFusionnerJava >> visitFamixTWithInheritances: aFamixTWithInheritances [
253260
do: [ :inheritance | self visitFamixTAssociation: inheritance ]
254261

255262
]
256-
257-
{ #category : #'visiting - traits' }
258-
FamixFusionnerJava >> visitList: aCollection [
259-
"This is not a real visitor, the #accept: methods are used for double-dispatch
260-
so no visting of entities relations"
261-
262-
"^aCollection collect: [ :each | each accept: self ]"
263-
264-
]

‎src/Famix-Java-Generator/FamixJavaGenerator.class.st

+12
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,24 @@ Class {
5252
#category : #'Famix-Java-Generator'
5353
}
5454

55+
{ #category : #'additional tools' }
56+
FamixJavaGenerator class >> metamodelToolGenerators [
57+
58+
^ { FamixVisitorGenerator }
59+
]
60+
5561
{ #category : #accessing }
5662
FamixJavaGenerator class >> packageName [
5763

5864
^ #'Famix-Java-Entities'
5965
]
6066

67+
{ #category : #accessing }
68+
FamixJavaGenerator class >> packageNameForVisitor [
69+
70+
^ #'Famix-Java-Visitor'
71+
]
72+
6173
{ #category : #accessing }
6274
FamixJavaGenerator class >> prefix [
6375

‎src/Famix-Java-Visitor/FamixJavaAccess.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaAccess }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaAccess >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaAccess: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaAccess: self
98
]

‎src/Famix-Java-Visitor/FamixJavaAnnotationInstance.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaAnnotationInstance }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaAnnotationInstance >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaAnnotationInstance: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaAnnotationInstance: self
98
]

‎src/Famix-Java-Visitor/FamixJavaAnnotationInstanceAttribute.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaAnnotationInstanceAttribute }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaAnnotationInstanceAttribute >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaAnnotationInstanceAttribute: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaAnnotationInstanceAttribute: self
98
]

‎src/Famix-Java-Visitor/FamixJavaAnnotationType.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaAnnotationType }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaAnnotationType >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaAnnotationType: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaAnnotationType: self
98
]

‎src/Famix-Java-Visitor/FamixJavaAnnotationTypeAttribute.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaAnnotationTypeAttribute }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaAnnotationTypeAttribute >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaAnnotationTypeAttribute: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaAnnotationTypeAttribute: self
98
]

‎src/Famix-Java-Visitor/FamixJavaAttribute.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaAttribute }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaAttribute >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaAttribute: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaAttribute: self
98
]

‎src/Famix-Java-Visitor/FamixJavaClass.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaClass }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaClass >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaClass: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaClass: self
98
]

‎src/Famix-Java-Visitor/FamixJavaComment.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaComment }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaComment >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaComment: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaComment: self
98
]

‎src/Famix-Java-Visitor/FamixJavaConcretization.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaConcretization }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaConcretization >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaConcretization: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaConcretization: self
98
]

‎src/Famix-Java-Visitor/FamixJavaContainerEntity.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaContainerEntity }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaContainerEntity >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaContainerEntity: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaContainerEntity: self
98
]

‎src/Famix-Java-Visitor/FamixJavaEntity.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaEntity }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaEntity >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaEntity: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaEntity: self
98
]

‎src/Famix-Java-Visitor/FamixJavaEnum.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaEnum }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaEnum >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaEnum: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaEnum: self
98
]

‎src/Famix-Java-Visitor/FamixJavaEnumValue.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaEnumValue }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaEnumValue >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaEnumValue: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaEnumValue: self
98
]

‎src/Famix-Java-Visitor/FamixJavaException.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaException }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaException >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaException: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaException: self
98
]

‎src/Famix-Java-Visitor/FamixJavaImplementation.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaImplementation }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaImplementation >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaImplementation: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaImplementation: self
98
]

‎src/Famix-Java-Visitor/FamixJavaImplicitVariable.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaImplicitVariable }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaImplicitVariable >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaImplicitVariable: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaImplicitVariable: self
98
]

‎src/Famix-Java-Visitor/FamixJavaImport.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaImport }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaImport >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaImport: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaImport: self
98
]

‎src/Famix-Java-Visitor/FamixJavaImportingContext.extension.st

-9
This file was deleted.

‎src/Famix-Java-Visitor/FamixJavaIndexedFileAnchor.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaIndexedFileAnchor }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaIndexedFileAnchor >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaIndexedFileAnchor: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaIndexedFileAnchor: self
98
]

‎src/Famix-Java-Visitor/FamixJavaInheritance.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaInheritance }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaInheritance >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaInheritance: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaInheritance: self
98
]

‎src/Famix-Java-Visitor/FamixJavaInterface.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaInterface }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaInterface >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaInterface: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaInterface: self
98
]

‎src/Famix-Java-Visitor/FamixJavaInvocation.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaInvocation }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaInvocation >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaInvocation: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaInvocation: self
98
]

‎src/Famix-Java-Visitor/FamixJavaLocalVariable.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaLocalVariable }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaLocalVariable >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaLocalVariable: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaLocalVariable: self
98
]

‎src/Famix-Java-Visitor/FamixJavaMethod.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaMethod }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaMethod >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaMethod: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaMethod: self
98
]

‎src/Famix-Java-Visitor/FamixJavaNamedEntity.extension.st

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Extension { #name : #FamixJavaNamedEntity }
22

33
{ #category : #'*Famix-Java-Visitor' }
44
FamixJavaNamedEntity >> accept: aVisitor [
5-
<generated>
6-
7-
^ aVisitor visitFamixJavaNamedEntity: self.
85

6+
<generated>
7+
^ aVisitor visitFamixJavaNamedEntity: self
98
]

0 commit comments

Comments
 (0)