feat(language): computed value validation

3 files changed, 23 insertions, 1 deletions

diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
index 505c7787..cad98d50 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
@@ -46,6 +46,8 @@ public class ProblemResourceDescriptionStrategy extends DefaultResourceDescripti
         public static final String MODULE_KIND = DATA_PREFIX + "MODULE_KIND";
         public static final String COLOR_RELATION = DATA_PREFIX + "COLOR_RELATION";
         public static final String COLOR_RELATION_TRUE = "true";
+        public static final String COMPUTED_VALUE = DATA_PREFIX + "COMPUTED_VALUE";
+        public static final String COMPUTED_VALUE_TRUE = "true";
 
         @Inject
         private IQualifiedNameConverter qualifiedNameConverter;
@@ -160,9 +162,12 @@ public class ProblemResourceDescriptionStrategy extends DefaultResourceDescripti
                 } else if (eObject instanceof AggregatorDeclaration) {
                         builder.put(SHADOWING_KEY, SHADOWING_KEY_AGGREGATOR);
                 }
-                if (eObject instanceof PredicateDefinition predicateDefinition && predicateDefinition.isError()) {
+                if (ProblemUtil.isError(eObject)) {
                         builder.put(ERROR_PREDICATE, ERROR_PREDICATE_TRUE);
                 }
+                if (ProblemUtil.isComputedValue(eObject)) {
+                        builder.put(COMPUTED_VALUE, COMPUTED_VALUE_TRUE);
+                }
                 var documentationMap = documentationCommentParser.parseDocumentation(eObject);
                 builder.putAll(documentationMap);
                 return builder.build();
diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
index e1820261..7e7de681 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
@@ -53,6 +53,10 @@ public final class ProblemUtil {
                 return eObject instanceof PredicateDefinition predicateDefinition && predicateDefinition.isError();
         }
 
+        public static boolean isComputedValue(EObject eObject) {
+                return eObject instanceof PredicateDefinition predicateDefinition && !predicateDefinition.getBodies().isEmpty();
+        }
+
         public static boolean isAtomNode(Node node) {
                 var containingFeature = node.eContainingFeature();
                 if (containingFeature == ProblemPackage.Literals.NODE_DECLARATION__NODES) {
diff --git a/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java b/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
index 63c8631c..7114b693 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
@@ -49,6 +49,7 @@ public class ProblemValidator extends AbstractProblemValidator {
         public static final String INVALID_MODALITY_ISSUE = ISSUE_PREFIX + "INVALID_MODALITY";
         public static final String INVALID_RULE_ISSUE = ISSUE_PREFIX + "INVALID_RULE";
         public static final String INVALID_TRANSITIVE_CLOSURE_ISSUE = ISSUE_PREFIX + "INVALID_TRANSITIVE_CLOSURE";
+        public static final String INVALID_COMPUTED_VALUE_ISSUE = ISSUE_PREFIX + "INVALID_COMPUTED_VALUE";
         public static final String UNSUPPORTED_ASSERTION_ISSUE = ISSUE_PREFIX + "UNSUPPORTED_ASSERTION";
         public static final String UNKNOWN_EXPRESSION_ISSUE = ISSUE_PREFIX + "UNKNOWN_EXPRESSION";
         public static final String INVALID_ASSIGNMENT_ISSUE = ISSUE_PREFIX + "INVALID_ASSIGNMENT";
@@ -425,6 +426,18 @@ public class ProblemValidator extends AbstractProblemValidator {
                         acceptError(message, atom, ProblemPackage.Literals.ATOM__TRANSITIVE_CLOSURE, 0,
                                         INVALID_TRANSITIVE_CLOSURE_ISSUE);
                 }
+                if (atom.isComputed()) {
+                        var target = atom.getRelation();
+                        if (target != null && !target.eIsProxy() && !ProblemUtil.isComputedValue(target)) {
+                                var message = "Relation '%s' has no computed value.".formatted(target.getName());
+                                acceptError(message, atom, ProblemPackage.Literals.ATOM__COMPUTED, 0, INVALID_COMPUTED_VALUE_ISSUE);
+                        }
+                        var definitionContext = EcoreUtil2.getContainerOfType(atom, ParametricDefinition.class);
+                        if (!(definitionContext instanceof RuleDefinition)) {
+                                var message = "Computed value references may only appear in rule definitions.";
+                                acceptError(message, atom, ProblemPackage.Literals.ATOM__COMPUTED, 0, INVALID_COMPUTED_VALUE_ISSUE);
+                        }
+                }
         }
 
         @Check