Merge remote-tracking branch 'origin/master'

lang/src/main/java/edu/kit/iti/formal/psdbg/parser/TransformAst.java

@@ -114,6 +114,7 @@ public class TransformAst implements ScriptLanguageVisitor<Object> {
             s.setSignature(sig);
         }
         s.setBody((Statements) ctx.body.accept(this));
+        s.getBody().setParent(s);
         return s;
     }
 

matcher/src/test/java/edu/kit/iti/formal/psdbg/termmatcher/MatcherFacadeTest.java

@@ -98,13 +98,9 @@ public class MatcherFacadeTest {
         shouldMatch("1*j", "1 + ?Y", "[]");
         shouldMatch("1*j", "1 * ?Y", "[{?Y=j}]");
 
+        //does not match
         shouldMatch("1*j", "?Y * 1", "[{?Y=j}]");
 
-
-        //shouldMatch("f(a) ==> f(a), f(b)" , "==> f(?X)", [{?X=a}]);
-        //shouldMatch("f(a) ==> f(a), f(b)" , "f(a) ==> f(?X)", [{?X=a}]);
-        //shouldNotMatch("f(a) ==> f(a), f(b)" , "f(?X) ==> f(?X), f(a)");
-
     }
 
     @Test

rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/KeYMatcher.java

 package edu.kit.iti.formal.psdbg.interpreter;
 
-import de.uka.ilkd.key.api.ProofApi;
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.logic.Name;
 import de.uka.ilkd.key.logic.Term;
@@ -163,10 +162,11 @@ public class KeYMatcher implements MatcherApi<KeyData> {
 
     private Value<String> toValueTerm(KeyData currentState, Term matched) {
         String reprTerm = LogicPrinter.quickPrintTerm(matched, currentState.getEnv().getServices());
-
+        //Hack: to avoid newlines
+        String reprTermReformatted = reprTerm.trim();
         return new Value<>(
                 new TermType(new SortType(matched.sort())),
-                reprTerm
+                reprTermReformatted
         );
     }
 

rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/funchdl/ProofScriptCommandBuilder.java

@@ -4,7 +4,6 @@ import de.uka.ilkd.key.control.AbstractUserInterfaceControl;
 import de.uka.ilkd.key.control.DefaultUserInterfaceControl;
 import de.uka.ilkd.key.macros.scripts.EngineState;
 import de.uka.ilkd.key.macros.scripts.ProofScriptCommand;
-import de.uka.ilkd.key.macros.scripts.meta.ProofScriptArgument;
 import de.uka.ilkd.key.proof.Goal;
 import de.uka.ilkd.key.proof.Node;
 import edu.kit.iti.formal.psdbg.interpreter.Interpreter;
@@ -15,10 +14,14 @@ import edu.kit.iti.formal.psdbg.interpreter.data.VariableAssignment;
 import edu.kit.iti.formal.psdbg.parser.ast.CallStatement;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.key_project.util.collection.ImmutableList;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -61,7 +64,11 @@ public class ProofScriptCommandBuilder implements CommandHandler<KeyData> {
         GoalNode<KeyData> expandedNode = state.getSelectedGoalNode();
         KeyData kd = expandedNode.getData();
         Map<String, String> map = new HashMap<>();
-        params.asMap().forEach((k, v) -> map.put(k.getIdentifier(), v.getData().toString()));
+        params.asMap().forEach((k, v) -> {
+                    System.out.println("v.getData().toString() = " + v.getData().toString());
+                    map.put(k.getIdentifier(), v.getData().toString());
+                }
+        );
         try {
             EngineState estate = new EngineState(kd.getProof());
             estate.setGoal(kd.getNode());
@@ -100,6 +107,17 @@ public class ProofScriptCommandBuilder implements CommandHandler<KeyData> {
     @Override
     public String getHelp(CallStatement call) {
         ProofScriptCommand c = commands.get(call.getCommand());
+
+        URL res = getClass().getResource("/commands/" + call.getCommand() + ".html");
+        try {
+            return IOUtils.toString(res.toURI(), "utf-8");
+        } catch (NullPointerException | IOException | URISyntaxException e) {
+            return "No Help found for " + call.getCommand();
+
+        }
+
+        /*
+
         StringBuilder html = new StringBuilder();
 
 
@@ -150,5 +168,6 @@ public class ProofScriptCommandBuilder implements CommandHandler<KeyData> {
 
         html.append("</body></html>");
         return html.toString();
+        */
     }
 }

rt-key/src/main/resources/edu/kit/iti/formal/psdbg/commands/auto.html

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file

rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/Interpreter.java

@@ -161,10 +161,10 @@ public class Interpreter<T> extends DefaultASTVisitor<Object>
     }
 
     private Value evaluate(GoalNode<T> g, Expression expr) {
-        enterScope(expr);
+        //enterScope(expr);
         Evaluator<T> evaluator = new Evaluator<>(g.getAssignments(), g);
         evaluator.setMatcher(matcherApi);
-        exitScope(expr);
+        //exitScope(expr);
         return evaluator.eval(expr);
     }
 

rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/dbg/DebuggerFramework.java

@@ -134,7 +134,7 @@ public class DebuggerFramework<T> {
     private void run() {
         try {
             interpreter.interpret(mainScript);
-            //dummyproofnode
+            ptreeManager.fireStatePointerChanged();
             succeedListener.accept(this);
         } catch (Exception e) {
             error = e;

rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/dbg/ProofTreeManager.java

@@ -76,7 +76,7 @@ public class ProofTreeManager<T> {
         int ctxLength = node.getContext().length;
 
         // We got a step deeper in the ASTNode stack.
-        // So we a caller
+        // So we have a caller
         if (getContextDepth() < ctxLength) {
             pushContext();
             intoCurrentContext(node);

rt-key/src/main/java/edu/kit/iti/formal/psdbg/StepIntoCommand.java → rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/dbg/StepIntoCommand.java

-package edu.kit.iti.formal.psdbg;
-
-import edu.kit.iti.formal.psdbg.interpreter.dbg.*;
+package edu.kit.iti.formal.psdbg.interpreter.dbg;
 
 public class StepIntoCommand<T> extends DebuggerCommand<T> {
     @Override
     public void execute(DebuggerFramework<T> dbg) {
         PTreeNode<T> statePointer = dbg.getStatePointer();
         assert statePointer != null;
-        if (statePointer.isAtomic()) {
+        if (statePointer.isAtomic()) { // atomic same as step over
             new StepOverCommand<T>().execute(dbg);
         } else {
-            dbg.releaseUntil(new Blocker.CounterBlocker(1));
+            if (statePointer.getStepInto() != null) { // if there is already an step into take it!
+                dbg.setStatePointer(statePointer.getStepInto());
+            } else {
+                if (!statePointer.isLastNode()) { // execute non last commands, one step wide!
+                    dbg.releaseUntil(new Blocker.CounterBlocker(1));
+                }
+            }
         }
     }
 }

rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/dbg/StepIntoReverseCommand.java

 package edu.kit.iti.formal.psdbg.interpreter.dbg;
 
-import lombok.val;
-
 public class StepIntoReverseCommand<T> extends DebuggerCommand<T> {
 
     @Override
     public void execute(DebuggerFramework<T> dbg) throws DebuggerException {
-        val statePointer = dbg.getCurrentStatePointer();
-        PTreeNode<T> stepBack = statePointer.getStepInvInto() != null ?
-                statePointer.getStepInvInto() :
-                statePointer.getStepInvOver();
+        PTreeNode<T> statePointer = dbg.getStatePointer();
+        assert statePointer != null;
 
-        if (stepBack == null) {
-            info("There is no previous state to the current one.");
+        if (statePointer.getStepInvInto() != null) {
+            dbg.setStatePointer(statePointer.getStepInvInto());
+        } else {
+            if (statePointer.getStepInvOver() != null) {
+                PTreeNode<T> statementBefore = statePointer.getStepInvOver();
+                dbg.setStatePointer(statementBefore);
+            } else{
+                dbg.setStatePointer(statePointer);
+            }
         }
-        dbg.setStatePointer(stepBack);
-
     }
 }

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/ContractChooser.java

@@ -114,7 +114,7 @@ public class ContractChooser extends Dialog<Contract> {
                 text.getChildren().add(contract);
                 text.getChildren().add(name);
                 text.getChildren().add(new Text("\n"));
-                //text.getChildren().add(tcontent);
+                //text.getChildren().addCell(tcontent);
 
                 for (String line : content.split("\n")) {
                     if (line.contains(":")) {

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/Events.java

@@ -77,7 +77,7 @@ public class Events {
     @RequiredArgsConstructor
     /**
      * Event that should be fired when a new goal node was created to inform view
-     * components s.t. they can update their view
+     * components s.t. they can updateTarget their view
      */
     public static class EventForNewGoalView {
         private final ASTNode correspodingASTNode;

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ASTNodeHiglightListener.java

@@ -41,7 +41,7 @@ public class ASTNodeHiglightListener<T> {
         if (currentInterpreter != null) deinstall(interpreter);
         int i = interpreter.getEntryListeners().size();
         interpreter.getEntryListeners().add(0, list);
-        //    interpreter.getExitListeners().add(0, exitListener);
+        //    interpreter.getExitListeners().addCell(0, exitListener);
         currentInterpreter = interpreter;
     }
 

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/InspectionView.java

@@ -143,7 +143,7 @@ public class InspectionView extends BorderPane {
                     Mode.LIVING.name(),
                     Mode.POSTMORTEM.name()
             );
-            getStyleClass().add(mode.get().name());
+            getStyleClass().addCell(mode.get().name());
         });
          */
     }

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ProofTree.java

@@ -344,9 +344,9 @@ public class ProofTree extends BorderPane {
 
            /* if(!label.equals("Proof")) {
                 TreeItem<TreeNode> self = new TreeItem<>(new TreeNode(n.serialNr() + ": " + toString(n), n));
-                ti.getChildren().add(self);
+                ti.getChildren().addCell(self);
             }*/
-            // ti.getChildren().add(e);
+            // ti.getChildren().addCell(e);
 
 
             return ti;
@@ -373,7 +373,7 @@ public class ProofTree extends BorderPane {
 
                     TreeItem<TreeNode> populate = populate(childNode.getNodeInfo().getBranchLabel(), childNode);
                     // TreeItem<TreeNode> self = new TreeItem<>(new TreeNode(childNode.serialNr() + ": " + toString(childNode), childNode));
-                    // populate.getChildren().add(0, self);
+                    // populate.getChildren().addCell(0, self);
                     ti.getChildren().add(populate);
 
                 } else {
@@ -385,11 +385,11 @@ public class ProofTree extends BorderPane {
                 }
             }
 
-/*            node.childrenIterator().forEachRemaining(child -> ti.getChildren().add(
+/*            node.childrenIterator().forEachRemaining(child -> ti.getChildren().addCell(
                     populate(child.getNodeInfo().getBranchLabel(), child)));
 */
             //node.children().forEach(child ->
-            //        ti.getChildren().add(populate(child.getNodeInfo().getBranchLabel(), child)));
+            //        ti.getChildren().addCell(populate(child.getNodeInfo().getBranchLabel(), child)));
         }
 
         return ti;

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptArea.java

@@ -337,13 +337,13 @@ public class ScriptArea extends BorderPane {
             codeArea.setStyleSpans(0, codeArea.getStyleSpans(0, getExecutionMarkerPosition()).mapStyles(styleMapper));
 
 
-            //this results in a NotSupportedOperation Exception because the add to an immutable list is not allowed
+            //this results in a NotSupportedOperation Exception because the addCell to an immutable list is not allowed
            /* getStyleSpans(0, getExecutionMarkerPosition()).forEach(span -> {
                 Collection<String> style = span.getStyle();
                 if (style.isEmpty()) {
                     setStyle(0, getExecutionMarkerPosition(), Collections.singleton("NON_EXE_AREA"));
                 } else {
-                    style.add("NON_EXE_AREA");
+                    style.addCell("NON_EXE_AREA");
                 }
             });
 */

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/SequentMatcher.java

@@ -117,7 +117,7 @@ public class SequentMatcher extends BorderPane {
                 services);
         ObservableList<Map<String, MatchPath>> resultlist = FXCollections.observableArrayList(matchings);
 
-        //If no matchings found, add "No matchings found"
+        //If no matchings found, addCell "No matchings found"
         if (resultlist.isEmpty()) {
             matchingsView.setVisible(false);
             nomatchings.setVisible(true);

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/SequentView.java

@@ -154,7 +154,7 @@ public class SequentView extends CodeArea {
         insertText(0, backend.getString());
         if (node.get().isClosed()) {
             this.setBorder(new Border(new BorderStroke(Color.GREEN, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
-            this.getStyleClass().add("closed-sequent-view");
+            // this.getStyleClass().add("closed-sequent-view");
         } else {
             this.setBorder(new Border(new BorderStroke(Color.BLACK, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
             this.getStyleClass().remove("closed-sequent-view");

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/TacletContextMenu.java

@@ -257,7 +257,7 @@ public class TacletContextMenu extends ContextMenu {
 
             // Items for insertion of hidden terms appear in a submenu.
             /*if (insertHiddenController.isResponsible(item)) {
-                insertHiddenController.add(item);
+                insertHiddenController.addCell(item);
             } else */
             {
                 // If one of the sets contains the rule it is considered rare
@@ -415,10 +415,10 @@ public class TacletContextMenu extends ContextMenu {
                                     String inputText) {
         TextInputDialog dialog = new TextInputDialog(inputText);
 
-        // Get the Stage and add KeY Icon.
+        // Get the Stage and addCell KeY Icon.
        /* Stage stage = (Stage) dialog.getDialogPane().getScene().getWindow();
         stage.getIcons()
-                .add(new Image(NUIConstants.KEY_APPLICATION_WINDOW_ICON_PATH));
+                .addCell(new Image(NUIConstants.KEY_APPLICATION_WINDOW_ICON_PATH));
         dialog.setTitle("Abbreviation Dialog");
         dialog.setHeaderText(header);
         dialog.setContentText(message);

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/Utils.java

@@ -261,8 +261,8 @@ public class Utils {
 
         GridPane expContent = new GridPane();
         expContent.setMaxWidth(Double.MAX_VALUE);
-        expContent.add(label, 0, 0);
-        expContent.add(textArea, 0, 1);
+        expContent.addCell(label, 0, 0);
+        expContent.addCell(textArea, 0, 1);
 
         alert.getDialogPane().setExpandableContent(expContent);
         */

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/graph/Cell.java

+package edu.kit.iti.formal.psdbg.gui.graph;
+
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.input.DragEvent;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import java.util.Arrays;
+
+@RequiredArgsConstructor
+public class Cell<T> extends Pane {
+    @Getter
+    private final T cellId;
+
+    /**
+     * if true, this cell is handled by the layouter.
+     */
+    @Getter
+    @Setter
+    private boolean invalid = true;
+
+    private Dragger dragger = new Dragger(this);
+
+    public Cell(T cellId, Node... children) {
+        super(children);
+        getStyleClass().add("graph-cell");
+        this.cellId = cellId;
+    }
+
+    public Cell(T cellId, String... children) {
+        getStyleClass().add("graph-cell");
+        this.cellId = cellId;
+        VBox hbox = new VBox();
+        hbox.getStyleClass().add("vbox");
+        getChildren().addAll(hbox);
+        Arrays.stream(children).forEachOrdered(s -> hbox.getChildren().add(new Label(s)));
+    }
+}
+
+class Dragger {
+    private double mouseX;
+    private double mouseY;
+
+    public Dragger(Node node) {
+        assert node != null;
+        node.setOnMousePressed(event -> {
+            mouseX = event.getSceneX();
+            mouseY = event.getSceneY();
+        });
+
+        node.setOnMouseDragged(event -> {
+            double deltaX = event.getSceneX() - mouseX;
+            double deltaY = event.getSceneY() - mouseY;
+            node.relocate(node.getLayoutX() + deltaX, node.getLayoutY() + deltaY);
+            mouseX = event.getSceneX();
+            mouseY = event.getSceneY();
+        });
+    }
+}
+
+

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/graph/CellLayer.java

+package edu.kit.iti.formal.psdbg.gui.graph;
+
+import javafx.scene.layout.Pane;
+
+public class CellLayer extends Pane {
+
+}

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/graph/Edge.java

+package edu.kit.iti.formal.psdbg.gui.graph;
+
+import javafx.beans.Observable;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Point2D;
+import javafx.scene.Group;
+import javafx.scene.control.Label;
+import javafx.scene.paint.Paint;
+import javafx.scene.shape.*;
+
+import java.util.Random;
+
+public class Edge<T> extends Group {
+    private static Random r = new Random();
+    protected SimpleObjectProperty<Cell<T>> source = new SimpleObjectProperty<>(), target = new SimpleObjectProperty<>();
+    private Line line = new Line();
+    private Label label = new Label();
+    private Circle circle = new Circle();
+    private double shiftX, shiftY;
+
+    public Edge(Cell<T> source, Cell<T> target, String label) {
+        setSource(source);
+        setTarget(target);
+
+        shiftX = r.nextInt(50) - 25;
+        shiftY = r.nextInt(50) - 25;
+
+        line = new Line();
+        line.getStyleClass().addAll("edge", label);
+        circle.getStyleClass().addAll("edge", label);
+        this.label.getStyleClass().addAll("edge-label", label);
+        this.label.setText(label);
+        this.source.addListener(this::renewNode);
+        this.target.addListener(this::renewNode);
+
+
+        renewNode(this.source, null, source);
+        renewNode(this.target, null, target);
+
+        getChildren().addAll(line, this.label, circle);
+        redraw();
+    }
+
+    private void renewNode(ObservableValue<? extends Cell> observableValue, Cell<T> old, Cell<T> nValue) {
+        if (old != null) {
+            old.layoutBoundsProperty().removeListener(this::redraw);
+            old.layoutXProperty().removeListener(this::redraw);
+            old.layoutYProperty().removeListener(this::redraw);
+        }
+        if (nValue != null) {
+            nValue.layoutBoundsProperty().addListener(this::redraw);
+            nValue.layoutXProperty().addListener(this::redraw);
+            nValue.layoutYProperty().addListener(this::redraw);
+        }
+        redraw();
+    }
+
+    void redraw() {
+        redraw(null);
+    }
+
+    void redraw(Observable observable) {
+        double x1, y1, x2, y2;
+        if (getSource() == null || getTarget() == null) {
+            x1 = y1 = x2 = y2 = 0;
+        } else {
+
+            x1 = getSource().getLayoutX() + getSource().getBoundsInParent().getWidth() / 2.0;
+            x2 = getTarget().getLayoutX() + getTarget().getBoundsInParent().getWidth() / 2.0;
+
+            y1 = getSource().getLayoutY() + getSource().getBoundsInParent().getHeight() / 2.0;
+            y2 = getTarget().getLayoutY() + getTarget().getBoundsInParent().getHeight() / 2.0;
+
+        }
+
+        Point2D start = new Point2D(x1, y1);
+        Point2D end = new Point2D(x2, y2);
+
+        Point2D midpoint = start.midpoint(end);
+
+        label.relocate(midpoint.getX() + shiftX, shiftY + midpoint.getY());
+
+        line.setStartX(x1);
+        line.setStartY(y1);
+        line.setEndX(x2);
+        line.setEndY(y2);
+
+        circle.setCenterX(x2);
+        circle.setCenterY(y2);
+        circle.setRadius(15);
+
+        if (getTarget() != null) {
+            end = correctToRectangle(getTarget().getLayoutX(),
+                    getTarget().getLayoutY(), getTarget().getWidth(), getTarget().getHeight());
+            if (end != null) {
+                circle.setCenterX(end.getX());
+                circle.setCenterY(end.getY());
+
+                line.setEndX(end.getX());
+                line.setEndY(end.getY());
+            }
+        }
+    }
+
+    private Point2D correctToRectangle(double x, double y, double width, double height) {
+        Rectangle r = new Rectangle(x, y, width, height);
+        r.setStroke(Paint.valueOf("black"));
+        r.setStrokeWidth(1);
+        r.setFill(null);
+        try {
+            Path inter = (Path) Shape.intersect(line, r);
+            MoveTo mt = (MoveTo) inter.getElements().get(0);
+            return new Point2D(mt.getX(), mt.getY());
+        } catch (ClassCastException | IndexOutOfBoundsException cce) {
+            //cce.printStackTrace();
+        }
+        return null;
+    }
+
+    public Cell getSource() {
+        return source.get();
+    }
+
+    public void setSource(Cell source) {
+        this.source.set(source);
+    }
+
+    public SimpleObjectProperty<Cell<T>> sourceProperty() {
+        return source;
+    }
+
+    public Cell getTarget() {
+        return target.get();
+    }
+
+    public void setTarget(Cell target) {
+        this.target.set(target);
+    }
+
+    public SimpleObjectProperty<Cell<T>> targetProperty() {
+        return target;
+    }
+}
\ No newline at end of file

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/graph/Graph.java

+package edu.kit.iti.formal.psdbg.gui.graph;
+
+import edu.kit.iti.formal.psdbg.ShortCommandPrinter;
+import edu.kit.iti.formal.psdbg.interpreter.data.KeyData;
+import edu.kit.iti.formal.psdbg.interpreter.dbg.PTreeNode;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import java.util.HashMap;
+
+public class Graph<T> {
+    final private SimpleListProperty<Cell<T>> nodes = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final SimpleListProperty<Edge<T>> edges = new SimpleListProperty<>(FXCollections.observableArrayList());
+    protected HashMap<T, Cell<T>> map = new HashMap<>();