ST6RI-751 References to result parameters, subject parameters and objectives do not always resolve correctly

org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend

@@ -54,6 +54,7 @@ import org.omg.sysml.lang.sysml.util.ISysMLScope
 import com.google.inject.Inject
 import org.eclipse.xtext.naming.IQualifiedNameConverter
 import org.eclipse.emf.ecore.util.EcoreUtil
+import org.omg.sysml.util.NamespaceUtil
 
 class KerMLScope extends AbstractScope implements ISysMLScope {
 
@@ -250,6 +251,7 @@ class KerMLScope extends AbstractScope implements ISysMLScope {
 				ownedvisited.add(ns)		
 			}
 
+			NamespaceUtil.addAdditionalMembersTo(ns)
 			for (mem: ns.ownedMembership.clone) { // Clone to avoid any possible ConcurrentModificationException.
 				if (!scopeProvider.visited.contains(mem)) {
 					if (includeAll || isInsideScope || mem.visibility == VisibilityKind.PUBLIC || 

org.omg.sysml/src/org/omg/sysml/adapter/CalculationDefinitionAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2024 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -22,6 +22,7 @@
 package org.omg.sysml.adapter;
 
 import org.omg.sysml.lang.sysml.CalculationDefinition;
+import org.omg.sysml.util.UsageUtil;
 
 public class CalculationDefinitionAdapter extends ActionDefinitionAdapter {
 
@@ -33,10 +34,16 @@ public CalculationDefinition getTarget() {
 		return (CalculationDefinition)super.getTarget();
 	}
 
+	@Override
+	public void addAdditionalMembers() {
+		CalculationDefinition target = getTarget();
+		UsageUtil.addResultParameterTo(target);
+	}
+
 	@Override
 	public void doTransform() {
 		super.doTransform();
-		addResultParameter();
 		createResultConnector(getTarget().getResult());
 	}
+
 }

org.omg.sysml/src/org/omg/sysml/adapter/CalculationUsageAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2023 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2023-2024 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -25,6 +25,7 @@
 import org.omg.sysml.lang.sysml.CalculationDefinition;
 import org.omg.sysml.lang.sysml.CalculationUsage;
 import org.omg.sysml.lang.sysml.Type;
+import org.omg.sysml.util.UsageUtil;
 
 public class CalculationUsageAdapter extends ActionUsageAdapter {
 
@@ -50,10 +51,15 @@ public boolean isSubcalculation() {
 			   owningType instanceof CalculationDefinition || owningType instanceof CalculationUsage;
 	}
 
+	@Override
+	public void addAdditionalMembers() {
+		UsageUtil.addResultParameterTo(getTarget());
+	}
+
 	@Override
 	public void doTransform() {
 		super.doTransform();
-		addResultParameter();
-		createResultConnector(getTarget().getResult());
+		createResultConnector(getTarget().getResult());		
 	}
+
 }

org.omg.sysml/src/org/omg/sysml/adapter/CaseDefinitionAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2024 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -22,11 +22,7 @@
 package org.omg.sysml.adapter;
 
 import org.omg.sysml.lang.sysml.CaseDefinition;
-import org.omg.sysml.lang.sysml.ObjectiveMembership;
-import org.omg.sysml.lang.sysml.RequirementUsage;
-import org.omg.sysml.lang.sysml.SysMLFactory;
-import org.omg.sysml.lang.sysml.Type;
-import org.omg.sysml.lang.sysml.Usage;
+import org.omg.sysml.util.UsageUtil;
 
 public class CaseDefinitionAdapter extends CalculationDefinitionAdapter {
 
@@ -39,31 +35,14 @@ public CaseDefinition getTarget() {
 		return (CaseDefinition)super.getTarget();
 	}
 
-	// Utility
-
-	@Override
-	public Usage getSubjectParameter() {
-		return getTarget().getSubjectParameter();
-	}
-
 	// Transformation
 
-	public static RequirementUsage addObjectiveRequirementTo(Type type) {
-		RequirementUsage objective = SysMLFactory.eINSTANCE.createRequirementUsage();
-		ObjectiveMembership membership = SysMLFactory.eINSTANCE.createObjectiveMembership();
-		membership.setOwnedObjectiveRequirement(objective);
-		type.getOwnedRelationship().add(membership);
-		return objective;
-	}
-
-	@Override
-	public void doTransform() {
-		CaseDefinition definition = getTarget();
-		super.doTransform();
-		UsageAdapter.computeSubjectParameterOf(definition);
-		if (definition.getObjectiveRequirement() == null) {
-			addObjectiveRequirementTo(definition);
-		}
+	@Override 
+	public void addAdditionalMembers() {
+		CaseDefinition target = getTarget();
+		UsageUtil.addSubjectParameterTo(target);
+		UsageUtil.addObjectiveRequirementTo(target);
+		super.addAdditionalMembers();
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/adapter/CaseUsageAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2023 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2023-2024 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -24,7 +24,7 @@
 import org.omg.sysml.lang.sysml.CaseDefinition;
 import org.omg.sysml.lang.sysml.CaseUsage;
 import org.omg.sysml.lang.sysml.Type;
-import org.omg.sysml.lang.sysml.Usage;
+import org.omg.sysml.util.UsageUtil;
 
 public class CaseUsageAdapter extends CalculationUsageAdapter {
 
@@ -39,11 +39,6 @@ public CaseUsage getTarget() {
 
 	// Utility
 
-	@Override
-	public Usage getSubjectParameter() {
-		return getTarget().getSubjectParameter();
-	}
-
 	@Override
 	public boolean hasRelevantSubjectParameter() {
 		Type owningType = getTarget().getOwningType();
@@ -65,15 +60,13 @@ public boolean isSubcase() {
 	}
 
 	// Transformation
-
-	@Override
-	public void doTransform() {
+	
+	@Override 
+	public void addAdditionalMembers() {
 		CaseUsage usage = getTarget();
-		super.doTransform();
-		UsageAdapter.computeSubjectParameterOf(usage);
-		if (usage.getObjectiveRequirement() == null) {
-			CaseDefinitionAdapter.addObjectiveRequirementTo(usage);
-		}
+		UsageUtil.addSubjectParameterTo(usage);
+		UsageUtil.addObjectiveRequirementTo(usage);
+		super.addAdditionalMembers();
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/adapter/ConstraintDefinitionAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2024 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -22,6 +22,7 @@
 package org.omg.sysml.adapter;
 
 import org.omg.sysml.lang.sysml.ConstraintDefinition;
+import org.omg.sysml.util.UsageUtil;
 
 public class ConstraintDefinitionAdapter extends OccurrenceDefinitionAdapter {
 
@@ -34,12 +35,15 @@ public ConstraintDefinition getTarget() {
 		return (ConstraintDefinition)super.getTarget();
 	}
 
+	@Override
+	public void addAdditionalMembers() {
+		UsageUtil.addResultParameterTo(getTarget());
+	}
+
 	@Override
 	public void doTransform() {
-		ConstraintDefinition definition = getTarget();
 		super.doTransform();
-		addResultParameter();
-		createResultConnector(definition.getResult());
+		createResultConnector(getTarget().getResult());		
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/adapter/ConstraintUsageAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021-2023 Model Driven Solutions, Inc.
+ * Copyright (c) 2021-2024 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -78,16 +78,18 @@ protected boolean isCheckedConstraint() {
 		ConstraintUsage target = getTarget();
 		Type owningType = target.getOwningType();
 		return target.isComposite() &&
-				(owningType instanceof ItemDefinition || owningType instanceof ItemUsage);
-
+				(owningType instanceof ItemDefinition || owningType instanceof ItemUsage);				
+	}
+
+	@Override
+	public void addAdditionalMembers() {
+		UsageUtil.addResultParameterTo(getTarget());
 	}
 
 	@Override
 	public void doTransform() {
-		ConstraintUsage constraint = getTarget();
 		super.doTransform();
-		addResultParameter();
-		createResultConnector(constraint.getResult());
-	}	
+		createResultConnector(getTarget().getResult());		
+	}
 
 }

org.omg.sysml/src/org/omg/sysml/adapter/DefinitionAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2024 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -22,7 +22,6 @@
 package org.omg.sysml.adapter;
 
 import org.omg.sysml.lang.sysml.Definition;
-import org.omg.sysml.lang.sysml.Usage;
 
 public class DefinitionAdapter extends ClassifierAdapter {
 
@@ -35,10 +34,4 @@ public Definition getTarget() {
 		return (Definition)super.getTarget();
 	}
 
-	// Utility
-
-	public Usage getSubjectParameter() {
-		return null;
-	}
-
 }

org.omg.sysml/src/org/omg/sysml/adapter/ExpressionAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021-2022 Model Driven Solutions, Inc.
+ * Copyright (c) 2021-2022, 2024 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -31,12 +31,12 @@
 import org.omg.sysml.lang.sysml.FeatureMembership;
 import org.omg.sysml.lang.sysml.FeatureValue;
 import org.omg.sysml.lang.sysml.Multiplicity;
-import org.omg.sysml.lang.sysml.ParameterMembership;
 import org.omg.sysml.lang.sysml.SysMLFactory;
 import org.omg.sysml.lang.sysml.Type;
 import org.omg.sysml.util.ExpressionUtil;
 import org.omg.sysml.util.FeatureUtil;
 import org.omg.sysml.util.ImplicitGeneralizationMap;
+import org.omg.sysml.util.TypeUtil;
 
 public class ExpressionAdapter extends StepAdapter {
 
@@ -129,16 +129,11 @@ protected Feature createFeatureForParameter(Feature parameter) {
 		}
 	}
 
-	protected void computeOutput() {
-		Expression expression = getTarget();
-		if (expression.getOutput().isEmpty()) {
-			Feature parameter = SysMLFactory.eINSTANCE.createFeature();
-			ParameterMembership membership = SysMLFactory.eINSTANCE.createReturnParameterMembership();
-			membership.setOwnedMemberParameter(parameter);
-			expression.getOwnedRelationship().add(membership);
-		}		
+	@Override
+	public void addAdditionalMembers() {
+		TypeUtil.addResultParameterTo(getTarget());
 	}
-			
+
 	@Override
 	public void doTransform() {
 		Expression expression = getTarget();
@@ -147,7 +142,6 @@ public void doTransform() {
 				expression.getOwningMembership() instanceof FeatureValue) {
 			addImplicitFeaturingTypesIfNecessary();
 		}
-		computeOutput();
 		createResultConnector(expression.getResult());
 	}
 

org.omg.sysml/src/org/omg/sysml/adapter/FunctionAdapter.java

@@ -22,6 +22,7 @@
 package org.omg.sysml.adapter;
 
 import org.omg.sysml.lang.sysml.Function;
+import org.omg.sysml.util.TypeUtil;
 
 public class FunctionAdapter extends BehaviorAdapter {
 
@@ -34,10 +35,15 @@ public Function getTarget() {
 		return (Function)super.getTarget();
 	}
 
+	@Override
+	public void addAdditionalMembers() {
+		TypeUtil.addResultParameterTo(getTarget());
+	}
+
 	@Override
 	public void doTransform() {
 		super.doTransform();
-		createResultConnector(getTarget().getResult());
+		createResultConnector(getTarget().getResult());		
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/adapter/NamespaceAdapter.java

@@ -50,4 +50,13 @@ public void clearCaches() {
 		importedMembership = null;
 	}
 
+	public void addAdditionalMembers() {
+	}
+
+	@Override
+	public void doTransform() {
+		addAdditionalMembers();
+		super.doTransform();
+	}
+
 }