Commit ca22109f authored by sarah.grebing's avatar sarah.grebing
Browse files

Merge branch 'master' into '56-compact-script-after-exiting-interactive-mode'

intermediate merge

See merge request !26
parents a06dd22f 36832366
Pipeline #33348 passed with stages
in 2 minutes and 15 seconds
......@@ -3,6 +3,7 @@ package edu.kit.iti.formal.psdbg.interpreter;
import edu.kit.iti.formal.psdbg.interpreter.data.GoalNode;
import edu.kit.iti.formal.psdbg.interpreter.data.VariableAssignment;
import edu.kit.iti.formal.psdbg.parser.ast.Signature;
import edu.kit.iti.formal.psdbg.parser.data.Value;
import java.util.List;
......@@ -27,4 +28,6 @@ public interface MatcherApi<T> {
*/
List<VariableAssignment> matchSeq(GoalNode<T> currentState, String pattern);
GoalNode<T> isDerivable(GoalNode<T> currentState, Value v);
}
......@@ -54,6 +54,11 @@ public class GoalNode<T> {
this.id = id;
}
private GoalNode(int id, GoalNode<T> parent, VariableAssignment ass, T data, boolean isClosed) {
this(parent, ass, data, isClosed);
this.id = id;
}
private GoalNode(int id, T data, boolean isClosed) {
this(data);
this.isClosed = isClosed;
......@@ -129,7 +134,8 @@ public class GoalNode<T> {
*/
public GoalNode<T> deepCopy() {
if (parent != null) {
return new GoalNode<T>(id, parent.deepCopy(), data, isClosed);
VariableAssignment deepCopy = parent.assignments.deepCopy();
return new GoalNode<T>(id, parent.deepCopy(), deepCopy, data, isClosed);
} else {
return new GoalNode<T>(id, data, isClosed);
}
......
......@@ -49,6 +49,13 @@ public class PseudoMatcher implements MatcherApi<String> {
}
return Collections.singletonList(va);
}
@Override
public GoalNode<String> isDerivable(GoalNode<String> currentState, Value v) {
return null;
}
}
\ No newline at end of file
......@@ -2,6 +2,16 @@ script empty(){
}
script full(){
impRight;
impRight;
impLeft;
cases {
case derivable `p`:
}
}
script full(){
impRight;
impRight;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment