KERML_-1 Implemented check for validateRedefinitionEndConformance.

- Also updated ControlPerformances to remove validation errors.

Author: seidewitz

org.omg.kerml.xpect.tests/library/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;
 		}
 	}
 

org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend

@@ -180,6 +180,8 @@ class KerMLValidator extends AbstractKerMLValidator {
 
 	public static val INVALID_REDEFINITION_DIRECTION_CONFORMANCE = "validateRedefinitionDirectionConformance"
 	public static val INVALID_REDEFINITION_DIRECTION_CONFORMANCE_MSG = "Redefining feature must have a compatible direction"
+	public static val INVALID_REDEFINITION_END_CONFORMANCE = "validateRedefinitionEndConformance"
+	public static val INVALID_REDEFINITION_END_CONFORMANCE_MSG = "Redefining feature must be an end feature"
 	public static val INVALID_REDEFINITION_FEATURING_TYPES = 'validateRedefinitionFeaturingTypes'
 	public static val INVALID_REDEFINITION_FEATURING_TYPES_MSG_1 = "A package-level feature cannot be redefined"
 	public static val INVALID_REDEFINITION_FEATURING_TYPES_MSG_2 = "Owner of redefining feature cannot be the same as owner of redefined feature"
@@ -601,6 +603,13 @@ class KerMLValidator extends AbstractKerMLValidator {
 						SysMLPackage.eINSTANCE.redefinition_RedefinedFeature, INVALID_REDEFINITION_FEATURING_TYPES)
 				}
 			}
+			
+			// validatRedefinitionEndConformance
+			
+			if (redefinedFeature.isEnd && !redefiningFeature.isEnd) {
+				error(INVALID_REDEFINITION_END_CONFORMANCE_MSG, redef, 
+						SysMLPackage.eINSTANCE.redefinition_RedefinedFeature, INVALID_REDEFINITION_END_CONFORMANCE)
+			}
 		}		
 	}
 

sysml.library/Kernel Libraries/Kernel Semantic Library/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;
 		}
 	}