ST6RI-897 Moved the InvocationExpression operand mechanism to adapter.

- Updated CustomUML2EcoreConverter to add SysML EAnnotation to the
Element::operand EAttribute, when it adds that to the Ecore
metamodel, so that a setting delegation is generated.

- Also changed uses of getOperand to getArgument in plantuml/VPath and
VSequence.

Author: seidewitz

org.omg.sysml.interactive.tests/src/org/omg/sysml/interactive/tests/ModelLevelEvaluationTest.java

@@ -57,7 +57,7 @@ protected Expression checkFilterExpression(SysMLInteractive instance, String tex
 		assertFalse("'" + text + "': No filter conditions", filterConditions.isEmpty());
 		Expression filterCondition = filterConditions.get(0);
 		assertTrue("'" + text + "': Not operator expression", filterCondition instanceof OperatorExpression);
-		List<Expression> operands = ((OperatorExpression)filterCondition).getOperand();
+		List<Expression> operands = ((OperatorExpression)filterCondition).getArgument();
 		assertFalse("'" + text + "': No operands", operands.isEmpty());
 		return operands.get(0);
 	}

org.omg.sysml.plantuml/src/org/omg/sysml/plantuml/VPath.java

@@ -170,7 +170,7 @@ private class PCFeatureChainExpression extends PC {
         private final FeatureChainExpression fce;
 
         private Expression getTargetExp() {
-            List<Expression> ops = fce.getOperand();
+            List<Expression> ops = fce.getArgument();
             if (ops.isEmpty()) {
             	return null;
             } else {

org.omg.sysml.plantuml/src/org/omg/sysml/plantuml/VSequence.java

@@ -110,7 +110,7 @@ private static boolean isTarget(Feature f) {
     }
 
     private Element next(FeatureChainExpression fce, boolean first) {
-            List<Expression> ops = fce.getOperand();
+            List<Expression> ops = fce.getArgument();
             int size = ops.size();
             if (size == 0) return null;
             Expression ex = ops.get(0);

org.omg.sysml.uml.ecore.importer/src/org/omg/sysml/uml/ecore/importer/CustomUML2EcoreConverter.java

@@ -59,7 +59,9 @@ private void customConvert(DiagnosticChain diagnostics) {
 					addSysMLAnnotation("Feature::isNonUnique", isNonUniqueAttribute);
 				} else if ("InvocationExpression".equals(name)) {
 					EClassifier expressionClass = eClass.getEStructuralFeature("argument").getEType();
-					addStructuralFeature(eClass, EcoreFactory.eINSTANCE.createEReference(), "operand", expressionClass, 0, -1, null, true);
+					EReference operandReference = EcoreFactory.eINSTANCE.createEReference();
+					addStructuralFeature(eClass, operandReference, "operand", expressionClass, 0, -1, null, true);
+					addSysMLAnnotation("InvocationExpression::operand", operandReference);
 				}
 			}
 		}

org.omg.sysml/model/SysML.ecore

@@ -26,7 +26,9 @@
       <details key="documentation" value="&lt;p>An &lt;code>InvocationExpression&lt;/code> is an &lt;code>InstantiationExpression&lt;/code> whose &lt;code>instantiatedType&lt;/code> must be a &lt;code>Behavior&lt;/code> or a &lt;code>Feature&lt;/code> typed by a single &lt;code>Behavior&lt;/code> (such as a &lt;code>Step&lt;/code>). Each of the input &lt;code>parameters&lt;/code> of the &lt;code>instantiatedType&lt;/code> are bound to the &lt;code>result&lt;/code> of an &lt;code>argument&lt;/code> &lt;code>Expression&lt;/code>. If the &lt;code>instantiatedType&lt;/code> is a &lt;code>Function&lt;/code> or a &lt;code>Feature&lt;/code> typed by a &lt;code>Function&lt;/code>, then the &lt;code>result&lt;/code> of the &lt;code>InvocationExpression&lt;/code> is the &lt;code>result&lt;/code> of the invoked &lt;code>Function&lt;/code>. Otherwise, the &lt;code>result&lt;/code> is an instance of the &lt;code>instantiatedType&lt;/code> (essentially like a behavioral &lt;code>ConstructorExpression&lt;/code>).&lt;/p>&#xA;&#xA;not instantiatedType.oclIsKindOf(Function) and&#xA;not (instantiatedType.oclIsKindOf(Feature) and &#xA;     instantiatedType.oclAsType(Feature).type->exists(oclIsKindOf(Function))) implies&#xA;    ownedFeature.selectByKind(BindingConnector)->exists(&#xA;        relatedFeature->includes(self) and&#xA;        relatedFeature->includes(result))&#xA;TBD&#xA;instantiatedType.input->collect(inp | &#xA;    ownedFeatures->select(redefines(inp)).valuation->&#xA;    select(v | v &lt;> null).value&#xA;)&#xA;let parameters : OrderedSet(Feature) = instantiatedType.input in&#xA;input->forAll(inp | &#xA;    inp.ownedRedefinition.redefinedFeature->&#xA;        intersection(parameters)->size() = 1)&#xA;let features : OrderedSet(Feature) = instantiatedType.feature in&#xA;input->forAll(inp1 | input->forAll(inp2 |&#xA;    inp1 &lt;> inp2 implies&#xA;        inp1.ownedRedefinition.redefinedFeature->&#xA;            intersection(inp2.ownedRedefinition.redefinedFeature)->&#xA;            intersection(features)->isEmpty()))&#xA;not instantiatedType.oclIsKindOf(Function) and&#xA;not (instantiatedType.oclIsKindOf(Feature) and &#xA;     instantiatedType.oclAsType(Feature).type->exists(oclIsKindOf(Function))) implies&#xA;    result.specializes(instantiatedType)&#xA;specializes(instantiatedType)&#xA;instantiatedType.oclIsKindOf(Behavior) or&#xA;instantiatedType.oclIsKindOf(Feature) and&#xA;    instantiatedType.type->exists(oclIsKindOf(Behavior)) and&#xA;    instantiatedType.type->size(1)&#xA;ownedFeature->forAll(f |&#xA;    f &lt;> result implies &#xA;        f.direction = FeatureDirectionKind::_'in')"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="operand" upperBound="-1"
-        eType="#//Expression" volatile="true" transient="true" derived="true" containment="true"/>
+        eType="#//Expression" volatile="true" transient="true" derived="true" containment="true">
+      <eAnnotations source="http://www.omg.org/spec/SysML"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="InstantiationExpression" abstract="true"
       eSuperTypes="#//Expression">

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021-2025 Model Driven Solutions, Inc.
+ * Copyright (c) 2021-2026 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
@@ -21,11 +21,14 @@
 
 package org.omg.sysml.adapter;
 
+import org.eclipse.emf.common.util.EList;
+import org.omg.sysml.lang.sysml.Expression;
 import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.Function;
 import org.omg.sysml.lang.sysml.InvocationExpression;
 import org.omg.sysml.lang.sysml.SysMLPackage;
 import org.omg.sysml.lang.sysml.Type;
+import org.omg.sysml.util.OperandEList;
 import org.omg.sysml.util.TypeUtil;
 
 public class InvocationExpressionAdapter extends InstantiationExpressionAdapter {
@@ -39,6 +42,28 @@ public InvocationExpression getTarget() {
 		return (InvocationExpression)super.getTarget();
 	}
 
+	// Operand mechanism
+	
+	/**
+	 * Xtext workaround:
+	 * "operand" is an additional property not in the normative abstract syntax, but added to the Ecore.
+	 * It contains a list of direct containment references to arguments of this InvocationExpression.
+	 * It allows for tractable parsing in Xtext of expressions with left-recursive syntax 
+	 * (particularly operator expressions).
+	 */
+	protected EList<Expression> operand = null;
+	
+	/**
+	 * Use a special OperandEList so that operands inserted into the list are automatically actually added
+	 * as owned features.
+	 */
+	public EList<Expression> getOperand() {
+		if (operand == null) {
+			operand = new OperandEList(getTarget());
+		}
+		return operand;
+	}
+	
 	// Implicit generalization
 
 	@Override

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

@@ -48,7 +48,7 @@ public String createElementId() {
 		OwningMembership target = getTarget();
 
 		Element ownedMemberElement = target.getOwnedMemberElement();
-		if (!ElementUtil.isStandardLibraryElement(target) &&
+		if (!ElementUtil.isStandardLibraryElement(target) && ownedMemberElement != null &&
 			ElementUtil.isStandardLibraryElement(ownedMemberElement) && 
 			ownedMemberElement.libraryNamespace() == ownedMemberElement) {
 			String path = target.path();

org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_elementId_SettingDelegate.java

@@ -42,5 +42,10 @@ protected Object basicGet(InternalEObject owner) {
 	public void set(InternalEObject owner, Object elementId) {
 		ElementUtil.setElementIdOf((Element)owner, (String)elementId);
 	}
+	
+	@Override
+	public boolean isSet(InternalEObject owner) {
+		return true;
+	}
 
 }

org.omg.sysml/src/org/omg/sysml/delegate/setting/InvocationExpression_operand_SettingDelegate.java

@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * SysML 2 Pilot Implementation
+ * Copyright (c) 2026 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *  
+ * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
+ *  
+ *******************************************************************************/
+
+package org.omg.sysml.delegate.setting;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.omg.sysml.lang.sysml.Expression;
+import org.omg.sysml.lang.sysml.InvocationExpression;
+import org.omg.sysml.util.ExpressionUtil;
+
+public class InvocationExpression_operand_SettingDelegate extends BasicDerivedListSettingDelegate {
+
+	public InvocationExpression_operand_SettingDelegate(EStructuralFeature eStructuralFeature) {
+		super(eStructuralFeature);
+	}
+
+	@Override
+	protected EList<Expression> basicGet(InternalEObject owner) {
+		return ExpressionUtil.getOperandsOf((InvocationExpression)owner);
+	}
+
+}

org.omg.sysml/src/org/omg/sysml/util/ExpressionUtil.java

@@ -28,6 +28,7 @@
 import org.eclipse.emf.common.util.EList;
 import org.omg.sysml.adapter.ExpressionAdapter;
 import org.omg.sysml.adapter.FeatureReferenceExpressionAdapter;
+import org.omg.sysml.adapter.InvocationExpressionAdapter;
 import org.omg.sysml.lang.sysml.ConstructorExpression;
 import org.omg.sysml.lang.sysml.DataType;
 import org.omg.sysml.lang.sysml.Element;
@@ -188,4 +189,8 @@ public static boolean isConstructorResult(Type type) {
 				((Feature)type).getOwningFeatureMembership() instanceof ReturnParameterMembership;
 	}
 
+	public static EList<Expression> getOperandsOf(InvocationExpression expression) {
+		return ((InvocationExpressionAdapter)getExpressionAdapter(expression)).getOperand();
+	}
+	
 }