ST6RI-628 Updated reflective KerML.kerml and SysML.sysml models.

Author: seidewitz

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

@@ -1,4 +1,9 @@
 standard library package KerML {
+	doc 
+	/*
+	 * This package contains a reflective KerML model of the KerML abstract syntax.
+	 */
+	 
 	private import ScalarValues::*;
 	import Kernel::*;
 
@@ -19,18 +24,25 @@ standard library package KerML {
 			feature body : String[1..1];
 		}		
 
+		metaclass Dependency specializes Relationship {
+			feature client : Element[1..*] redefines source;
+			feature supplier : Element[1..*] redefines target;
+		}		
+				
 		metaclass Documentation specializes Comment {
 			derived feature documentedElement : Element[1..1] subsets owner redefines annotatedElement;
 		}		
 
-		metaclass Element {
+		abstract metaclass Element {
 			feature elementId : String[1..1];
 			feature aliasIds : String[0..*];
-			feature shortName : String[0..1];
-			feature name : String[0..1];
+			feature declaredShortName : String[0..1];
+			feature declaredName : String[0..1];
 			feature isImpliedIncluded : Boolean[1..1];
-			derived feature effectiveName : String[0..1];
+			derived feature shortName : String[0..1];
+			derived feature name : String[0..1];
 			derived feature qualifiedName : String[0..1];
+			derived feature isLibraryElement : Boolean[1..1];
 
 			feature owningRelationship : Relationship[0..1];
 			composite feature ownedRelationship : Relationship[0..*];
@@ -43,14 +55,13 @@ standard library package KerML {
 			derived feature textualRepresentation : TextualRepresentation[0..*] subsets ownedElement;
 		}		
 
-		metaclass Import specializes Relationship {
+		abstract metaclass Import specializes Relationship {
 			feature visibility : VisibilityKind[1..1];
-			feature importedMemberName : String[0..1];
 			feature isRecursive : Boolean[1..1];
 			feature isImportAll : Boolean[1..1];
 
-			feature importedNamespace : Namespace[1..1] redefines target;
 			derived feature importOwningNamespace : Namespace[1..1] subsets owningRelatedElement redefines source;
+			derived feature importedElement : Element[1..1];
 		}		
 
 		metaclass Membership specializes Relationship {
@@ -63,6 +74,10 @@ standard library package KerML {
 			derived feature membershipOwningNamespace : Namespace[1..1] subsets owningRelatedElement redefines source;
 		}		
 
+		metaclass MembershipImport specializes Import {
+			feature importedMembership : Membership[1..1] redefines target;
+		}		
+				
 		metaclass Namespace specializes Element {
 			abstract derived feature membership : Membership[0..*];
 			composite derived feature ownedImport : Import[0..*] subsets ownedRelationship;
@@ -72,6 +87,10 @@ standard library package KerML {
 			derived feature importedMembership : Membership[0..*] subsets membership;
 		}		
 
+		metaclass NamespaceImport specializes Import {
+			feature importedNamespace : Namespace[1..1] redefines target;
+		}		
+				
 		metaclass OwningMembership specializes Membership {
 			derived feature ownedMemberElementId : String[1..1] redefines memberElementId;
 			derived feature ownedMemberShortName : String[0..1] redefines memberShortName;
@@ -80,14 +99,14 @@ standard library package KerML {
 			composite derived feature ownedMemberElement : Element[1..1] subsets ownedRelatedElement redefines memberElement;
 		}		
 
-		metaclass Relationship specializes Element {
+		abstract metaclass Relationship specializes Element {
 			feature isImplied : Boolean[1..1];
 
 			feature target : Element[0..*] subsets relatedElement;
 			feature source : Element[0..*] subsets relatedElement;
 			feature owningRelatedElement : Element[0..1] subsets relatedElement;
 			composite feature ownedRelatedElement : Element[0..*] subsets relatedElement;
-			derived feature relatedElement : Element[2..*];
+			derived feature relatedElement : Element[0..*];
 		}		
 
 		metaclass TextualRepresentation specializes AnnotatingElement {
@@ -144,7 +163,7 @@ standard library package KerML {
 			feature direction : FeatureDirectionKind[0..1];
 
 			derived feature owningType : Type[0..1] subsets owningNamespace, featuringType;
-			derived feature 'type' : Type[1..*];
+			derived feature 'type' : Type[0..*];
 			composite derived feature ownedRedefinition : Redefinition[0..*] subsets ownedSubsetting;
 			composite derived feature ownedSubsetting : Subsetting[0..*] subsets ownedSpecialization;
 			derived feature owningFeatureMembership : FeatureMembership[0..1] subsets owningMembership;
@@ -266,10 +285,10 @@ standard library package KerML {
 		import Core::*;
 
 		metaclass Association specializes Classifier, Relationship {
-			derived feature relatedType : Type[2..*] redefines relatedElement;
+			derived feature relatedType : Type[0..*] redefines relatedElement;
 			derived feature sourceType : Type[0..1] subsets relatedType redefines source;
-			derived feature targetType : Type[1..*] subsets relatedType redefines target;
-			derived feature associationEnd : Feature[2..*] redefines endFeature;
+			derived feature targetType : Type[0..*] subsets relatedType redefines target;
+			derived feature associationEnd : Feature[0..*] redefines endFeature;
 		}		
 
 		metaclass AssociationStructure specializes Structure, Association;		
@@ -282,7 +301,7 @@ standard library package KerML {
 		metaclass BindingConnector specializes Connector;		
 
 		metaclass BooleanExpression specializes Expression {
-			derived feature 'predicate' : Predicate[1..1] redefines 'function';
+			derived feature 'predicate' : Predicate[0..1] redefines 'function';
 		}		
 
 		metaclass Class specializes Classifier;		
@@ -294,11 +313,11 @@ standard library package KerML {
 		metaclass Connector specializes Feature, Relationship {
 			feature isDirected : Boolean[1..1];
 
-			derived feature relatedFeature : Feature[2..*] redefines relatedElement;
-			derived feature association : Association[1..*] redefines 'type';
-			derived feature connectorEnd : Feature[2..*] redefines endFeature;
+			derived feature relatedFeature : Feature[0..*] redefines relatedElement;
+			derived feature association : Association[0..*] redefines 'type';
+			derived feature connectorEnd : Feature[0..*] redefines endFeature;
 			derived feature sourceFeature : Feature[0..1] subsets relatedFeature redefines source;
-			derived feature targetFeature : Feature[1..*] subsets relatedFeature redefines target;
+			derived feature targetFeature : Feature[0..*] subsets relatedFeature redefines target;
 		}		
 
 		metaclass DataType specializes Classifier;		
@@ -310,7 +329,7 @@ standard library package KerML {
 		metaclass Expression specializes Step {
 			derived feature isModelLevelEvaluable : Boolean[1..1];
 
-			derived feature 'function' : Function[1..1] redefines 'behavior';
+			derived feature 'function' : Function[0..1] redefines 'behavior';
 			derived feature result : Feature[1..1] subsets parameter, output;
 		}		
 
@@ -355,15 +374,16 @@ standard library package KerML {
 			derived feature itemType : Classifier[0..*];
 			derived feature targetInputFeature : Feature[0..1];
 			derived feature sourceOutputFeature : Feature[0..1];
-			derived feature itemFlowEnd : ItemFlowEnd[2..*] redefines connectorEnd;
+			derived feature itemFlowEnd : ItemFlowEnd[0..2] subsets connectorEnd;
 			derived feature itemFeature : ItemFeature[0..1] subsets ownedFeature;
-			derived feature itemFlowFeature : ItemFlowFeature[2..*];
-			derived feature 'interaction' : Interaction[1..*] redefines association, 'behavior';
+			derived feature 'interaction' : Interaction[0..*] redefines association, 'behavior';
 		}		
 
 		metaclass ItemFlowEnd specializes Feature;		
 
-		metaclass ItemFlowFeature specializes Feature;		
+		metaclass LibraryPackage specializes Package {
+			feature isStandard : Boolean[1..1];
+		}		
 
 		metaclass LiteralBoolean specializes LiteralExpression {
 			feature value : Boolean[1..1];
@@ -387,8 +407,12 @@ standard library package KerML {
 
 		metaclass Metaclass specializes Structure;		
 
+		metaclass MetadataAccessExpression specializes Expression {
+			feature referencedElement : Element[1..1];
+		}		
+				
 		metaclass MetadataFeature specializes AnnotatingElement, Feature {
-			derived feature 'metaclass' : Metaclass[1..1] redefines 'type';
+			derived feature 'metaclass' : Metaclass[0..1] redefines 'type';
 		}		
 
 		metaclass MultiplicityRange specializes Multiplicity {
@@ -401,8 +425,6 @@ standard library package KerML {
 
 		metaclass OperatorExpression specializes InvocationExpression {
 			feature operator : String[1..1];
-			
-			composite derived feature operand : Expression[0..*];
 		}		
 
 		metaclass Package specializes Namespace {
@@ -430,10 +452,8 @@ standard library package KerML {
 			feature operator : String[1..1] redefines operator;
 		}		
 
-		metaclass SourceEnd specializes Feature;		
-				
 		metaclass Step specializes Feature {
-			derived feature 'behavior' : Behavior[1..*] redefines 'type';
+			derived feature 'behavior' : Behavior[0..*] subsets 'type';
 			derived feature parameter : Feature[0..*] redefines directedFeature;
 		}		
 
@@ -448,7 +468,5 @@ standard library package KerML {
 
 		metaclass SuccessionItemFlow specializes Succession, ItemFlow;		
 
-		metaclass TargetEnd specializes Feature;		
-				
 	}
 }