SYSML2_-159 Revised SysML grammar for AcceptNode.

- No longer creates an empty parameter if there is no "via" part.
- Also updated validation for accept action usage parameters.
- Updated PartTest to demonstrate revised syntax.

Author: seidewitz

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/simpletests/PartTest.sysml.xt

@@ -3,24 +3,38 @@ XPECT_SETUP org.omg.sysml.xpect.tests.simpletests.SysMLTests
 	ResourceSet {
 		ThisFile {}
 		File {from ="/library.kernel/Base.kerml"}
+		File {from ="/library.kernel/Links.kerml"}
        	File {from ="/library.kernel/Occurrences.kerml"}
        	File {from ="/library.kernel/Objects.kerml"}
+       	File {from ="/library.kernel/Performances.kerml"}
+       	File {from ="/library.kernel/StatePerformances.kerml"}
+       	File {from ="/library.kernel/Transfers.kerml"}
        	File {from ="/library.systems/Attributes.sysml"}
  		File {from ="/library.systems/Items.sysml"}
  		File {from ="/library.systems/Parts.sysml"}
  		File {from ="/library.systems/Ports.sysml"}
+ 		File {from ="/library.systems/Connections.sysml"}
+ 		File {from ="/library.systems/Actions.sysml"}
+ 		File {from ="/library.systems/States.sysml"}
 	}
 	Workspace {
 		JavaProject {
 			SrcFolder {
 				ThisFile {}
 				File {from ="/library.kernel/Base.kerml"}
+				File {from ="/library.kernel/Links.kerml"}
 		       	File {from ="/library.kernel/Occurrences.kerml"}
 		       	File {from ="/library.kernel/Objects.kerml"}
+		       	File {from ="/library.kernel/Performances.kerml"}
+		       	File {from ="/library.kernel/StatePerformances.kerml"}
+       			File {from ="/library.kernel/Transfers.kerml"}
 		       	File {from ="/library.systems/Attributes.sysml"}
 				File {from ="/library.systems/Items.sysml"}
 				File {from ="/library.systems/Parts.sysml"}
  				File {from ="/library.systems/Ports.sysml"}
+ 				File {from ="/library.systems/Connections.sysml"}
+ 				File {from ="/library.systems/Actions.sysml"}
+ 				File {from ="/library.systems/States.sysml"}
 			}
 		}
 	}
@@ -34,20 +48,41 @@ package PartTest {
 	public part def A {
 		part <'1'> b: B;
 		protected port c: C;
-		readonly attribute x;
+		readonly attribute x[0..2];
 		derived ref attribute y :> x;
+		ref z;
 	}
 
+	item def S;
+	
 	abstract part def <xx> B {
 		public abstract part a: A;
-		port x: ~C;
+		public abstract part b subsets a;
+		public abstract part c subsets a;
+		port x: ~C {
+		    port p;
+		    ref port q;
+		}
 		package P { }
+		
+		succession flow x.p to a1.aa.receiver;
+		
+		action a1 {
+			accept S via x;
+			action aa accept S;
+		}
+		perform action a2;
+		
+		state s1;
+		exhibit state s2;
 	}
 
 	private port def C {
 		private in ref y: A, B;
 		alias z1 for y;
 		alias z2 for y;
+		port c1 : C;
+		ref port c2 : C;
 	}
 
     part p1 :> p2;
@@ -56,4 +91,4 @@ package PartTest {
 
     part p4 :> p4;
 
-}
+}

org.omg.sysml.xtext/src-gen/org/omg/sysml/xtext/SysML.xtextbin

@@ -13397,52 +13397,30 @@ ruleAcceptParameterPart[EObject in_current]  returns [EObject current=in_current
 			)
 		)
 		(
-			(
-				otherlv_1='via'
-				{
-					newLeafNode(otherlv_1, grammarAccess.getAcceptParameterPartAccess().getViaKeyword_1_0_0());
-				}
-				(
-					(
-						{
-							newCompositeNode(grammarAccess.getAcceptParameterPartAccess().getOwnedRelationshipNodeParameterMemberParserRuleCall_1_0_1_0());
-						}
-						lv_ownedRelationship_2_0=ruleNodeParameterMember
-						{
-							if ($current==null) {
-								$current = createModelElementForParent(grammarAccess.getAcceptParameterPartRule());
-							}
-							add(
-								$current,
-								"ownedRelationship",
-								lv_ownedRelationship_2_0,
-								"org.omg.sysml.xtext.SysML.NodeParameterMember");
-							afterParserOrEnumRuleCall();
-						}
-					)
-				)
-			)
-			    |
+			otherlv_1='via'
+			{
+				newLeafNode(otherlv_1, grammarAccess.getAcceptParameterPartAccess().getViaKeyword_1_0());
+			}
 			(
 				(
 					{
-						newCompositeNode(grammarAccess.getAcceptParameterPartAccess().getOwnedRelationshipEmptyParameterMemberParserRuleCall_1_1_0());
+						newCompositeNode(grammarAccess.getAcceptParameterPartAccess().getOwnedRelationshipNodeParameterMemberParserRuleCall_1_1_0());
 					}
-					lv_ownedRelationship_3_0=ruleEmptyParameterMember
+					lv_ownedRelationship_2_0=ruleNodeParameterMember
 					{
 						if ($current==null) {
 							$current = createModelElementForParent(grammarAccess.getAcceptParameterPartRule());
 						}
 						add(
 							$current,
 							"ownedRelationship",
-							lv_ownedRelationship_3_0,
-							"org.omg.sysml.xtext.SysML.EmptyParameterMember");
+							lv_ownedRelationship_2_0,
+							"org.omg.sysml.xtext.SysML.NodeParameterMember");
 						afterParserOrEnumRuleCall();
 					}
 				)
 			)
-		)
+		)?
 	)
 ;