ST6RI-956 Abstract syntax metamodel for KerML 1.1/SysML 2.1 Beta 2

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/Feature.java

@@ -1072,18 +1072,21 @@ public interface Feature extends Type {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * <p>If this <code>Feature</code> is an end <code>Feature</code> of its <code>owningType</code>, then return the first <code>ownedMember</code> of the <code>Feature</code> that is a <code>Feature</code>, but not a <code>Multiplicity</code> or a <code>MetadataFeature</code>, and whose <code>owningMembership</code> is <em>not</em> a <code>FeatureMembership</code>. If this exists, it is the <code>crossFeature</code> of the end <code>Feature</code>.</p>
+	 * <p>If this <code>Feature</code> is an end <code>Feature</code> of its <code>owningType</code>, then return the first <code>ownedMember</code> of the <code>Feature</code> that is a <code>Feature</code>, but <em>not</em> a <code>Multiplicity</code>, <code>MetadataFeature</code>, or <code>BindingConnector</code>, and whose <code>owningMembership</code> is <em>not</em> a <code>FeatureMembership</code> or <code>FeatureValue</code>. If this exists, it is the <code>crossFeature</code> of the end <code>Feature</code>.</p>
 	 * if not isEnd or owningType = null then null
 	 * else
 	 *     let ownedMemberFeatures: Sequence(Feature) =
 	 *         ownedMember->selectByKind(Feature)->
-	 *             reject(oclIsKindOf(Multiplicity) or 
+	 *             reject(oclIsKindOf(Multiplicity) or
 	 *                    oclIsKindOf(MetadataFeature) or
-	 *                    oclIsKindOf(FeatureValue))->
-	 *             reject(owningMembership.oclIsKindOf(FeatureMembership)) in
+	 *                    oclIsKindOf(BindingConnector))->
+	 *             reject(owningMembership.oclIsKindOf(FeatureMembership) or
+	 *                    owningMembership.oclIsKindOf(FeatureValue)) in
 	 *     if ownedMemberFeatures.isEmpty() then null
 	 *     else ownedMemberFeatures->first()
 	 *     endif
+	 * endif
+	 * 
 	 * <!-- end-model-doc -->
 	 * @model ordered="false"
 	 *        annotation="http://www.omg.org/spec/SysML"

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/IndexExpression.java

@@ -11,7 +11,7 @@
  * <!-- begin-model-doc -->
  * <p>An <code>IndexExpression</code> is an <code>OperatorExpression</code> whose operator is <code>"#"</code>, which resolves to the <code>Function</code> <em><code>BasicFunctions::'#'</code></em> from the Kernel Functions Library.</p>
  * arguments->notEmpty() and 
- * not arguments->first().result.specializesFromLibrary('Collections::Array') implies
+ * not arguments->first().result.specializesFromLibrary('Collections::Collection') implies
  *     result.specializes(arguments->first().result)
  * operator = '#'
  * <!-- end-model-doc -->

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/MultiplicityRange.java

@@ -12,7 +12,15 @@
  * <!-- begin-model-doc -->
  * <p>A <code>MultiplicityRange</code> is a <code>Multiplicity</code> whose value is defined to be the (inclusive) range of natural numbers given by the result of a <code>lowerBound</code> <code>Expression</code> and the result of an <code>upperBound</code> <code>Expression</code>. The result of these <code>Expressions</code> shall be of type <code><em>Natural</em></code>. If the result of the <code>upperBound</code> <code>Expression</code> is the unbounded value <code>*</code>, then the specified range includes all natural numbers greater than or equal to the <code>lowerBound</code> value. If no <code>lowerBound</code> <code>Expression</code>, then the default is that the lower bound has the same value as the upper bound, except if the <code>upperBound</code> evaluates to <code>*</code>, in which case the default for the lower bound is 0.</p>
  * 
- * bound->forAll(b | b.featuringType = self.featuringType)
+ * let boundsFeaturingType : OrderedSet(Type) =
+ *     if owningNamespace <> null and owningNamespace.oclIsKindOf(Feature) and 
+ *         owningNamespace.oclAsType(Feature).isOwnedCrossFeature() then
+ *         owningNamespace.oclAsType(Feature).owningNamespace.oclAsType(Feature).featuringType
+ *     else
+ *         featuringType
+ *     endif in
+ * bound->forAll(b | b.featuringType = boundsFeaturingType)
+ * 
  * bound->forAll(b |
  *     b.result.specializesFromLibrary('ScalarValues::Integer') and
  *     let value : UnlimitedNatural = valueOf(b) in

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/Redefinition.java

@@ -36,7 +36,11 @@
  *     and 
  *     (direction = FeatureDirectionKind::inout implies
  *         redefiningFeature.direction <> null))
- * redefinedFeature.isEnd implies redefiningFeature.isEnd
+ * redefinedFeature.isEnd and
+ * redefiningFeature.owningType <> null and
+ * (redefiningFeature.owningType.oclIsKindOf(Association) or
+ *  redefiningFeature.owningType.oclIsKindOf(Connector)) implies
+ *     redefiningFeature.isEnd
  * <!-- end-model-doc -->
  *
  * <p>

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/RequirementUsage.java

@@ -42,7 +42,8 @@
  * specializesFromLibrary('Requirements::requirementChecks')
  * isComposite and owningType <> null and
  *     (owningType.oclIsKindOf(RequirementDefinition) or
- *      owningType.oclIsKindOf(RequirementUsage)) implies
+ *      owningType.oclIsKindOf(RequirementUsage)) and 
+ *     not owningFeatureMembership.oclIsKindOf(RequirementConstraintMembership) implies
  *     specializesFromLibrary('Requirements::RequirementCheck::subrequirements')
  * owningfeatureMembership <> null and
  * owningfeatureMembership.oclIsKindOf(ObjectiveMembership) implies

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/SendActionUsage.java

@@ -19,7 +19,7 @@
  *     payloadArgument <> null
  * receiverArgument = argument(3)
  * isSubactionUsage() implies
- *     specializesFromLibrary('Actions::Action::acceptSubactions')
+ *     specializesFromLibrary('Actions::Action::sendSubactions')
  * specializesFromLibrary('Actions::sendActions')
  * <!-- end-model-doc -->
  *

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/Type.java

@@ -39,8 +39,10 @@
  * specializesFromLibrary('Base::Anything')
  * directedFeature = feature->select(f | directionOf(f) <> null)
  * feature = featureMembership.ownedMemberFeature
- * featureMembership = ownedFeatureMembership->union(
- *     inheritedMembership->selectByKind(FeatureMembership))
+ * featureMembership = ownedFeatureMembership->
+ *     union(inheritedMembership->
+ *         selectByKind(FeatureMembership)->
+ *         select(mem | self.specializes(mem.owningType)))
  * ownedFeature = ownedFeatureMembership.ownedMemberFeature
  * differencingType = ownedDifferencing.differencingType
  * intersectingType->excludes(self)

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/Usage.java

@@ -43,7 +43,7 @@
  * nestedFlow = nestedUsage->selectByKind(FlowUsage)
  * nestedInterface = nestedUsage->selectByKind(ReferenceUsage)
  * nestedItem = nestedUsage->selectByKind(ItemUsage)
- * nestedMetadata = nestedUsage->selectByKind(MetadataUsage)
+ * nestedMetadata = ownedMember->selectByKind(MetadataUsage)
  * nestedOccurrence = nestedUsage->selectByKind(OccurrenceUsage)
  * nestedPart = nestedUsage->selectByKind(PartUsage)
  * nestedPort = nestedUsage->selectByKind(PortUsage)