Skip to content

Commit ff4865f

Browse files
jeciscjecisc
authored
Merge pull request #750 from moosetechnology/606-Generator-adds-FamixXyzUnknownSourceLanguage-for-any-Xyz-language
Fix #606: Remove UnknownSourceLanguage
2 parents 767bfe9 + fe06191 commit ff4865f

27 files changed

+3
-459
lines changed

‎src/Famix-BasicInfrastructure/FamixBasicInfrastructureGenerator.class.st

+2-7
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ Class {
88
'#sourcedEntity',
99
'#comment',
1010
'#namedEntity',
11-
'#sourceTextAnchor',
12-
'#unknownSourceLanguage'
11+
'#sourceTextAnchor'
1312
],
1413
#category : #'Famix-BasicInfrastructure'
1514
}
@@ -30,7 +29,6 @@ FamixBasicInfrastructureGenerator >> defineClasses [
3029

3130
sourceAnchor := builder newAbstractClassNamed: #SourceAnchor.
3231
sourceLanguage := builder newClassNamed: #SourceLanguage.
33-
unknownSourceLanguage := builder newClassNamed: #UnknownSourceLanguage.
3432
sourcedEntity := builder newAbstractClassNamed: #SourcedEntity.
3533
comment := builder newClassNamed: #Comment.
3634
namedEntity := builder newAbstractClassNamed: #NamedEntity.
@@ -53,8 +51,5 @@ FamixBasicInfrastructureGenerator >> defineHierarchy [
5351
namedEntity --|> #TNamedEntity.
5452

5553
sourceTextAnchor --|> sourceAnchor.
56-
sourceTextAnchor --|> #THasImmediateSource.
57-
58-
unknownSourceLanguage --|> sourceLanguage.
59-
unknownSourceLanguage --|> #TUnknownSourceLanguage
54+
sourceTextAnchor --|> #THasImmediateSource
6055
]

‎src/Famix-Java-Entities/FamixJavaImportingContext.class.st

-14
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,6 @@ FamixJavaImportingContext >> importType [
246246
^ self importConcreteEntity: (self class fm3ClassNamed: #Type)
247247
]
248248

249-
{ #category : #importing }
250-
FamixJavaImportingContext >> importUnknownSourceLanguage [
251-
252-
<generated>
253-
^ self importConcreteEntity: (self class fm3ClassNamed: #UnknownSourceLanguage)
254-
]
255-
256249
{ #category : #importing }
257250
FamixJavaImportingContext >> importUnknownVariable [
258251

@@ -498,13 +491,6 @@ FamixJavaImportingContext >> shouldImportType [
498491
^ self shouldImport: #Type
499492
]
500493

501-
{ #category : #testing }
502-
FamixJavaImportingContext >> shouldImportUnknownSourceLanguage [
503-
504-
<generated>
505-
^ self shouldImport: #UnknownSourceLanguage
506-
]
507-
508494
{ #category : #testing }
509495
FamixJavaImportingContext >> shouldImportUnknownVariable [
510496

‎src/Famix-Java-Entities/FamixJavaTEntityCreator.trait.st

-7
Original file line numberDiff line numberDiff line change
@@ -347,13 +347,6 @@ FamixJavaTEntityCreator >> newTypeNamed: aName [
347347
^ self add: (FamixJavaType named: aName)
348348
]
349349

350-
{ #category : #'entity creation' }
351-
FamixJavaTEntityCreator >> newUnknownSourceLanguage [
352-
353-
<generated>
354-
^ self add: FamixJavaUnknownSourceLanguage new
355-
]
356-
357350
{ #category : #'entity creation' }
358351
FamixJavaTEntityCreator >> newUnknownVariable [
359352

‎src/Famix-Java-Entities/FamixJavaUnknownSourceLanguage.class.st

-38
This file was deleted.

‎src/Famix-MetamodelGeneration/FamixGenerator.class.st

-5
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ Class {
5656
'tTypeAlias',
5757
'tTypedAnnotationInstance',
5858
'tTypedAnnotationInstanceAttribute',
59-
'tUnknownSourceLanguage',
6059
'tWithAccesses',
6160
'tWithAnnotationInstanceAttributes',
6261
'tWithAnnotationInstances',
@@ -1081,8 +1080,6 @@ FamixGenerator >> defineHierarchy [
10811080
tType --|> #TEntityMetaLevelDependency.
10821081
tType --|> tSourceEntity.
10831082

1084-
tUnknownSourceLanguage --|> tSourceLanguage.
1085-
10861083
tUnknownVariable --|> tStructuralEntity.
10871084

10881085
tWithClasses --|> tWithTypes.
@@ -1771,8 +1768,6 @@ FamixGenerator >> defineTraits [
17711768
tTypedEntity := builder newTraitNamed: #TTypedEntity.
17721769
tTypedEntity comment: self commentForTTypedStructure.
17731770

1774-
tUnknownSourceLanguage := builder newTraitNamed: #TUnknownSourceLanguage.
1775-
17761771
tUnknownVariable := builder newTraitNamed: #TUnknownVariable.
17771772

17781773
tWithAccesses := builder newTraitNamed: #TWithAccesses.

‎src/Famix-PharoSmalltalk-Entities/FamixStImportingContext.class.st

-14
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,6 @@ FamixStImportingContext >> importSourceTextAnchor [
162162
^ self importConcreteEntity: (self class fm3ClassNamed: #SourceTextAnchor)
163163
]
164164

165-
{ #category : #importing }
166-
FamixStImportingContext >> importUnknownSourceLanguage [
167-
168-
<generated>
169-
^ self importConcreteEntity: (self class fm3ClassNamed: #UnknownSourceLanguage)
170-
]
171-
172165
{ #category : #importing }
173166
FamixStImportingContext >> importUnknownVariable [
174167

@@ -323,13 +316,6 @@ FamixStImportingContext >> shouldImportSourceTextAnchor [
323316
^ self shouldImport: #SourceTextAnchor
324317
]
325318

326-
{ #category : #testing }
327-
FamixStImportingContext >> shouldImportUnknownSourceLanguage [
328-
329-
<generated>
330-
^ self shouldImport: #UnknownSourceLanguage
331-
]
332-
333319
{ #category : #testing }
334320
FamixStImportingContext >> shouldImportUnknownVariable [
335321

‎src/Famix-PharoSmalltalk-Entities/FamixStTEntityCreator.trait.st

-7
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,6 @@ FamixStTEntityCreator >> newSourceTextAnchor [
235235
^ self add: FamixStSourceTextAnchor new
236236
]
237237

238-
{ #category : #'entity creation' }
239-
FamixStTEntityCreator >> newUnknownSourceLanguage [
240-
241-
<generated>
242-
^ self add: FamixStUnknownSourceLanguage new
243-
]
244-
245238
{ #category : #'entity creation' }
246239
FamixStTEntityCreator >> newUnknownVariable [
247240

‎src/Famix-PharoSmalltalk-Entities/FamixStUnknownSourceLanguage.class.st

-33
This file was deleted.

‎src/Famix-Test1-Entities/FamixTest1ImportingContext.class.st

-14
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,6 @@ FamixTest1ImportingContext >> importSourceTextAnchor [
9999
^ self importConcreteEntity: (self class fm3ClassNamed: #SourceTextAnchor)
100100
]
101101

102-
{ #category : #importing }
103-
FamixTest1ImportingContext >> importUnknownSourceLanguage [
104-
105-
<generated>
106-
^ self importConcreteEntity: (self class fm3ClassNamed: #UnknownSourceLanguage)
107-
]
108-
109102
{ #category : #testing }
110103
FamixTest1ImportingContext >> shouldImportAssociation [
111104

@@ -189,10 +182,3 @@ FamixTest1ImportingContext >> shouldImportSourceTextAnchor [
189182
<generated>
190183
^ self shouldImport: #SourceTextAnchor
191184
]
192-
193-
{ #category : #testing }
194-
FamixTest1ImportingContext >> shouldImportUnknownSourceLanguage [
195-
196-
<generated>
197-
^ self shouldImport: #UnknownSourceLanguage
198-
]

‎src/Famix-Test1-Entities/FamixTest1TEntityCreator.trait.st

-7
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,3 @@ FamixTest1TEntityCreator >> newSourceTextAnchor [
122122
<generated>
123123
^ self add: FamixTest1SourceTextAnchor new
124124
]
125-
126-
{ #category : #'entity creation' }
127-
FamixTest1TEntityCreator >> newUnknownSourceLanguage [
128-
129-
<generated>
130-
^ self add: FamixTest1UnknownSourceLanguage new
131-
]

‎src/Famix-Test1-Entities/FamixTest1UnknownSourceLanguage.class.st

-28
This file was deleted.

‎src/Famix-Test2-Entities/FamixTest2TEntityCreator.trait.st

-7
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,3 @@ FamixTest2TEntityCreator >> newSourceTextAnchor [
5959
<generated>
6060
^ self add: FamixTest2SourceTextAnchor new
6161
]
62-
63-
{ #category : #'entity creation' }
64-
FamixTest2TEntityCreator >> newUnknownSourceLanguage [
65-
66-
<generated>
67-
^ self add: FamixTest2UnknownSourceLanguage new
68-
]

‎src/Famix-Test2-Entities/FamixTest2UnknownSourceLanguage.class.st

-28
This file was deleted.

‎src/Famix-Test3-Entities/FamixTest3TEntityCreator.trait.st

-7
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,3 @@ FamixTest3TEntityCreator >> newTypeNamed: aName [
143143
<generated>
144144
^ self add: (FamixTest3Type named: aName)
145145
]
146-
147-
{ #category : #'entity creation' }
148-
FamixTest3TEntityCreator >> newUnknownSourceLanguage [
149-
150-
<generated>
151-
^ self add: FamixTest3UnknownSourceLanguage new
152-
]

‎src/Famix-Test3-Entities/FamixTest3UnknownSourceLanguage.class.st

-28
This file was deleted.

‎src/Famix-Test6-Entities/FamixTest6TEntityCreator.trait.st

-7
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,3 @@ FamixTest6TEntityCreator >> newSpam [
5252
<generated>
5353
^ self add: FamixTest6Spam new
5454
]
55-
56-
{ #category : #'entity creation' }
57-
FamixTest6TEntityCreator >> newUnknownSourceLanguage [
58-
59-
<generated>
60-
^ self add: FamixTest6UnknownSourceLanguage new
61-
]

‎src/Famix-Test6-Entities/FamixTest6UnknownSourceLanguage.class.st

-28
This file was deleted.

0 commit comments

Comments
 (0)