Merge pull request #645 from Systems-Modeling/ST6RI-840

ST6RI-840 Constructor expression evaluation (KERML_-224)

Author: seidewitz

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

@@ -299,6 +299,21 @@ public void testListEvaluation() throws Exception {
 		assertEquals(true, evaluateBooleanValue(null, null, "SequenceFunctions::notEmpty((1,2,3))"));
 	}
 
+	@Test
+	public void testConstructorEvaluation() throws Exception {
+		SysMLInteractive instance = getSysMLInteractiveInstance();
+		process(instance,
+				"part def P { attribute a; attribute b; } " +
+				"part p1 = new P(1, 2); " +
+				"part p2 = new P(b = p1.b, a = p1.a);");
+		assertEquals(true, evaluateBooleanValue(instance, null, "p1 istype P"));
+		assertEquals(1, evaluateIntegerValue(instance, null, "p1.a"));
+		assertEquals(2, evaluateIntegerValue(instance, null, "p1.b"));
+		assertEquals(true, evaluateBooleanValue(instance, null, "p2 istype P"));
+		assertEquals(1, evaluateIntegerValue(instance, null, "p2.a"));
+		assertEquals(2, evaluateIntegerValue(instance, null, "p2.b"));
+	}
+	
 	@Test
 	public void testFeatureReferenceEvaluation() throws Exception {
 		SysMLInteractive instance = getSysMLInteractiveInstance();

org.omg.sysml/src/org/omg/sysml/delegate/invocation/FeatureReferenceExpression_modelLevelEvaluable_InvocationDelegate.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2024, 2025 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
@@ -55,19 +55,22 @@ public Object dynamicInvoke(InternalEObject target, EList<?> arguments) throws I
 			return false;
 		} else {
 			visited.add(referent);
+			boolean result;
 			if (referent instanceof Expression && ((Expression) referent).modelLevelEvaluable(visited)) {
-				return true;
+				result = true;
 			} else {
 				Type owningType = referent.getOwningType();
 				if (owningType instanceof Metaclass || owningType instanceof MetadataFeature) {
-					return true;
+					result =  true;
 				} else if (!referent.getFeaturingType().isEmpty()) {
-					return false;
+					result =  false;
 				} else {
 					Expression valueExpression = FeatureUtil.getValueExpressionFor(referent);
-					return valueExpression == null || valueExpression.modelLevelEvaluable(visited);
+					result = valueExpression == null || valueExpression.modelLevelEvaluable(visited);
 				}
 			}
+			visited.remove(referent);
+			return result;
 		}
 	}
 

org.omg.sysml/src/org/omg/sysml/expressions/ModelLevelExpressionEvaluator.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2022 Model Driven Solutions, Inc.
+ * Copyright (c) 2022, 2025 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
@@ -30,6 +30,7 @@
 import org.omg.sysml.expressions.functions.LibraryFunction;
 import org.omg.sysml.expressions.util.EvaluationUtil;
 import org.omg.sysml.lang.sysml.AnnotatingElement;
+import org.omg.sysml.lang.sysml.ConstructorExpression;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.Expression;
 import org.omg.sysml.lang.sysml.Feature;
@@ -74,6 +75,8 @@ public EList<Element> evaluate(Expression expression, Element target) {
 			return evaluateMetadataAccess((MetadataAccessExpression)expression, target);
 		} else if (expression instanceof InvocationExpression) {
 			return evaluateInvocation((InvocationExpression)expression, target);
+		} else if (expression instanceof ConstructorExpression) {
+			return evaluateConstructor((ConstructorExpression)expression, target);
 		} else {
 			return new BasicEList<>();
 		}		
@@ -109,6 +112,11 @@ public EList<Element> evaluateInvocation(InvocationExpression expression, Elemen
 		return function == null? EvaluationUtil.singletonList(expression): function.invoke(expression, target, this);
 	}
 
+	public EList<Element> evaluateConstructor(ConstructorExpression expression, Element target) {
+		Feature resultParameter = TypeUtil.getResultParameterOf(expression);
+		return resultParameter == null? null: EvaluationUtil.singletonList(resultParameter);
+	}
+	
 	public EList<Element> evaluateFeature(Feature feature, Type type) {
 		if (type != null && TypeUtil.specializes(feature, ExpressionUtil.getSelfReferenceFeature(feature))) {
 			// Evaluate "self" feature. (Note: Must be checked before test for feature chain because "self" has chaining features.)