Merge pull request #71 from moosetechnology/70-Rename-leftright-in-TB…

…inaryExpressino-to-leftOperandrightOperand renamed #left/#right relation of TBinaryExpression to #leftOperand/#r…
moosetechnology · Mar 13, 2024 · cd38d79 · cd38d79
2 parents 9602896 + 1fcf92d
commit cd38d79
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 50 deletions.
diff --git a/src/FAST-Core-Model/FASTTAssignment.trait.st b/src/FAST-Core-Model/FASTTAssignment.trait.st
@@ -11,8 +11,8 @@ A node representing an assignment
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
-| `parentExpressionLeft` | `FASTTExpression` | `left` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
-| `parentExpressionRight` | `FASTTExpression` | `right` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
+| `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 ### Children

diff --git a/src/FAST-Core-Model/FASTTBinaryExpression.trait.st b/src/FAST-Core-Model/FASTTBinaryExpression.trait.st
@@ -11,15 +11,15 @@ A trait representing a binary expression of a node of a source code.
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
-| `parentExpressionLeft` | `FASTTExpression` | `left` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
-| `parentExpressionRight` | `FASTTExpression` | `right` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
+| `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 ### Children
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `left` | `FASTTBinaryExpression` | `parentExpressionLeft` | `FASTTExpression` | left part of a binary expression|
-| `right` | `FASTTBinaryExpression` | `parentExpressionRight` | `FASTTExpression` | left part of the expression|
+| `leftOperand` | `FASTTBinaryExpression` | `parentExpressionLeft` | `FASTTExpression` | left part of a binary expression|
+| `rightOperand` | `FASTTBinaryExpression` | `parentExpressionRight` | `FASTTExpression` | left part of the expression|
 
 
 ## Properties
@@ -35,9 +35,9 @@ A trait representing a binary expression of a node of a source code.
 Trait {
 	#name : #FASTTBinaryExpression,
 	#instVars : [
-		'#left => FMOne type: #FASTTExpression opposite: #parentExpressionLeft',
+		'#leftOperand => FMOne type: #FASTTExpression opposite: #parentExpressionLeft',
 		'#operator => FMProperty',
-		'#right => FMOne type: #FASTTExpression opposite: #parentExpressionRight'
+		'#rightOperand => FMOne type: #FASTTExpression opposite: #parentExpressionRight'
 	],
 	#traits : 'FASTTExpression',
 	#classTraits : 'FASTTExpression classTrait',
@@ -54,26 +54,26 @@ FASTTBinaryExpression classSide >> annotation [
 ]
 
 { #category : #accessing }
-FASTTBinaryExpression >> left [
-	"Relation named: #left type: #FASTTExpression opposite: #parentExpressionLeft"
+FASTTBinaryExpression >> leftOperand [
+	"Relation named: #leftOperand type: #FASTTExpression opposite: #parentExpressionLeft"
 
 	<generated>
 	<FMComment: 'left part of a binary expression'>
-	^ left
+	^ leftOperand
 ]
 
 { #category : #accessing }
-FASTTBinaryExpression >> left: anObject [
+FASTTBinaryExpression >> leftOperand: anObject [
 
 	<generated>
-	left := anObject
+	leftOperand := anObject
 ]
 
 { #category : #navigation }
-FASTTBinaryExpression >> leftGroup [
+FASTTBinaryExpression >> leftOperandGroup [
 	<generated>
-	<navigation: 'Left'>
-	^ MooseSpecializedGroup with: self left
+	<navigation: 'LeftOperand'>
+	^ MooseSpecializedGroup with: self leftOperand
 ]
 
 { #category : #accessing }
@@ -92,24 +92,24 @@ FASTTBinaryExpression >> operator: anObject [
 ]
 
 { #category : #accessing }
-FASTTBinaryExpression >> right [
-	"Relation named: #right type: #FASTTExpression opposite: #parentExpressionRight"
+FASTTBinaryExpression >> rightOperand [
+	"Relation named: #rightOperand type: #FASTTExpression opposite: #parentExpressionRight"
 
 	<generated>
 	<FMComment: 'left part of the expression'>
-	^ right
+	^ rightOperand
 ]
 
 { #category : #accessing }
-FASTTBinaryExpression >> right: anObject [
+FASTTBinaryExpression >> rightOperand: anObject [
 
 	<generated>
-	right := anObject
+	rightOperand := anObject
 ]
 
 { #category : #navigation }
-FASTTBinaryExpression >> rightGroup [
+FASTTBinaryExpression >> rightOperandGroup [
 	<generated>
-	<navigation: 'Right'>
-	^ MooseSpecializedGroup with: self right
+	<navigation: 'RightOperand'>
+	^ MooseSpecializedGroup with: self rightOperand
 ]
diff --git a/src/FAST-Core-Model/FASTTBooleanLiteral.trait.st b/src/FAST-Core-Model/FASTTBooleanLiteral.trait.st
@@ -11,8 +11,8 @@ A boolean literal
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
-| `parentExpressionLeft` | `FASTTExpression` | `left` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
-| `parentExpressionRight` | `FASTTExpression` | `right` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
+| `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 

diff --git a/src/FAST-Core-Model/FASTTCharacterLiteral.trait.st b/src/FAST-Core-Model/FASTTCharacterLiteral.trait.st
@@ -11,8 +11,8 @@ A character literal
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
-| `parentExpressionLeft` | `FASTTExpression` | `left` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
-| `parentExpressionRight` | `FASTTExpression` | `right` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
+| `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 

diff --git a/src/FAST-Core-Model/FASTTExpression.trait.st b/src/FAST-Core-Model/FASTTExpression.trait.st
@@ -11,8 +11,8 @@ An abstract superclass representing an expression node of a source code.
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
-| `parentExpressionLeft` | `FASTTExpression` | `left` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
-| `parentExpressionRight` | `FASTTExpression` | `right` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
+| `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 
@@ -32,8 +32,8 @@ Trait {
 		'#assignedIn => FMOne type: #FASTTAssignment opposite: #expression',
 		'#expressionStatementOwner => FMOne type: #FASTTExpressionStatement opposite: #expression',
 		'#parentExpression => FMOne type: #FASTTUnaryExpression opposite: #expression',
-		'#parentExpressionLeft => FMOne type: #FASTTBinaryExpression opposite: #left',
-		'#parentExpressionRight => FMOne type: #FASTTBinaryExpression opposite: #right',
+		'#parentExpressionLeft => FMOne type: #FASTTBinaryExpression opposite: #leftOperand',
+		'#parentExpressionRight => FMOne type: #FASTTBinaryExpression opposite: #rightOperand',
 		'#returnOwner => FMOne type: #FASTTReturnStatement opposite: #expression'
 	],
 	#traits : 'FASTTEntity',
@@ -151,7 +151,7 @@ FASTTExpression >> parentExpressionGroup [
 
 { #category : #accessing }
 FASTTExpression >> parentExpressionLeft [
-	"Relation named: #parentExpressionLeft type: #FASTTBinaryExpression opposite: #left"
+	"Relation named: #parentExpressionLeft type: #FASTTBinaryExpression opposite: #leftOperand"
 
 	<generated>
 	<FMComment: 'Parent (binary) expression of which I am left side'>
@@ -176,7 +176,7 @@ FASTTExpression >> parentExpressionLeftGroup [
 
 { #category : #accessing }
 FASTTExpression >> parentExpressionRight [
-	"Relation named: #parentExpressionRight type: #FASTTBinaryExpression opposite: #right"
+	"Relation named: #parentExpressionRight type: #FASTTBinaryExpression opposite: #rightOperand"
 
 	<generated>
 	<FMComment: 'Parent (binary) expression of which I am right side'>

diff --git a/src/FAST-Core-Model/FASTTInvocation.trait.st b/src/FAST-Core-Model/FASTTInvocation.trait.st
@@ -11,8 +11,8 @@ A invocation of a behavioural entity
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
-| `parentExpressionLeft` | `FASTTExpression` | `left` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
-| `parentExpressionRight` | `FASTTExpression` | `right` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
+| `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 ### Children

diff --git a/src/FAST-Core-Model/FASTTLiteral.trait.st b/src/FAST-Core-Model/FASTTLiteral.trait.st
@@ -16,8 +16,8 @@ FLAG: should refactor some literals to core-model
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
-| `parentExpressionLeft` | `FASTTExpression` | `left` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
-| `parentExpressionRight` | `FASTTExpression` | `right` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
+| `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 

diff --git a/src/FAST-Core-Model/FASTTNullPointerLiteral.trait.st b/src/FAST-Core-Model/FASTTNullPointerLiteral.trait.st
@@ -11,8 +11,8 @@ An undefined object literal
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
-| `parentExpressionLeft` | `FASTTExpression` | `left` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
-| `parentExpressionRight` | `FASTTExpression` | `right` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
+| `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 

diff --git a/src/FAST-Core-Model/FASTTNumericalLiteral.trait.st b/src/FAST-Core-Model/FASTTNumericalLiteral.trait.st
@@ -11,8 +11,8 @@ A numerical literal
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
-| `parentExpressionLeft` | `FASTTExpression` | `left` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
-| `parentExpressionRight` | `FASTTExpression` | `right` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
+| `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 

diff --git a/src/FAST-Core-Model/FASTTStringLiteral.trait.st b/src/FAST-Core-Model/FASTTStringLiteral.trait.st
@@ -11,8 +11,8 @@ A string literal
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
-| `parentExpressionLeft` | `FASTTExpression` | `left` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
-| `parentExpressionRight` | `FASTTExpression` | `right` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
+| `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 

diff --git a/src/FAST-Core-Model/FASTTUnaryExpression.trait.st b/src/FAST-Core-Model/FASTTUnaryExpression.trait.st
@@ -11,8 +11,8 @@ A trait representing an unary expression of a node of a source code.
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
-| `parentExpressionLeft` | `FASTTExpression` | `left` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
-| `parentExpressionRight` | `FASTTExpression` | `right` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
+| `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 ### Children

diff --git a/src/FAST-Core-Model/FASTTVariableExpression.trait.st b/src/FAST-Core-Model/FASTTVariableExpression.trait.st
@@ -12,8 +12,8 @@ A node that wraps around structural entity
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `invokedIn` | `FASTTNamedEntity` | `invoked` | `FASTTInvocation` | Optional invocation where this name is used|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
-| `parentExpressionLeft` | `FASTTExpression` | `left` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
-| `parentExpressionRight` | `FASTTExpression` | `right` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
+| `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 

diff --git a/src/FAST-Model-Generator/FASTMetamodelGenerator.class.st b/src/FAST-Model-Generator/FASTMetamodelGenerator.class.st
@@ -297,11 +297,11 @@ FASTMetamodelGenerator >> defineRelations [
 	((tUnaryExpression property: #expression) comment: '(sub-)expression in the unary expression')
 	<>- ((tExpression property: #parentExpression) comment: 'Parent (unary) expression').
 
-	((tBinaryExpression property: #left) comment: 'left part of a binary expression')
+	((tBinaryExpression property: #leftOperand) comment: 'left part of a binary expression')
 	<>- ((tExpression property: #parentExpressionLeft)
 		comment: 'Parent (binary) expression of which I am left side').
 
-	((tBinaryExpression property: #right) comment: 'left part of the expression')
+	((tBinaryExpression property: #rightOperand) comment: 'left part of the expression')
 	<>- ((tExpression property: #parentExpressionRight)
 		comment: 'Parent (binary) expression of which I am right side').