KERML_-58 Updated LoopAction and subclasses for proper parameter redefs.

- Also changed parameter order for LoopPerformance so untilTest comes
after body.

Author: seidewitz

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.xpect.tests/library/ControlPerformances.kerml

@@ -116,8 +116,8 @@ standard library package ControlPerformances {
 		 */
 
 		in whileTest : BooleanEvaluation[1..*];
-		in untilTest : BooleanEvaluation[0..*];
 		in body : Occurrence[0..*];
+        in untilTest : BooleanEvaluation[0..*];
 
 		step whileDecision : IfThenPerformance[1..*];
 		step untilDecision : IfElsePerformance[0..*];

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_Expressions.kerml.xt

@@ -62,14 +62,13 @@ package Expressions {
 		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.sysml.xpect.tests/library.kernel/ControlPerformances.kerml

@@ -31,7 +31,7 @@ standard library package ControlPerformances {
 			 * successions going out of a decision step.
 			 */
 
-			 feature redefines earlierOccurrence subsets that;
+			 end feature redefines earlierOccurrence subsets that;
 		}
 	}
 
@@ -52,7 +52,7 @@ standard library package ControlPerformances {
 			 * successions coming into a merge step.
 			 */
 
-			 feature redefines laterOccurrence subsets that;
+			 end feature redefines laterOccurrence subsets that;
 		}
 	}
 
@@ -116,8 +116,8 @@ standard library package ControlPerformances {
 		 */
 
 		in whileTest : BooleanEvaluation[1..*];
-		in untilTest : BooleanEvaluation[0..*];
 		in body : Occurrence[0..*];
+        in untilTest : BooleanEvaluation[0..*];
 
 		step whileDecision : IfThenPerformance[1..*];
 		step untilDecision : IfElsePerformance[0..*];

org.omg.sysml.xpect.tests/library.systems/Actions.sysml

@@ -431,6 +431,7 @@ standard library package Actions {
 		 * A LoopAction is the base type for all LoopActionUsages.
 		 */
 
+        in ref iterator;
 
 		in action body[0..*] {
 			doc
@@ -447,7 +448,7 @@ standard library package Actions {
 		 * It is the base type for all WhileLoopActionUsages.
 		 */
 
-		in :>> whileTest default {true} {
+		in whileTest default {true} {
 			doc
 			/*
 			 * A Boolean expression that must be true for the loop to continue.
@@ -456,15 +457,15 @@ standard library package Actions {
 			 */
 		}
 
-		in action body :>> LoopAction::body, LoopPerformance::body {
+		in action body {
 			doc
 			/*
 			 * The action that is performed while the whileTest is true and the
 			 * untilTest is false.
 			 */
 		}
 
-		in :>> untilTest default {false} {
+		in untilTest default {false} {
 			doc
 			/*
 			 * A Boolean expression that must be false for the loop to continue.
@@ -473,12 +474,7 @@ standard library package Actions {
 		}
 	}
 
-	private abstract action def ForLoopActionBase :> LoopAction {
-		in action body;
-		in ref seq[0..*] ordered nonunique;
-	}
-	
-	action def ForLoopAction :> ForLoopActionBase {
+	action def ForLoopAction :> LoopAction {
 		doc
 		/*
 		 * A ForLoopAction is a LoopAction that iterates over an ordered sequence of values.
@@ -493,14 +489,14 @@ standard library package Actions {
 			 */
 		}
 
-		in ref :>> seq {
+		in ref seq {
 			doc
 			/*
 			 * The sequence of values over which the loop iterates.
 			 */
 		}
 
-		in action :>> body {
+		in action body {
 			doc
 			/*
 			 * The action that is performed on each iteration of the loop.