Add scope for new and delete with tests

2 files changed, 28 insertions, 13 deletions

diff --git a/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java b/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java
index 2061c30e..bb1226c4 100644
--- a/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java
+++ b/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java
@@ -24,11 +24,12 @@ import tools.refinery.language.model.problem.ImplicitVariable;
 import tools.refinery.language.model.problem.Literal;
 import tools.refinery.language.model.problem.NegativeLiteral;
 import tools.refinery.language.model.problem.Parameter;
-import tools.refinery.language.model.problem.PredicateDefinition;
+import tools.refinery.language.model.problem.ParametricDefinition;
 import tools.refinery.language.model.problem.Problem;
 import tools.refinery.language.model.problem.ProblemFactory;
 import tools.refinery.language.model.problem.ProblemPackage;
 import tools.refinery.language.model.problem.Statement;
+import tools.refinery.language.model.problem.ValueLiteral;
 import tools.refinery.language.model.problem.VariableOrNodeArgument;
 import tools.refinery.language.naming.NamingUtil;
 
@@ -46,13 +47,13 @@ public class DerivedVariableComputer {
 
         public void installDerivedVariables(Problem problem, Set<String> nodeNames) {
                 for (Statement statement : problem.getStatements()) {
-                        if (statement instanceof PredicateDefinition definition) {
-                                installDerivedPredicateDefinitionState(definition, nodeNames);
+                        if (statement instanceof ParametricDefinition definition) {
+                                installDerivedParametricDefinitionState(definition, nodeNames);
                         }
                 }
         }
 
-        protected void installDerivedPredicateDefinitionState(PredicateDefinition definition, Set<String> nodeNames) {
+        protected void installDerivedParametricDefinitionState(ParametricDefinition definition, Set<String> nodeNames) {
                 Set<String> knownVariables = new HashSet<>();
                 knownVariables.addAll(nodeNames);
                 for (Parameter parameter : definition.getParameters()) {
@@ -71,6 +72,9 @@ public class DerivedVariableComputer {
                 for (Literal literal : conjunction.getLiterals()) {
                         if (literal instanceof Atom atom) {
                                 createSigletonVariablesAndCollectVariables(atom, knownVariables, newVariables);
+                        } else
+                        if (literal instanceof ValueLiteral valueLiteral) {
+                                createSigletonVariablesAndCollectVariables(valueLiteral.getAtom(), knownVariables, newVariables);
                         }
                 }
                 createVariables(conjunction, newVariables);
@@ -156,13 +160,13 @@ public class DerivedVariableComputer {
 
         public void discardDerivedVariables(Problem problem) {
                 for (Statement statement : problem.getStatements()) {
-                        if (statement instanceof PredicateDefinition predicateDefinition) {
-                                discardPredicateDefinitionState(predicateDefinition);
+                        if (statement instanceof ParametricDefinition parametricDefinition) {
+                                discardParametricDefinitionState(parametricDefinition);
                         }
                 }
         }
 
-        protected void discardPredicateDefinitionState(PredicateDefinition definition) {
+        protected void discardParametricDefinitionState(ParametricDefinition definition) {
                 for (Conjunction body : definition.getBodies()) {
                         body.getImplicitVariables().clear();
                         for (Literal literal : body.getLiterals()) {
diff --git a/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java b/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java
index 86b39dbc..d31a5308 100644
--- a/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java
+++ b/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java
@@ -15,7 +15,9 @@ import org.eclipse.xtext.scoping.Scopes;
 import tools.refinery.language.model.ProblemUtil;
 import tools.refinery.language.model.problem.ClassDeclaration;
 import tools.refinery.language.model.problem.ExistentialQuantifier;
-import tools.refinery.language.model.problem.PredicateDefinition;
+import tools.refinery.language.model.problem.NewActionLiteral;
+import tools.refinery.language.model.problem.ParametricDefinition;
+import tools.refinery.language.model.problem.Action;
 import tools.refinery.language.model.problem.Problem;
 import tools.refinery.language.model.problem.ProblemPackage;
 import tools.refinery.language.model.problem.ReferenceDeclaration;
@@ -38,7 +40,8 @@ public class ProblemScopeProvider extends AbstractProblemScopeProvider {
                                 || reference == ProblemPackage.Literals.NODE_VALUE_ASSERTION__NODE) {
                         return getNodesScope(context, scope);
                 }
-                if (reference == ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE) {
+                if (reference == ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE
+                                || reference == ProblemPackage.Literals.DELETE_ACTION_LITERAL__VARIABLE_OR_NODE) {
                         return getVariableScope(context, scope);
                 }
                 if (reference == ProblemPackage.Literals.REFERENCE_DECLARATION__OPPOSITE) {
@@ -64,17 +67,25 @@ public class ProblemScopeProvider extends AbstractProblemScopeProvider {
                                 variables.add(singletonVariable);
                         }
                 }
-                while (currentContext != null && !(currentContext instanceof PredicateDefinition)) {
+                while (currentContext != null && !(currentContext instanceof ParametricDefinition)) {
                         if (currentContext instanceof ExistentialQuantifier quantifier) {
                                 variables.addAll(quantifier.getImplicitVariables());
+                        } else
+                        if(currentContext instanceof Action action) {
+                                for (var literal : action.getActionLiterals()) {
+                                        if(literal instanceof NewActionLiteral newActionLiteral && newActionLiteral.getVariable() != null) {
+                                                variables.add(newActionLiteral.getVariable());
+                                        }
+                                }
                         }
                         currentContext = currentContext.eContainer();
                 }
+                IScope parentScope = getNodesScope(context, delegateScope);
                 if (currentContext != null) {
-                        PredicateDefinition definition = (PredicateDefinition) currentContext;
-                        variables.addAll(definition.getParameters());
+                        ParametricDefinition definition = (ParametricDefinition) currentContext;
+                        parentScope = Scopes.scopeFor(definition.getParameters(),parentScope);
                 }
-                return Scopes.scopeFor(variables, getNodesScope(context, delegateScope));
+                return Scopes.scopeFor(variables,parentScope);
         }
 
         protected IScope getOppositeScope(EObject context, IScope delegateScope) {