ST6RI-971 Fixed evaluation of enumeration-typed meta-properties.

- Extended EvaluationUtil.elementFor and results to handle metamodel
enum values.
- Revised the use of EvaluationUtil.results in
ModelLevelExpressionEvaluatior.

Author: seidewitz

org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.63.0-SNAPSHOT.jar

@@ -156,14 +156,14 @@ public EList<Element> evaluateFeature(Feature feature, Type type) {
 				Type t = types.get(i);
 				if (t instanceof MetadataFeature && TypeUtil.specializes(feature, EvaluationUtil.getAnnotatedElementFeature((MetadataFeature)t))) {
 					// Evaluate "Metaobject::annotatedElement" feature.
-					return EvaluationUtil.results(((MetadataFeature)t).getAnnotatedElement());
+					return EvaluationUtil.results(feature, ((MetadataFeature)t).getAnnotatedElement());
 				} else if (EvaluationUtil.isMetaclassFeature(t)) {
 					if (!(feature instanceof Expression)) {
 						// Evaluate the feature as a reflective metaclass attribute.
 						Element element = ((AnnotatingElement)t).getAnnotatedElement().get(0);
 						EStructuralFeature eFeature = element.eClass().getEStructuralFeature(feature.getDeclaredName());
 						if (eFeature != null) {
-							return EvaluationUtil.results(element.eGet(eFeature, true));
+							return EvaluationUtil.results(feature, element.eGet(eFeature, true));
 						}
 					}
 				} else {

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

@@ -129,7 +129,7 @@ public static Expression expressionFor(EList<Element> results, Element context)
 	public static Expression expressionFor(Element result) {
 		if (result instanceof LiteralExpression) {
 			Object value = valueOf(result);
-			return value == null? literalInfinity(): (Expression)elementFor(value);
+			return value == null? literalInfinity(): (Expression)elementFor(null, value);
 		} else if (result instanceof Feature) {
 			FeatureReferenceExpression featureRef = SysMLFactory.eINSTANCE.createFeatureReferenceExpression();
 			NamespaceUtil.addMemberTo(featureRef, result);
@@ -140,29 +140,29 @@ public static Expression expressionFor(Element result) {
 
 	}
 
-	public static EList<Element> results(Object object) {
+	public static EList<Element> results(Element context, Object object) {
 		EList<Element> results = new BasicEList<>();
-		if (object instanceof List) {
-			((List<?>)object).stream().
-				map(EvaluationUtil::elementFor).
+		if (object instanceof List<?> list) {
+			list.stream().
+				map(obj->elementFor(context, obj)).
 				filter(e->e != null).
 				forEachOrdered(results::add);
 		} else if (object != null) {
-			Element element = elementFor(object);
-			if (object != null) {
+			Element element = elementFor(context, object);
+			if (element != null) {
 				results.add(element);
 			}
 		}
 		return results;
 	}
 
-	public static Element elementFor(Object object) {
+	public static Element elementFor(Element context, Object object) {
 		return object instanceof Boolean? literalBoolean((Boolean)object):
 			   object instanceof String? literalString((String)object):
 			   object instanceof Integer? literalInteger((Integer)object):
 			   object instanceof Double? literalRational((Double)object):
 			   object instanceof Element? ElementUtil.getMetaclassFeatureFor((Element)object):
-			   null;
+			   enumUsage(context, object);
 	}
 
 	public static LiteralBoolean literalBoolean(boolean value) {
@@ -193,6 +193,22 @@ public static LiteralInfinity literalInfinity() {
 		return SysMLFactory.eINSTANCE.createLiteralInfinity();
 	}
 
+	public static Feature enumUsage(Element context, Object object) {
+		if (object != null) {
+			Class<?> class_ = object.getClass();
+			if (class_ != null) {
+				String name = class_.getSimpleName() + "::" + object;
+				Type type = SysMLLibraryUtil.getLibraryType(context, 
+						"KerML::Root::" + name,  "KerML::Core::" + name, "KerML::Kernel::" + name, 
+						"SysML::Systems::" + name);
+				if (type instanceof Feature feature) {
+					return feature;
+				}
+			}
+		}
+		return null;
+	}
+	
 	public static EList<Element> booleanResult(boolean value) {
 		return singletonList(literalBoolean(value));
 	}