Merge pull request #638 from Systems-Modeling/ST6RI-818

ST6RI-818 Constructor expressions (KERML_-132/222, SYSML2_-766)

- Also set InternalParserSplitter count to 20 in GenerateSysML.mwe2, in
order to get sufficient splitting.

Author: seidewitz

kerml/src/examples/Simple Tests/ArgumentResolution.kerml

@@ -5,7 +5,7 @@ package ArgumentResolutionBug {
 
 	behavior B  {
 		in feature x;
-		out feature : A = A(x);
+		out feature : A = new A(x);
 	}
 
 	class C {

kerml/src/examples/Simple Tests/Expressions.kerml

@@ -70,6 +70,6 @@ package Expressions {
 		feature count : ScalarValues::Integer =  c#(1).count;
 	}
 
-	feature l = L();
+	feature l = new L();
 	feature w1 = w(xx);
 }

org.omg.kerml.expressions.xtext/src-gen/org/omg/kerml/expressions/xtext/KerMLExpressions.xtextbin

@@ -2938,9 +2938,9 @@ rulePrimaryExpression returns [EObject current=null]
 					(
 						(
 							{
-								newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getOwnedRelationshipReferenceTypingParserRuleCall_2_0_2_2_0());
+								newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getOwnedRelationshipInstantiatedTypeMemberParserRuleCall_2_0_2_2_0());
 							}
-							lv_ownedRelationship_15_0=ruleReferenceTyping
+							lv_ownedRelationship_15_0=ruleInstantiatedTypeMember
 							{
 								if ($current==null) {
 									$current = createModelElementForParent(grammarAccess.getPrimaryExpressionRule());
@@ -2949,7 +2949,7 @@ rulePrimaryExpression returns [EObject current=null]
 									$current,
 									"ownedRelationship",
 									lv_ownedRelationship_15_0,
-									"org.omg.kerml.expressions.xtext.KerMLExpressions.ReferenceTyping");
+									"org.omg.kerml.expressions.xtext.KerMLExpressions.InstantiatedTypeMember");
 								afterParserOrEnumRuleCall();
 							}
 						)
@@ -3283,6 +3283,34 @@ ruleFeatureChainMember returns [EObject current=null]
 	)
 ;
 
+// Entry rule entryRuleOwnedFeatureChain
+entryRuleOwnedFeatureChain returns [EObject current=null]:
+	{ newCompositeNode(grammarAccess.getOwnedFeatureChainRule()); }
+	iv_ruleOwnedFeatureChain=ruleOwnedFeatureChain
+	{ $current=$iv_ruleOwnedFeatureChain.current; }
+	EOF;
+
+// Rule OwnedFeatureChain
+ruleOwnedFeatureChain returns [EObject current=null]
+@init {
+	enterRule();
+}
+@after {
+	leaveRule();
+}:
+	{
+		if ($current==null) {
+			$current = createModelElement(grammarAccess.getOwnedFeatureChainRule());
+		}
+		newCompositeNode(grammarAccess.getOwnedFeatureChainAccess().getFeatureChainParserRuleCall());
+	}
+	this_FeatureChain_0=ruleFeatureChain[$current]
+	{
+		$current = $this_FeatureChain_0.current;
+		afterParserOrEnumRuleCall();
+	}
+;
+
 // Entry rule entryRuleBaseExpression
 entryRuleBaseExpression returns [EObject current=null]:
 	{ newCompositeNode(grammarAccess.getBaseExpressionRule()); }
@@ -3345,30 +3373,39 @@ ruleBaseExpression returns [EObject current=null]
 		}
 		    |
 		{
-			newCompositeNode(grammarAccess.getBaseExpressionAccess().getBodyExpressionParserRuleCall_5());
+			newCompositeNode(grammarAccess.getBaseExpressionAccess().getConstructorExpressionParserRuleCall_5());
+		}
+		this_ConstructorExpression_5=ruleConstructorExpression
+		{
+			$current = $this_ConstructorExpression_5.current;
+			afterParserOrEnumRuleCall();
+		}
+		    |
+		{
+			newCompositeNode(grammarAccess.getBaseExpressionAccess().getBodyExpressionParserRuleCall_6());
 		}
-		this_BodyExpression_5=ruleBodyExpression
+		this_BodyExpression_6=ruleBodyExpression
 		{
-			$current = $this_BodyExpression_5.current;
+			$current = $this_BodyExpression_6.current;
 			afterParserOrEnumRuleCall();
 		}
 		    |
 		(
-			otherlv_6='('
+			otherlv_7='('
 			{
-				newLeafNode(otherlv_6, grammarAccess.getBaseExpressionAccess().getLeftParenthesisKeyword_6_0());
+				newLeafNode(otherlv_7, grammarAccess.getBaseExpressionAccess().getLeftParenthesisKeyword_7_0());
 			}
 			{
-				newCompositeNode(grammarAccess.getBaseExpressionAccess().getSequenceExpressionParserRuleCall_6_1());
+				newCompositeNode(grammarAccess.getBaseExpressionAccess().getSequenceExpressionParserRuleCall_7_1());
 			}
-			this_SequenceExpression_7=ruleSequenceExpression
+			this_SequenceExpression_8=ruleSequenceExpression
 			{
-				$current = $this_SequenceExpression_7.current;
+				$current = $this_SequenceExpression_8.current;
 				afterParserOrEnumRuleCall();
 			}
-			otherlv_8=')'
+			otherlv_9=')'
 			{
-				newLeafNode(otherlv_8, grammarAccess.getBaseExpressionAccess().getRightParenthesisKeyword_6_2());
+				newLeafNode(otherlv_9, grammarAccess.getBaseExpressionAccess().getRightParenthesisKeyword_7_2());
 			}
 		)
 	)
@@ -3874,9 +3911,9 @@ ruleInvocationExpression returns [EObject current=null]
 		(
 			(
 				{
-					newCompositeNode(grammarAccess.getInvocationExpressionAccess().getOwnedRelationshipOwnedFeatureTypingParserRuleCall_0_0());
+					newCompositeNode(grammarAccess.getInvocationExpressionAccess().getOwnedRelationshipInstantiatedTypeMemberParserRuleCall_0_0());
 				}
-				lv_ownedRelationship_0_0=ruleOwnedFeatureTyping
+				lv_ownedRelationship_0_0=ruleInstantiatedTypeMember
 				{
 					if ($current==null) {
 						$current = createModelElementForParent(grammarAccess.getInvocationExpressionRule());
@@ -3885,7 +3922,7 @@ ruleInvocationExpression returns [EObject current=null]
 						$current,
 						"ownedRelationship",
 						lv_ownedRelationship_0_0,
-						"org.omg.kerml.expressions.xtext.KerMLExpressions.OwnedFeatureTyping");
+						"org.omg.kerml.expressions.xtext.KerMLExpressions.InstantiatedTypeMember");
 					afterParserOrEnumRuleCall();
 				}
 			)
@@ -3904,70 +3941,112 @@ ruleInvocationExpression returns [EObject current=null]
 	)
 ;
 
-// Entry rule entryRuleOwnedFeatureTyping
-entryRuleOwnedFeatureTyping returns [EObject current=null]:
-	{ newCompositeNode(grammarAccess.getOwnedFeatureTypingRule()); }
-	iv_ruleOwnedFeatureTyping=ruleOwnedFeatureTyping
-	{ $current=$iv_ruleOwnedFeatureTyping.current; }
+// Entry rule entryRuleConstructorExpression
+entryRuleConstructorExpression returns [EObject current=null]:
+	{ newCompositeNode(grammarAccess.getConstructorExpressionRule()); }
+	iv_ruleConstructorExpression=ruleConstructorExpression
+	{ $current=$iv_ruleConstructorExpression.current; }
 	EOF;
 
-// Rule OwnedFeatureTyping
-ruleOwnedFeatureTyping returns [EObject current=null]
+// Rule ConstructorExpression
+ruleConstructorExpression returns [EObject current=null]
 @init {
 	enterRule();
 }
 @after {
 	leaveRule();
 }:
 	(
+		otherlv_0='new'
+		{
+			newLeafNode(otherlv_0, grammarAccess.getConstructorExpressionAccess().getNewKeyword_0());
+		}
 		(
 			(
 				{
-					if ($current==null) {
-						$current = createModelElement(grammarAccess.getOwnedFeatureTypingRule());
-					}
+					newCompositeNode(grammarAccess.getConstructorExpressionAccess().getOwnedRelationshipInstantiatedTypeMemberParserRuleCall_1_0());
 				}
+				lv_ownedRelationship_1_0=ruleInstantiatedTypeMember
 				{
-					newCompositeNode(grammarAccess.getOwnedFeatureTypingAccess().getTypeTypeCrossReference_0_0());
-				}
-				ruleQualifiedName
-				{
+					if ($current==null) {
+						$current = createModelElementForParent(grammarAccess.getConstructorExpressionRule());
+					}
+					add(
+						$current,
+						"ownedRelationship",
+						lv_ownedRelationship_1_0,
+						"org.omg.kerml.expressions.xtext.KerMLExpressions.InstantiatedTypeMember");
 					afterParserOrEnumRuleCall();
 				}
 			)
 		)
-		    |
 		(
 			(
 				{
-					newCompositeNode(grammarAccess.getOwnedFeatureTypingAccess().getOwnedRelatedElementOwnedFeatureChainParserRuleCall_1_0());
+					newCompositeNode(grammarAccess.getConstructorExpressionAccess().getOwnedRelationshipConstructorResultMemberParserRuleCall_2_0());
 				}
-				lv_ownedRelatedElement_1_0=ruleOwnedFeatureChain
+				lv_ownedRelationship_2_0=ruleConstructorResultMember
 				{
 					if ($current==null) {
-						$current = createModelElementForParent(grammarAccess.getOwnedFeatureTypingRule());
+						$current = createModelElementForParent(grammarAccess.getConstructorExpressionRule());
 					}
 					add(
 						$current,
-						"ownedRelatedElement",
-						lv_ownedRelatedElement_1_0,
-						"org.omg.kerml.expressions.xtext.KerMLExpressions.OwnedFeatureChain");
+						"ownedRelationship",
+						lv_ownedRelationship_2_0,
+						"org.omg.kerml.expressions.xtext.KerMLExpressions.ConstructorResultMember");
 					afterParserOrEnumRuleCall();
 				}
 			)
 		)
 	)
 ;
 
-// Entry rule entryRuleOwnedFeatureChain
-entryRuleOwnedFeatureChain returns [EObject current=null]:
-	{ newCompositeNode(grammarAccess.getOwnedFeatureChainRule()); }
-	iv_ruleOwnedFeatureChain=ruleOwnedFeatureChain
-	{ $current=$iv_ruleOwnedFeatureChain.current; }
+// Entry rule entryRuleConstructorResultMember
+entryRuleConstructorResultMember returns [EObject current=null]:
+	{ newCompositeNode(grammarAccess.getConstructorResultMemberRule()); }
+	iv_ruleConstructorResultMember=ruleConstructorResultMember
+	{ $current=$iv_ruleConstructorResultMember.current; }
 	EOF;
 
-// Rule OwnedFeatureChain
-ruleOwnedFeatureChain returns [EObject current=null]
+// Rule ConstructorResultMember
+ruleConstructorResultMember returns [EObject current=null]
+@init {
+	enterRule();
+}
+@after {
+	leaveRule();
+}:
+	(
+		(
+			{
+				newCompositeNode(grammarAccess.getConstructorResultMemberAccess().getOwnedRelatedElementConstructorResultParserRuleCall_0());
+			}
+			lv_ownedRelatedElement_0_0=ruleConstructorResult
+			{
+				if ($current==null) {
+					$current = createModelElementForParent(grammarAccess.getConstructorResultMemberRule());
+				}
+				add(
+					$current,
+					"ownedRelatedElement",
+					lv_ownedRelatedElement_0_0,
+					"org.omg.kerml.expressions.xtext.KerMLExpressions.ConstructorResult");
+				afterParserOrEnumRuleCall();
+			}
+		)
+	)
+;
+
+// Entry rule entryRuleConstructorResult
+entryRuleConstructorResult returns [EObject current=null]:
+	{ newCompositeNode(grammarAccess.getConstructorResultRule()); }
+	iv_ruleConstructorResult=ruleConstructorResult
+	{ $current=$iv_ruleConstructorResult.current; }
+	EOF;
+
+// Rule ConstructorResult
+ruleConstructorResult returns [EObject current=null]
 @init {
 	enterRule();
 }
@@ -3976,17 +4055,81 @@ ruleOwnedFeatureChain returns [EObject current=null]
 }:
 	{
 		if ($current==null) {
-			$current = createModelElement(grammarAccess.getOwnedFeatureChainRule());
+			$current = createModelElement(grammarAccess.getConstructorResultRule());
 		}
-		newCompositeNode(grammarAccess.getOwnedFeatureChainAccess().getFeatureChainParserRuleCall());
+		newCompositeNode(grammarAccess.getConstructorResultAccess().getArgumentListParserRuleCall());
 	}
-	this_FeatureChain_0=ruleFeatureChain[$current]
+	this_ArgumentList_0=ruleArgumentList[$current]
 	{
-		$current = $this_FeatureChain_0.current;
+		$current = $this_ArgumentList_0.current;
 		afterParserOrEnumRuleCall();
 	}
 ;
 
+// Entry rule entryRuleInstantiatedTypeMember
+entryRuleInstantiatedTypeMember returns [EObject current=null]:
+	{ newCompositeNode(grammarAccess.getInstantiatedTypeMemberRule()); }
+	iv_ruleInstantiatedTypeMember=ruleInstantiatedTypeMember
+	{ $current=$iv_ruleInstantiatedTypeMember.current; }
+	EOF;
+
+// Rule InstantiatedTypeMember
+ruleInstantiatedTypeMember returns [EObject current=null]
+@init {
+	enterRule();
+}
+@after {
+	leaveRule();
+}:
+	(
+		(
+			(
+				{
+					if ($current==null) {
+						$current = createModelElement(grammarAccess.getInstantiatedTypeMemberRule());
+					}
+				}
+				{
+					newCompositeNode(grammarAccess.getInstantiatedTypeMemberAccess().getMemberElementTypeCrossReference_0_0());
+				}
+				ruleQualifiedName
+				{
+					afterParserOrEnumRuleCall();
+				}
+			)
+		)
+		    |
+		(
+			(
+				{
+					$current = forceCreateModelElement(
+						grammarAccess.getInstantiatedTypeMemberAccess().getOwningMembershipAction_1_0(),
+						$current);
+				}
+			)
+			(
+				(
+					{
+						newCompositeNode(grammarAccess.getInstantiatedTypeMemberAccess().getOwnedRelatedElementOwnedFeatureChainParserRuleCall_1_1_0());
+					}
+					lv_ownedRelatedElement_2_0=ruleOwnedFeatureChain
+					{
+						if ($current==null) {
+							$current = createModelElementForParent(grammarAccess.getInstantiatedTypeMemberRule());
+						}
+						add(
+							$current,
+							"ownedRelatedElement",
+							lv_ownedRelatedElement_2_0,
+							"org.omg.kerml.expressions.xtext.KerMLExpressions.OwnedFeatureChain");
+						afterParserOrEnumRuleCall();
+					}
+				)
+			)
+		)
+	)
+;
+
 
 // Rule FeatureChain
 ruleFeatureChain[EObject in_current]  returns [EObject current=in_current]