Merge pull request #46 from moosetechnology/traitConflict

Fix the trait conflict occurs in `FamixF77ProgramFile`
moosetechnology · May 31, 2024 · 1b0df7a · 1b0df7a
2 parents 2ef9ad2 + 9760de0
commit 1b0df7a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/src/Famix-Fortran77-Entities/FamixF77Entity.class.st b/src/Famix-Fortran77-Entities/FamixF77Entity.class.st
@@ -49,6 +49,13 @@ FamixF77Entity >> isBehavioural [
 	^ false
 ]
 
+{ #category : #testing }
+FamixF77Entity >> isFileAnchor [
+
+	<generated>
+	^ false
+]
+
 { #category : #testing }
 FamixF77Entity >> isInvocation [
 
@@ -63,6 +70,13 @@ FamixF77Entity >> isLocalVariable [
 	^ false
 ]
 
+{ #category : #testing }
+FamixF77Entity >> isNamedEntity [
+
+	<generated>
+	^ false
+]
+
 { #category : #testing }
 FamixF77Entity >> isQueryable [
 

diff --git a/src/Famix-Fortran77-Entities/FamixF77NamedEntity.class.st b/src/Famix-Fortran77-Entities/FamixF77NamedEntity.class.st
@@ -31,3 +31,10 @@ FamixF77NamedEntity class >> isAbstract [
 	<generated>
 	^ self == FamixF77NamedEntity
 ]
+
+{ #category : #testing }
+FamixF77NamedEntity >> isNamedEntity [
+
+	<generated>
+	^ true
+]
diff --git a/src/Famix-Fortran77-Entities/FamixF77ProgramFile.class.st b/src/Famix-Fortran77-Entities/FamixF77ProgramFile.class.st
@@ -35,12 +35,12 @@ a fortran file
 Class {
 	#name : #FamixF77ProgramFile,
 	#superclass : #FamixF77NamedEntity,
-	#traits : 'FamixTCompilationUnit + FamixTSourceEntity + TEntityMetaLevelDependency',
+	#traits : 'FamixTCompilationUnit + (FamixTSourceEntity - {#sourceText}) + TEntityMetaLevelDependency',
 	#classTraits : 'FamixTCompilationUnit classTrait + FamixTSourceEntity classTrait + TEntityMetaLevelDependency classTrait',
 	#instVars : [
-		'#version => FMProperty',
 		'#filename => FMProperty',
-		'#programUnits => FMMany type: #FamixF77ProgramUnit opposite: #programFile'
+		'#programUnits => FMMany type: #FamixF77ProgramUnit opposite: #programFile',
+		'#version => FMProperty'
 	],
 	#category : #'Famix-Fortran77-Entities-Entities'
 }

diff --git a/src/Famix-Fortran77-Generator/FamixFortran77Generator.class.st b/src/Famix-Fortran77-Generator/FamixFortran77Generator.class.st
@@ -216,9 +216,9 @@ FamixFortran77Generator >> defineHierarchy [
 	parameter --|> #TParameter.
 
 	programFile --|> namedEntity.
+	programFile inheritsFromTrait: #TSourceEntity without: { #sourceText }.
 	programFile --|> #TCompilationUnit.
 	programFile --|> #TEntityMetaLevelDependency.
-	programFile --|> #TSourceEntity.
 
 	programUnit --|> namedEntity.
 	programUnit --|> #TSourceEntity.