Merge remote-tracking branch 'origin/master' into ST6RI-682

Author: TheKorpos

kerml/src/examples/Behavior Examples/TakePicture.kerml

@@ -11,7 +11,7 @@ behavior TakePicture {
 	step step1: Focus[1];	
 	step step2: Shoot[1];
 
-	succession flow exposure[1] from step1.xrsl to step2.xsf;
+	succession flow exposure[1] of Exposure from step1.xrsl to step2.xsf;
 
 	succession step1 then camera.focusedState;
 	succession step2 then camera.shotState;

kerml/src/examples/KerML Spec Annex A Examples/A-3-5-TimingForStructures.kerml

@@ -62,12 +62,13 @@ package TimingForStructuresExecution2 {
 	private import Atoms::*;
 	private import TimingForStructuresModelToBeExecuted2::*;
 	private import Occurrences::HappensDuring;
-	private import OneToOneConnectorsExecution::MyWheel1;
-	private import OneToOneConnectorsExecution::MyWheel2;
 	private import OneToOneConnectorsExecution::MyWheel;
-	private import OneToOneConnectorsExecution::MyBikeFork1;
-	private import OneToOneConnectorsExecution::MyBikeFork2;
 	private import OneToOneConnectorsExecution::MyBikeFork;
+	
+	struct MyWheel1 specializes OneToOneConnectorsExecution::MyWheel1;
+	struct MyWheel2 specializes OneToOneConnectorsExecution::MyWheel2;
+    struct MyBikeFork1 specializes OneToOneConnectorsExecution::MyBikeFork1;
+    struct MyBikeFork2 specializes OneToOneConnectorsExecution::MyBikeFork2;
 
 	#atom
 	assoc MyBike_During_Wheel1_Link specializes HappensDuring {

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

@@ -21,14 +21,13 @@ package Expressions {
 	behavior w { inout v : Integer;
 	    step : ControlPerformances::LoopPerformance {
     		in expr whileTest {v > 3}
-    		in expr untilTest;
     		in step body {
     			step decrement {
     				out v_decr : Integer = v - 1;			
     			}
     			succession decrement then update;
     			step update : FeatureReferencingPerformances::FeatureWritePerformance {
-    				in redefines onOccurrence = w::self {
+    				in onOccurrence = w::self {
     					feature redefines startingAt : w {
     						inout feature redefines accessedFeature redefines v;
     					}

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

@@ -1832,15 +1832,18 @@ ruleMetadataReference returns [EObject current=null]
 	(
 		(
 			{
-				if ($current==null) {
-					$current = createModelElement(grammarAccess.getMetadataReferenceRule());
-				}
-			}
-			{
-				newCompositeNode(grammarAccess.getMetadataReferenceAccess().getReferencedElementElementCrossReference_0());
+				newCompositeNode(grammarAccess.getMetadataReferenceAccess().getOwnedRelationshipElementReferenceMemberParserRuleCall_0());
 			}
-			ruleQualifiedName
+			lv_ownedRelationship_0_0=ruleElementReferenceMember
 			{
+				if ($current==null) {
+					$current = createModelElementForParent(grammarAccess.getMetadataReferenceRule());
+				}
+				add(
+					$current,
+					"ownedRelationship",
+					lv_ownedRelationship_0_0,
+					"org.omg.kerml.expressions.xtext.KerMLExpressions.ElementReferenceMember");
 				afterParserOrEnumRuleCall();
 			}
 		)
@@ -3792,15 +3795,18 @@ ruleMetadataAccessExpression returns [EObject current=null]
 		(
 			(
 				{
-					if ($current==null) {
-						$current = createModelElement(grammarAccess.getMetadataAccessExpressionRule());
-					}
-				}
-				{
-					newCompositeNode(grammarAccess.getMetadataAccessExpressionAccess().getReferencedElementElementCrossReference_0_0());
+					newCompositeNode(grammarAccess.getMetadataAccessExpressionAccess().getOwnedRelationshipElementReferenceMemberParserRuleCall_0_0());
 				}
-				ruleQualifiedName
+				lv_ownedRelationship_0_0=ruleElementReferenceMember
 				{
+					if ($current==null) {
+						$current = createModelElementForParent(grammarAccess.getMetadataAccessExpressionRule());
+					}
+					add(
+						$current,
+						"ownedRelationship",
+						lv_ownedRelationship_0_0,
+						"org.omg.kerml.expressions.xtext.KerMLExpressions.ElementReferenceMember");
 					afterParserOrEnumRuleCall();
 				}
 			)
@@ -3816,6 +3822,39 @@ ruleMetadataAccessExpression returns [EObject current=null]
 	)
 ;
 
+// Entry rule entryRuleElementReferenceMember
+entryRuleElementReferenceMember returns [EObject current=null]:
+	{ newCompositeNode(grammarAccess.getElementReferenceMemberRule()); }
+	iv_ruleElementReferenceMember=ruleElementReferenceMember
+	{ $current=$iv_ruleElementReferenceMember.current; }
+	EOF;
+
+// Rule ElementReferenceMember
+ruleElementReferenceMember returns [EObject current=null]
+@init {
+	enterRule();
+}
+@after {
+	leaveRule();
+}:
+	(
+		(
+			{
+				if ($current==null) {
+					$current = createModelElement(grammarAccess.getElementReferenceMemberRule());
+				}
+			}
+			{
+				newCompositeNode(grammarAccess.getElementReferenceMemberAccess().getMemberElementElementCrossReference_0());
+			}
+			ruleQualifiedName
+			{
+				afterParserOrEnumRuleCall();
+			}
+		)
+	)
+;
+
 // Entry rule entryRuleInvocationExpression
 entryRuleInvocationExpression returns [EObject current=null]:
 	{ newCompositeNode(grammarAccess.getInvocationExpressionRule()); }