removing "Fortran" from TFortranUnary and BinaryExpression

moosetechnology · Sep 12, 2023 · 7e6d85b · 7e6d85b
1 parent a4e86e9
commit 7e6d85b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/src/FAST-Fortran-Entities/FASTFortranBinaryExpression.class.st b/src/FAST-Fortran-Entities/FASTFortranBinaryExpression.class.st
@@ -4,11 +4,11 @@ a Fortran Binary Expression (arithmetic, logical)
 Class {
 	#name : #FASTFortranBinaryExpression,
 	#superclass : #FASTFortranEntity,
-	#traits : 'FASTFortranTExpression + FASTFortranTFortranBinaryExpression',
-	#classTraits : 'FASTFortranTExpression classTrait + FASTFortranTFortranBinaryExpression classTrait',
+	#traits : 'FASTFortranTBinaryExpression + FASTFortranTExpression',
+	#classTraits : 'FASTFortranTBinaryExpression classTrait + FASTFortranTExpression classTrait',
 	#instVars : [
-		'#operator => FMProperty',
 		'#left => FMOne type: #FASTFortranTExpression opposite: #parentExpression',
+		'#operator => FMProperty',
 		'#right => FMOne type: #FASTFortranTExpression opposite: #parentExpression'
 	],
 	#category : #'FAST-Fortran-Entities-Entities'

diff --git a/...TFortranTFortranBinaryExpression.trait.st → ...ies/FASTFortranTBinaryExpression.trait.st b/...TFortranTFortranBinaryExpression.trait.st → ...ies/FASTFortranTBinaryExpression.trait.st
@@ -2,14 +2,14 @@
 I represent a fortran binary expression
 "
 Trait {
-	#name : #FASTFortranTFortranBinaryExpression,
+	#name : #FASTFortranTBinaryExpression,
 	#category : #'FAST-Fortran-Entities-Traits'
 }
 
 { #category : #meta }
-FASTFortranTFortranBinaryExpression classSide >> annotation [
+FASTFortranTBinaryExpression classSide >> annotation [
 
-	<FMClass: #TFortranBinaryExpression super: #Object>
+	<FMClass: #TBinaryExpression super: #Object>
 	<package: #'FAST-Fortran-Entities'>
 	<generated>
 	^ self

diff --git a/...STFortranTFortranUnaryExpression.trait.st → ...ties/FASTFortranTUnaryExpression.trait.st b/...STFortranTFortranUnaryExpression.trait.st → ...ties/FASTFortranTUnaryExpression.trait.st
@@ -2,14 +2,14 @@
 I represent a fortran unary expression
 "
 Trait {
-	#name : #FASTFortranTFortranUnaryExpression,
+	#name : #FASTFortranTUnaryExpression,
 	#category : #'FAST-Fortran-Entities-Traits'
 }
 
 { #category : #meta }
-FASTFortranTFortranUnaryExpression classSide >> annotation [
+FASTFortranTUnaryExpression classSide >> annotation [
 
-	<FMClass: #TFortranUnaryExpression super: #Object>
+	<FMClass: #TUnaryExpression super: #Object>
 	<package: #'FAST-Fortran-Entities'>
 	<generated>
 	^ self

diff --git a/src/FAST-Fortran-Entities/FASTFortranUnaryExpression.class.st b/src/FAST-Fortran-Entities/FASTFortranUnaryExpression.class.st
@@ -4,11 +4,11 @@ a Fortran Unary Expression (arithmetic, logical, character)
 Class {
 	#name : #FASTFortranUnaryExpression,
 	#superclass : #FASTFortranEntity,
-	#traits : 'FASTFortranTExpression + FASTFortranTFortranUnaryExpression',
-	#classTraits : 'FASTFortranTExpression classTrait + FASTFortranTFortranUnaryExpression classTrait',
+	#traits : 'FASTFortranTExpression + FASTFortranTUnaryExpression',
+	#classTraits : 'FASTFortranTExpression classTrait + FASTFortranTUnaryExpression classTrait',
 	#instVars : [
-		'#operator => FMProperty',
-		'#expression => FMOne type: #FASTFortranTExpression opposite: #parentExpression'
+		'#expression => FMOne type: #FASTFortranTExpression opposite: #parentExpression',
+		'#operator => FMProperty'
 	],
 	#category : #'FAST-Fortran-Entities-Entities'
 }

diff --git a/src/FAST-Fortran-Generator/FASTFortranGenerator.class.st b/src/FAST-Fortran-Generator/FASTFortranGenerator.class.st
@@ -878,8 +878,8 @@ FASTFortranGenerator >> defineTraits [
 
 	tFortranLabelledStatement := builder newTraitNamed: #TLabelledStatement comment: 'I represent a fortran statement with a label'.
 
-	tFortranBinaryExpression := builder newTraitNamed: #TFortranBinaryExpression comment: 'I represent a fortran binary expression'.
+	tFortranBinaryExpression := builder newTraitNamed: #TBinaryExpression comment: 'I represent a fortran binary expression'.
 
-	tFortranUnaryExpression := builder newTraitNamed: #TFortranUnaryExpression comment: 'I represent a fortran unary expression'.
+	tFortranUnaryExpression := builder newTraitNamed: #TUnaryExpression comment: 'I represent a fortran unary expression'.
 
 ]