Merge pull request #679 from Systems-Modeling/ST6RI-872

ST6RI-872 Library models have inherited member name collisions (KERML11-76, SYSML21-322)

Author: seidewitz

kerml/src/examples/KerML Spec Annex A Examples/A-3-8-ChangingFeatureValues.kerml

@@ -110,15 +110,21 @@ package ChangingFeatureValuesExecution {
 	#atom
 	behavior MyPaint specializes Paint {
 		feature redefines objectToPaint : MyProduct;
-		step redefines painting : PaintingMyProductFeatureWrite;
-		step redefines painted : PaintedMyProductFeatureWrite;
+		step redefines painting : PaintingMyProductFeatureWrite {
+		    in onOccurrence;
+		}
+		step redefines painted : PaintedMyProductFeatureWrite {
+            in onOccurrence;
+        }
 		succession redefines p_before_p : MyPaintingFW_Before_PaintFW_Link first painting then painted;
 	}
 
 	#atom
 	behavior MyDry specializes Dry {
 		feature redefines objectToDry : MyProduct;
-		step redefines dried : MyProductFeatureWrite;  
+		step redefines dried : MyProductFeatureWrite {
+            in onOccurrence;
+        }
 	}
 	#atom
 	assoc MyPaint_Before_Dry_Link specializes HappensBefore {
@@ -128,7 +134,9 @@ package ChangingFeatureValuesExecution {
 	#atom
 	behavior MyShip specializes Ship {
 		feature redefines objectToShip : MyProduct;
-		step redefines shipped : MyProductFeatureWrite;  
+		step redefines shipped : MyProductFeatureWrite {
+            in onOccurrence;
+        }
 	}
 	#atom
 	assoc MyDry_Before_Ship_Link specializes HappensBefore {
@@ -144,7 +152,9 @@ package ChangingFeatureValuesExecution {
 		feature obPiS chains objectToFinish.beforePaint.isShipped = false;
 
 
-		step redefines paint : MyPaint;
+		step redefines paint : MyPaint {
+		    feature redefines paint::objectToPaint, MyPaint::objectToPaint;
+		}
 		feature subsets objectToFinish.beforePaint.immediateSuccessors,
 				objectToFinish.whilePainting.startShot.timeCoincidentOccurrences
 			chains paint.painting.endShot;
@@ -161,7 +171,9 @@ package ChangingFeatureValuesExecution {
 		feature oaPiS chains objectToFinish.afterPaint.isShipped = false;
 
 
-		step redefines dry : MyDry;
+		step redefines dry : MyDry {
+            feature redefines dry::objectToDry, MyDry::objectToDry;
+        }
 		succession redefines p_before_d : MyPaint_Before_Dry_Link [1] first paint then dry;
 		feature subsets objectToFinish.afterPaint.immediateSuccessors,
 				objectToFinish.afterDry.startShot.timeCoincidentOccurrences
@@ -171,7 +183,9 @@ package ChangingFeatureValuesExecution {
 		feature oaDiS chains objectToFinish.afterDry.isShipped = false;
 
 
-		step redefines ship : MyShip;
+		step redefines ship : MyShip {
+            feature redefines ship::objectToShip, MyShip::objectToShip;
+        }
 		succession redefines d_before_s : MyDry_Before_Ship_Link [1] first dry then ship;
 		feature subsets objectToFinish.afterDry.immediateSuccessors,
 				objectToFinish.afterShip.startShot.timeCoincidentOccurrences

kerml/src/examples/Variable Feature Examples/Enhancements/ExtendedOccurrences.kerml

@@ -47,4 +47,8 @@ package ExtendedOccurrences {
         	connector : Occurrences::HappensDuring from [1] that to [1] self;
         }
     }
+    struct ExtendedObject :> ExtendedOccurrence {
+        feature self : ExtendedObject :>> Objects::Object::self, ExtendedOccurrence::self;
+    }
+
 }

kerml/src/examples/Variable Feature Examples/Enhancements/TimeVaryingFeaturesEnhanced.kerml

@@ -1,6 +1,6 @@
 package TimeVaryingFeaturesEnhanced {
     private import ExtendedOccurrences::*;
-
+    
     class CC1 :> ExtendedOccurrence {
         var feature x;
         //member feature x featured by CC1_snapshots {
@@ -116,7 +116,7 @@ package TimeVaryingFeaturesEnhanced {
         //}
     }
 
-    struct Car1 :> ExtendedOccurrence {  // May or may not be a life
+    struct Car1 :> ExtendedObject {  // May or may not be a life
 	    var feature driver : Person [0..1];
 	    //member feature driver : Person [0..1] featured by Car_snapshots {
 	    //    member feature Car_snapshots :>> ExtendedOccurrences::ExtendedOccurrence::snapshots featured by Car1;

org.omg.kerml.xpect.tests/library/FeatureReferencingPerformances.kerml

@@ -133,8 +133,8 @@ standard library package FeatureReferencingPerformances {
 		 */
 
 		in feature onOccurrence : Evaluation redefines onOccurrence {
-	    	protected monitoredOccurrence : Evaluation [1] redefines monitoredOccurrence {
-				out result : Anything[*] redefines result, monitoredFeature; 
+	    	protected expr monitoredOccurrence : Evaluation [1] redefines monitoredOccurrence {
+				return result : Anything[*] redefines result, monitoredFeature; 
 			} 
 		} 
 	}
@@ -147,7 +147,9 @@ standard library package FeatureReferencingPerformances {
 		 */	
 
 	  	in bool redefines onOccurrence {
-	    	protected bool redefines monitoredOccurrence[1];
+	    	protected bool redefines monitoredOccurrence[1] {
+	    	    return result : Boolean [1];
+	    	}
 		}
 		out redefines afterValues : Boolean [1]; 
 		out redefines beforeValues : Boolean [1];	 
@@ -167,10 +169,16 @@ standard library package FeatureReferencingPerformances {
   		feature isToTrue : Boolean [1] default true;
   		out afterValues: Boolean[1] redefines values  = isToTrue;
   		private feature monitor1 : BooleanEvaluationResultMonitorPerformance [1] {
-    		feature redefines endWhen : HappensJustBefore;
+    		feature redefines endWhen : HappensJustBefore {
+    		    end feature earlierOccurrence;
+    		    end feature laterOccurrence;
+    		}
   		}
   		private feature monitor2 : BooleanEvaluationResultMonitorPerformance [1] {
-    		feature redefines endWhen : HappensJustBefore;
+    		feature redefines endWhen : HappensJustBefore {
+                end feature earlierOccurrence;
+                end feature laterOccurrence;
+            }
   		}
 
   		private connector : HappensJustBefore from [1] monitor1 to [0..1] monitor2;

org.omg.kerml.xpect.tests/library/Objects.kerml

@@ -165,27 +165,46 @@ standard library package Objects {
 		 * inner space dimension of structured space object is the highest of their cells.
 		 */
 
-		abstract portion feature structuredSpaceObjectCells : StructuredSpaceObject[1..*] subsets Occurrence::spaceSlices
-		  { feature cellOrientation : Integer [0..1];
+        abstract portion feature structuredSpaceObjectCells : StructuredSpaceObject[1..*] subsets Occurrence::spaceSlices { 
+            feature cellOrientation : Integer [0..1];
 		    inv { notEmpty(cellOrientation) implies (cellOrientation >= -1 & cellOrientation <= 1) }
-		  }
+		}
+		
+		comment about StructuredSurface, StructuredCurve, StructuredPoint
+		/*
+		 * The structures StructuredSurface, StructuredCurve and StructuredPoint provide common, necessary redefinitions of
+		 * innerSpaceDimension. They also provide single types for the StructuredSpaceObject features faces, edges and
+		 * vertices, which avoids problems when these features are related by connectors with ends that have owned
+		 * cross features.
+		 */
+		struct StructuredSurface specializes StructuredSpaceObject, Surface {
+            feature redefines StructuredSpaceObject::innerSpaceDimension, Surface::innerSpaceDimension;		    
+		}
+        struct StructuredCurve specializes StructuredSpaceObject, Curve {
+            feature redefines StructuredSpaceObject::innerSpaceDimension, Curve::innerSpaceDimension;         
+        }
+        struct StructuredPoint specializes StructuredSpaceObject, Point {
+            feature redefines StructuredSpaceObject::innerSpaceDimension, Point::innerSpaceDimension;         
+        }
 
-		portion feature faces : Surface[0..*] ordered subsets structuredSpaceObjectCells {
-			feature redefines edges subsets StructuredSpaceObject::edges;
-			feature redefines vertices subsets StructuredSpaceObject::vertices;
+		portion feature faces : StructuredSurface[0..*] ordered subsets structuredSpaceObjectCells {
+		    feature redefines that : StructuredSpaceObject;
+			feature redefines edges subsets that.edges;
+			feature redefines vertices subsets that.vertices;
 			derived feature redefines spaceBoundary; 
 			inv { isEmpty(spaceBoundary) == isEmpty(union(edges, vertices)) }
 			inv { notEmpty(spaceBoundary) implies contains(spaceBoundary.unionsOf, union(edges, vertices)) }
 		}
 
-		portion feature edges : Curve[0..*] ordered subsets structuredSpaceObjectCells {
-			feature redefines vertices subsets StructuredSpaceObject::vertices;
+		portion feature edges : StructuredCurve[0..*] ordered subsets structuredSpaceObjectCells {
+            feature redefines that : StructuredSpaceObject;
+			feature redefines vertices subsets that.vertices;
 			derived feature redefines spaceBoundary;
 			inv { isEmpty(spaceBoundary) == isEmpty(vertices) }
 			inv { notEmpty(spaceBoundary) implies contains(spaceBoundary.unionsOf, vertices) }
 		}
 
-		portion feature vertices : Point[0..*] ordered subsets structuredSpaceObjectCells;
+		portion feature vertices : StructuredPoint[0..*] ordered subsets structuredSpaceObjectCells;
 
 		derived feature redefines innerSpaceDimension = 
 			if notEmpty(faces) ? 2 else if notEmpty(edges) ? 1 else 0;

org.omg.kerml.xpect.tests/library/Observation.kerml

@@ -92,6 +92,7 @@ standard library package Observation {
 	    	end feature source {
 	    		feature redefines sourceOutput = changeSignal;
 	    	}
+	    	end feature target;
 	    }
 	}
 

org.omg.kerml.xpect.tests/library/Occurrences.kerml

@@ -537,16 +537,16 @@ standard library package Occurrences {
 			 * the inner ones.
 			 */
 
-			feature redefines isClosed = true;
+			inv { isClosed == true }
 
 			feature spaceBounder: Occurrence [1] subsets self;
 
-			outer: Occurrence [0..1] subsets spaceSlices {
+			feature outer: Occurrence [0..1] subsets spaceSlices {
 				feature redefines isClosed = true;
 				feature redefines innerSpaceDimension = spaceBounder.innerSpaceDimension;
 			}
 
-			inner: Occurrence [0..*] subsets spaceSlices {
+			feature inner: Occurrence [0..*] subsets spaceSlices {
 				feature redefines isClosed = true;
 				feature redefines innerSpaceDimension = spaceBounder.innerSpaceDimension;
 			}

org.omg.kerml.xpect.tests/library/Transfers.kerml

@@ -167,7 +167,7 @@ standard library package Transfers {
         private succession self then target;
     }
 
-    interaction FlowTransferBefore specializes FlowTransfer, TransferBefore intersects FlowTransfer, TransferBefore {
+    interaction FlowTransferBefore specializes TransferBefore, FlowTransfer intersects FlowTransfer, TransferBefore {
         doc
         /*
          * FlowTransferBefore is a FlowTransfer that is also a TransferBefore. 

org.omg.kerml.xpect.tests/library/VectorFunctions.kerml

@@ -179,7 +179,9 @@ standard library package VectorFunctions {
 	}
 	function CartesianThreeVectorOf specializes CartesianVectorOf { 
 		in components: Real[3] ordered nonunique;
-		return : CartesianThreeVectorValue[1];
+		return : CartesianThreeVectorValue[1] {
+		    feature :>> CartesianVectorOf::result::dimension, CartesianThreeVectorValue::dimension;
+		}
 	}
 
 	feature cartesianZeroVector: CartesianVectorValue[3] =

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_ImportAndInnerClassesNamesAreTheSameBadCase3_Rdef.kerml.xt

@@ -25,7 +25,7 @@ package test{
 		public import OuterPackage::*;
 	}
 	feature inner1 subsets inner {
-		//XPECT warnings --> "Duplicate of inherited member name B from OuterPackage" at "B"
+		//XPECT warnings --> "Duplicate of inherited member name 'B' from OuterPackage" at "B"
 		feature B redefines A {
 			//XPECT linkedName at a1 --> OuterPackage.A.a1
 			//* XPECT scope at a1 ---