Merge remote-tracking branch 'origin/v4' into v4

Author: jecisc

src/FAST-Java-Model-Generator/FASTJavaMetamodelGenerator.class.st

@@ -128,7 +128,10 @@ Class {
 		'tAnnotationElement',
 		'javaLiteral',
 		'javaArrayAnnotationElement',
-		'javaTypePattern'
+		'javaTypePattern',
+		'tConditionalStatement',
+		'tLoopStatement',
+		'javaVarTypeExpression'
 	],
 	#category : 'FAST-Java-Model-Generator',
 	#package : 'FAST-Java-Model-Generator'
@@ -799,6 +802,8 @@ FASTJavaMetamodelGenerator >> defineClasses [
 	javaLongTypeExpression withTesting.
 	javaShortTypeExpression := self newClassNamed: #ShortTypeExpression comment: 'I represent a short type'.
 	javaShortTypeExpression withTesting.
+	javaVarTypeExpression := self newClassNamed: #VarTypeExpression comment: 'I represent a var type (type inference)'.
+	javaVarTypeExpression withTesting.
 	javaVoidTypeExpression := self newClassNamed: #VoidTypeExpression comment: 'I represent a short type'.
 	javaVoidTypeExpression withTesting.
 
@@ -914,12 +919,17 @@ FASTJavaMetamodelGenerator >> defineHierarchy [
 	javaCaseStatement --|> tStatementBlock.
 	javaContinueStatement --|> tStatement.
 	javaDoWhileStatement --|> tStatement.
+	javaDoWhileStatement --|> tConditionalStatement.
+	javaDoWhileStatement --|> tLoopStatement.
 	javaForStatement --|> tStatement.
+	javaForStatement --|> tConditionalStatement.
+	javaForStatement --|> tLoopStatement.
 
 	javaIdentifier --|> javaVariableExpression.
 	javaIdentifier --|> tReceiver.
 
 	javaIfStatement --|> tStatement.
+	javaIfStatement --|> tConditionalStatement.
 
 	javaArrayAnnotationElement --|> tAnnotationElement.
 	javaArrayAnnotationElement --|> tExpression. "because annotationElement=value are modeled as assignment expression"
@@ -990,6 +1000,8 @@ FASTJavaMetamodelGenerator >> defineHierarchy [
 
 	javaVariableDeclarator --|> tEntity.
 	javaWhileStatement --|> tStatement.
+	javaWhileStatement --|> tConditionalStatement.
+	javaWhileStatement --|> tLoopStatement.
 	javaMethodInvocation --|> tNamedEntity.
 	javaCastExpression --|> tExpression.
 	javaCastExpression --|> tReceiver.
@@ -1000,6 +1012,7 @@ FASTJavaMetamodelGenerator >> defineHierarchy [
 
 	javaTryCatchStatement --|> tStatement.
 	javaForEachStatement --|> tStatement.
+	javaForEachStatement --|> tLoopStatement.
 	javaUnaryExpression --|> tExpression.
 
 	javaNewExpression --|> tExpression.
@@ -1252,10 +1265,6 @@ FASTJavaMetamodelGenerator >> defineRelations [
 	<>- ((tExpression property: #javaLabeledCaseStatementOwner) comment:
 			 'The javaLabeledCaseStatement owner (if possible)').
 
-	((javaForEachStatement property: #body) comment:
-		 'The body of the for-each statement')
-	<>- ((tStatement property: #javaForEachStatementOwner) comment:
-			 'The javaForEachStatement owner (if possible)').
 	((javaForEachStatement property: #list) comment:
 		 'The list that the for-each statement iterates over')
 	<>- ((tExpression property: #javaForEachStatementOwner) comment:
@@ -1302,10 +1311,6 @@ FASTJavaMetamodelGenerator >> defineRelations [
 	<>- ((javaVariableExpression property: #javaCatchParameterOwnler)
 			 comment: 'The javaCatchPartParameterOwner owner (if possible)').
 
-	((javaIfStatement property: #condition) comment:
-		 'The condition of the statement')
-	<>- ((tExpression property: #ifConditionOwner) comment:
-			 'I represent a condition for my owner').
 	((javaIfStatement property: #elsePart) comment: 'else part')
 	<>- ((tStatement property: #ifElsePartOwner) comment:
 			 'The if owner (if possible)').
@@ -1333,10 +1338,6 @@ FASTJavaMetamodelGenerator >> defineRelations [
 		((tExpression property: #infixOperationRightOperandOwner) comment:
 			 'The right operand (if possible)').
 
-	((javaForStatement property: #condition) comment:
-		 'The condition of the statement')
-	<>- ((tExpression property: #forConditionOwner) comment:
-			 'I represent a condition for my owner').
 	((javaForStatement property: #incrementor) comment:
 		 'Expression evaluated at the end of each loop')
 	<>- ((tStatement property: #forIncrementorOwner) comment:
@@ -1345,34 +1346,12 @@ FASTJavaMetamodelGenerator >> defineRelations [
 		 'Expression used at initialization phase of a for loop')
 	<>- ((tStatement property: #forIninitializerOwner) comment:
 			 'I am the initializer of the for').
-	((javaForStatement property: #body) comment:
-		 'A statement to be evaluated in the loop')
-	<>- ((tStatement property: #forBodyOwner) comment:
-			 'I am the body of the for').
 
 	((javaSwitchStatement property: #condition) comment:
 		 'The condition of the statement')
 	<>- ((tExpression property: #switchConditionOwner) comment:
 			 'I represent a condition for my owner').
 
-	((javaDoWhileStatement property: #condition) comment:
-		 'The condition of the statement')
-	<>- ((tExpression property: #doConditionOwner) comment:
-			 'I represent a condition for my owner').
-	((javaDoWhileStatement property: #body) comment:
-		 'A statement to be evaluated in the loop')
-	<>- ((tStatement property: #doBodyOwner) comment:
-			 'I am the body of the do').
-
-	((javaWhileStatement property: #condition) comment:
-		 'The condition of the statement')
-	<>- ((tExpression property: #whileConditionOwner) comment:
-			 'I represent a condition for my owner').
-	((javaWhileStatement property: #body) comment:
-		 'A statement to be evaluated in the loop')
-	<>- ((tStatement property: #whileBodyOwner) comment:
-			 'I am the body of the do').
-
 	((javaInitializer property: #statementBlock) comment:
 		 'Statements block of the behavioural entity')
 	<>- ((tStatementBlock property: #javaInitializerOwner) comment:
@@ -1586,23 +1565,29 @@ FASTJavaMetamodelGenerator >> defineTraits [
 
 	"From FAST"
 	tEntity := self remoteTrait: #TEntity withPrefix: #FAST.
-	tComment := self remoteTrait: #TComment withPrefix: #FAST.
-	tWithComments := self remoteTrait: #TWithComments withPrefix: #FAST.
-	tExpression := self remoteTrait: #TExpression withPrefix: #FAST. 
-	tStatement := self remoteTrait: #TStatement withPrefix: #FAST.
+
+	tBooleanLiteral := self remoteTrait: #TBooleanLiteral withPrefix: #FAST.
 	tCharacterLiteral := self remoteTrait: #TCharacterLiteral withPrefix: #FAST.
 	tLiteral := self remoteTrait: #TLiteral withPrefix: #FAST.
-	tVariableExpression := self remoteTrait: #TVariableExpression withPrefix: #FAST.
-	tNamedBehaviouralEntity := self remoteTrait: #TNamedBehaviouralEntity withPrefix: #FAST.
 	tNullPointerLiteral := self remoteTrait: #TNullPointerLiteral withPrefix: #FAST.
 	tStringLiteral := self remoteTrait: #TStringLiteral withPrefix: #FAST.
+
+	tExpression := self remoteTrait: #TExpression withPrefix: #FAST. 
+	tVariableExpression := self remoteTrait: #TVariableExpression withPrefix: #FAST.
+
+	tStatement := self remoteTrait: #TStatement withPrefix: #FAST.
+	tConditionalStatement := self remoteTrait: #TConditionalStatement withPrefix: #FAST.
+	tExpressionStatement := self remoteTrait: #TExpressionStatement withPrefix: #FAST.
+	tLoopStatement := self remoteTrait: #TLoopStatement withPrefix: #FAST.
+	tReturnStatement := self remoteTrait: #TReturnStatement withPrefix: #FAST.
+	tStatementBlock := self remoteTrait: #TStatementBlock withPrefix: #FAST.
+
+	tComment := self remoteTrait: #TComment withPrefix: #FAST.
+	tInvocation := self remoteTrait: #TInvocation withPrefix: #FAST.
+	tNamedBehaviouralEntity := self remoteTrait: #TNamedBehaviouralEntity withPrefix: #FAST.
+	tNamedEntity := self remoteTrait: #TNamedEntity withPrefix: #FAST.
 	tScopableEntity := self remoteTrait: #TScopableEntity withPrefix: #FAST.
 	tVariableEntity := self remoteTrait: #TVariableEntity withPrefix: #FAST.
-	tStatementBlock := self remoteTrait: #TStatementBlock withPrefix: #FAST.
-	tExpressionStatement := self remoteTrait: #TExpressionStatement withPrefix: #FAST.
+	tWithComments := self remoteTrait: #TWithComments withPrefix: #FAST.
 	tWithParameters := self remoteTrait: #TWithParameters withPrefix: #FAST.
-	tNamedEntity := self remoteTrait: #TNamedEntity withPrefix: #FAST.
-	tReturnStatement := self remoteTrait: #TReturnStatement withPrefix: #FAST.
-	tBooleanLiteral := self remoteTrait: #TBooleanLiteral withPrefix: #FAST.
-	tInvocation := self remoteTrait: #TInvocation withPrefix: #FAST
 ]

src/FAST-Java-Model/FASTJavaArrayAccess.class.st

@@ -17,10 +17,7 @@ liste[i]
 | `conditionalConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaConditionalExpression` | I represent a condition for my owner|
 | `conditionalElsePartOwner` | `FASTTExpression` | `elsePart` | `FASTJavaConditionalExpression` | The if owner (if possible)|
 | `conditionalThenPartOwner` | `FASTTExpression` | `thenPart` | `FASTJavaConditionalExpression` | The if owner (if possible)|
-| `doConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaDoWhileStatement` | I represent a condition for my owner|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
-| `forConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaForStatement` | I represent a condition for my owner|
-| `ifConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaIfStatement` | I represent a condition for my owner|
 | `infixOperationLeftOperandOwner` | `FASTTExpression` | `leftOperand` | `FASTJavaInfixOperation` | The left operand (if possible)|
 | `infixOperationRightOperandOwner` | `FASTTExpression` | `rightOperand` | `FASTJavaInfixOperation` | The right operand (if possible)|
 | `javaArrayAccessOwner` | `FASTTExpression` | `expression` | `FASTJavaArrayAccess` | The javaArrayAccess owner (if possible)|
@@ -39,13 +36,13 @@ liste[i]
 | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)|
 | `javaVariableAssignmentOwner` | `FASTJavaTAssignable` | `variable` | `FASTJavaTWithAssignable` | The owner of the assignment|
 | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)|
+| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
 | `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|
 | `receiverOwner` | `FASTJavaTReceiver` | `receiver` | `FASTJavaTWithReceiver` | The owner of the receiver|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 | `switchConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaSwitchStatement` | I represent a condition for my owner|
-| `whileConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaWhileStatement` | I represent a condition for my owner|
 
 ### Children
 | Relation | Origin | Opposite | Type | Comment |

src/FAST-Java-Model/FASTJavaArrayAnnotationElement.class.st

@@ -14,10 +14,7 @@ I represent an array as argument of an annotationExpression
 | `conditionalConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaConditionalExpression` | I represent a condition for my owner|
 | `conditionalElsePartOwner` | `FASTTExpression` | `elsePart` | `FASTJavaConditionalExpression` | The if owner (if possible)|
 | `conditionalThenPartOwner` | `FASTTExpression` | `thenPart` | `FASTJavaConditionalExpression` | The if owner (if possible)|
-| `doConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaDoWhileStatement` | I represent a condition for my owner|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
-| `forConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaForStatement` | I represent a condition for my owner|
-| `ifConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaIfStatement` | I represent a condition for my owner|
 | `infixOperationLeftOperandOwner` | `FASTTExpression` | `leftOperand` | `FASTJavaInfixOperation` | The left operand (if possible)|
 | `infixOperationRightOperandOwner` | `FASTTExpression` | `rightOperand` | `FASTJavaInfixOperation` | The right operand (if possible)|
 | `javaArrayAccessOwner` | `FASTTExpression` | `expression` | `FASTJavaArrayAccess` | The javaArrayAccess owner (if possible)|
@@ -36,12 +33,12 @@ I represent an array as argument of an annotationExpression
 | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)|
 | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)|
 | `parentAnnotation` | `FASTJavaTAnnotationElement` | `elements` | `FASTJavaAnnotation` | An ""argument"" of an annotation, eg. ""unchecked"" in the following annotation: 	@SuppressWarnings(value=""unchecked"")|
+| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
 | `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)|
 | `switchConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaSwitchStatement` | I represent a condition for my owner|
-| `whileConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaWhileStatement` | I represent a condition for my owner|
 
 ### Children
 | Relation | Origin | Opposite | Type | Comment |

src/FAST-Java-Model/FASTJavaArrayInitializer.class.st

@@ -23,10 +23,7 @@ My initializers are
 | `conditionalConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaConditionalExpression` | I represent a condition for my owner|
 | `conditionalElsePartOwner` | `FASTTExpression` | `elsePart` | `FASTJavaConditionalExpression` | The if owner (if possible)|
 | `conditionalThenPartOwner` | `FASTTExpression` | `thenPart` | `FASTJavaConditionalExpression` | The if owner (if possible)|
-| `doConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaDoWhileStatement` | I represent a condition for my owner|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
-| `forConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaForStatement` | I represent a condition for my owner|
-| `ifConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaIfStatement` | I represent a condition for my owner|
 | `infixOperationLeftOperandOwner` | `FASTTExpression` | `leftOperand` | `FASTJavaInfixOperation` | The left operand (if possible)|
 | `infixOperationRightOperandOwner` | `FASTTExpression` | `rightOperand` | `FASTJavaInfixOperation` | The right operand (if possible)|
 | `javaArrayAccessOwner` | `FASTTExpression` | `expression` | `FASTJavaArrayAccess` | The javaArrayAccess owner (if possible)|
@@ -45,12 +42,12 @@ My initializers are
 | `javaUnaryExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaUnaryExpression` | The javaUnaryExpression owner (if possible)|
 | `javaVariableDeclaratorExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaVariableDeclarator` | The javaVariableDeclarator owner (if possible)|
 | `parentAnnotation` | `FASTJavaTAnnotationElement` | `elements` | `FASTJavaAnnotation` | An ""argument"" of an annotation, eg. ""unchecked"" in the following annotation: 	@SuppressWarnings(value=""unchecked"")|
+| `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used|
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
 | `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)|
 | `switchConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaSwitchStatement` | I represent a condition for my owner|
-| `whileConditionOwner` | `FASTTExpression` | `condition` | `FASTJavaWhileStatement` | I represent a condition for my owner|
 
 ### Children
 | Relation | Origin | Opposite | Type | Comment |

src/FAST-Java-Model/FASTJavaAssertStatement.class.st

@@ -14,17 +14,14 @@ void method (){
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `doBodyOwner` | `FASTTStatement` | `body` | `FASTJavaDoWhileStatement` | I am the body of the do|
-| `forBodyOwner` | `FASTTStatement` | `body` | `FASTJavaForStatement` | I am the body of the for|
 | `forIncrementorOwner` | `FASTTStatement` | `incrementor` | `FASTJavaForStatement` | I am the incrementor of the for|
 | `forIninitializerOwner` | `FASTTStatement` | `initializer` | `FASTJavaForStatement` | I am the initializer of the for|
 | `ifElsePartOwner` | `FASTTStatement` | `elsePart` | `FASTJavaIfStatement` | The if owner (if possible)|
 | `ifThenPartOwner` | `FASTTStatement` | `thenPart` | `FASTJavaIfStatement` | The if owner (if possible)|
-| `javaForEachStatementOwner` | `FASTTStatement` | `body` | `FASTJavaForEachStatement` | The javaForEachStatement owner (if possible)|
 | `javaLambdaExpressionOwner` | `FASTTEntity` | `expression` | `FASTJavaLambdaExpression` | The expression owner (if possible)|
 | `labelStatementOwner` | `FASTTStatement` | `labeledStatement` | `FASTJavaLabeledStatement` | Label Statement entity containing this statement|
+| `parentLoopStatement` | `FASTTStatement` | `body` | `FASTTLoopStatement` | Optional loop of which this statement is the body|
 | `statementContainer` | `FASTTStatement` | `statements` | `FASTTStatementBlock` | Block containing this statement.|
-| `whileBodyOwner` | `FASTTStatement` | `body` | `FASTJavaWhileStatement` | I am the body of the do|
 
 ### Children
 | Relation | Origin | Opposite | Type | Comment |