Merge branch 'luong_workbranch' into 'master'

Luong workbranch

See merge request !20

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

@@ -14,7 +14,7 @@ public class ASTDiff extends DefaultASTVisitor<ASTNode> {
         newScript.setSignature(proofScript.getSignature());
 
         other = ((ProofScript) other).getBody();
-        newScript.setBody(visit(newScript.getBody()));
+        newScript.setBody(visit(proofScript.getBody()));
         return newScript;
     }
 
@@ -61,12 +61,13 @@ public class ASTDiff extends DefaultASTVisitor<ASTNode> {
 
         int i = 0;
         for (; i < statements.size(); i++) {
-            if (statements.get(i).eq(other.get(i))) {
-                break;
+            if (!statements.get(i).isSame(other.get(i))) {
+                System.out.println("Alter Script wurde verändert");
+                return null;
             }
         }
 
-        for (int j = i; j < other.size(); j++) {
+        for (; i < other.size(); i++) {
             s.add(other.get(i));
         }
 

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

@@ -167,6 +167,11 @@ public abstract class ASTNode<T extends ParserRuleContext>
         return Objects.hash(getRuleContext());
     }
 
+    //TODO: param + class
+    public boolean isSame(ASTNode other) {
+        return this.getNodeName().equals(other.getNodeName());
+    }
+
     public int getSyntaxWidth() {
         if (ruleContext != null) {
             return ruleContext.stop.getStopIndex()

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

@@ -225,9 +225,10 @@ public class InterpreterBuilder {
 
     public InterpreterBuilder setProblemPath(File path){
         Map<String, CommandHandler<KeyData>> builtinsnew = this.bich.getBuiltins();
-        SaveCommand sc = new SaveCommand(path);
-        builtinsnew.put(SaveCommand.SAVE_COMMAND_NAME, sc);
+
+        builtinsnew.put(SaveCommand.SAVE_COMMAND_NAME, new SaveCommand(path));
         this.bich.setBuiltins(builtinsnew);
+
         return this;
 
     }

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

@@ -63,7 +63,8 @@ public class SaveCommand implements CommandHandler<KeyData> {
                 Semaphore semaphore = new Semaphore(0);
                 Platform.runLater(() -> {
                     Alert a = new Alert(Alert.AlertType.CONFIRMATION);
-                    a.setTitle("Foo");
+                    a.setTitle("Overwrite proof file");
+                    a.setContentText("Overwrite existing proof file \"" + sp.getName()+"\" (line "+ sp.getLineNumber() +") ?");
                     Optional<ButtonType> buttonType = a.showAndWait();
                     if(buttonType.isPresent() && buttonType.get() == ButtonType.OK){
                         execute.set(true);
@@ -86,10 +87,7 @@ public class SaveCommand implements CommandHandler<KeyData> {
     }
 
 
-    @Override
-    public boolean isUninterpretedParams(CallStatement call) {
-        return true;
-    }
+
 }
 
 

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

@@ -599,7 +599,7 @@ public class Interpreter<T> extends DefaultASTVisitor<Object>
 
     private VariableAssignment evaluateParametersStateLess(Parameters parameters) {
         VariableAssignment va = new VariableAssignment();
-        Evaluator<T> evaluator = createEvaluator(null, null);
+        Evaluator<T> evaluator = new Evaluator<>(null, null);
 
         parameters.entrySet().forEach(entry -> {
             try {

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

@@ -110,7 +110,7 @@ public class InteractiveModeController {
      */
     public void undo(javafx.event.ActionEvent actionEvent) {
         if (savepointslist.isEmpty()) {
-            Debug.log("Kein vorheriger Zustand."); //TODO: events fire
+            Debug.log("Kein vorheriger Zustand.");
             return;
         }
 

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

@@ -8,7 +8,9 @@ import edu.kit.iti.formal.psdbg.interpreter.KeYProofFacade;
 import edu.kit.iti.formal.psdbg.interpreter.KeyInterpreter;
 import edu.kit.iti.formal.psdbg.interpreter.data.SavePoint;
 import edu.kit.iti.formal.psdbg.interpreter.dbg.Breakpoint;
+import edu.kit.iti.formal.psdbg.parser.ASTDiff;
 import edu.kit.iti.formal.psdbg.parser.Facade;
+import edu.kit.iti.formal.psdbg.parser.ast.ASTNode;
 import edu.kit.iti.formal.psdbg.parser.ast.ProofScript;
 import edu.kit.iti.formal.psdbg.parser.ast.Statements;
 import javafx.scene.control.Alert;
@@ -160,5 +162,10 @@ public class ScriptExecutionController {
     }
 
 
+    private ASTNode calculateDiff (ASTDiff dff) {
+
+        return null;
+    }
+
 
 }

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

@@ -29,11 +29,9 @@ import javafx.scene.control.cell.TextFieldTreeCell;
 import javafx.scene.layout.BorderPane;
 import javafx.util.StringConverter;
 import lombok.*;
+import sun.reflect.generics.tree.Tree;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Consumer;
 
 
@@ -327,12 +325,14 @@ public class ProofTree extends BorderPane {
     }
 
 
+
     @AllArgsConstructor
     private static class TreeNode {
         String label;
         Node node;
     }
 
+
     class TreeTransformationKey {
 
         public TreeItem<TreeNode> create(Proof proof) {
@@ -414,6 +414,7 @@ public class ProofTree extends BorderPane {
     }
 
 
+
     @RequiredArgsConstructor
     class TreeTransformationScript extends TreeTransformationKey {
         final ProofTreeManager<KeyData> manager;
@@ -472,5 +473,44 @@ public class ProofTree extends BorderPane {
             TreeItem<TreeNode> ti = new TreeItem<>(new TreeNode(lbl, n));
             return ti;
         }
+
+
+        //TODO: Reverse ArrayList in the end or nah?
+        @Deprecated
+        public ArrayList<String> getBranchLabels (TreeNode node) {
+            TreeItem<TreeNode> proofTree = create(proof.get());
+
+            ArrayList<String> branchlabels = new ArrayList<>();
+
+            int i = 0;
+            branchlabels.set(0, node.label);
+            while (node != null) {
+                if(!branchlabels.get(i).equals(node.label)) {
+                    i++;
+                    branchlabels.set(i, node.label);
+                }
+                //TODO: node = node.parent
+            }
+
+            return branchlabels;
+        }
+
+        public  ArrayList<String> getBranchLabels (Node node) {
+            ArrayList<String> branchlabels = new ArrayList<>();
+
+            int i = 0;
+            //TODO: branchlabel = all branchlabels or only next one
+            branchlabels.set(0, node.getNodeInfo().getBranchLabel());
+            Node n = node.parent();
+            while (n != null) {
+                if(!branchlabels.get(i).equals(n.getNodeInfo().getBranchLabel())) {
+                    i++;
+                    branchlabels.set(i, n.getNodeInfo().getBranchLabel());
+                }
+                n = n.parent();
+            }
+
+            return branchlabels;
+        }
     }
 }

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

@@ -9,7 +9,10 @@ import edu.kit.iti.formal.psdbg.gui.actions.acomplete.Suggestion;
 import edu.kit.iti.formal.psdbg.gui.actions.inline.InlineActionSupplier;
 import edu.kit.iti.formal.psdbg.gui.controller.Events;
 import edu.kit.iti.formal.psdbg.gui.model.MainScriptIdentifier;
+import edu.kit.iti.formal.psdbg.interpreter.data.KeyData;
+import edu.kit.iti.formal.psdbg.interpreter.data.SavePoint;
 import edu.kit.iti.formal.psdbg.interpreter.dbg.Breakpoint;
+import edu.kit.iti.formal.psdbg.interpreter.dbg.PTreeNode;
 import edu.kit.iti.formal.psdbg.lint.LintProblem;
 import edu.kit.iti.formal.psdbg.lint.LinterStrategy;
 import edu.kit.iti.formal.psdbg.parser.Facade;
@@ -388,6 +391,10 @@ public class ScriptArea extends BorderPane {
         }
     }
 
+    public void underlineSavepoint(SavePoint sp){
+        codeArea.setStyle(sp.getLineNumber() -1, Collections.singleton("underlinesave"));
+    }
+
     private void highlightNonExecutionArea() {
         if (hasExecutionMarker()) {
             LOGGER.debug("getExecutionMarkerPosition() = " + getExecutionMarkerPosition());
@@ -455,11 +462,12 @@ public class ScriptArea extends BorderPane {
 
     }
 
-    private void underline(int linenumber) {
-
+    public void setAlertMarker(int lineNumber) {
+        gutter.getLineAnnotation(lineNumber - 1).setAlert(true);
     }
 
 
+
     private boolean hasExecutionMarker() {
         return getText().contains(EXECUTION_MARKER);
     }
@@ -646,6 +654,10 @@ public class ScriptArea extends BorderPane {
                 MaterialDesignIcon.CONTENT_SAVE, "12"
         );
 
+        private MaterialDesignIconView iconSkippedSave = new MaterialDesignIconView(
+                MaterialDesignIcon.ALERT, "12"
+        );
+
         private Label lineNumber = new Label("not set");
 
         public GutterView(GutterAnnotation ga) {
@@ -676,6 +688,8 @@ public class ScriptArea extends BorderPane {
             if (getAnnotation().isMainScript()) getChildren().add(iconMainScript);
             else if (getAnnotation().isSavepoint()) getChildren().add(iconSavepoint);
             else addPlaceholder();
+            if (getAnnotation().isAlert()) getChildren().add(iconSkippedSave);
+            else addPlaceholder();
             if (getAnnotation().isBreakpoint())
                 getChildren().add(getAnnotation().getConditional()
                         ? iconConditionalBreakPoint
@@ -717,6 +731,21 @@ public class ScriptArea extends BorderPane {
 
         private SimpleBooleanProperty savepoint = new SimpleBooleanProperty();
 
+        //for now specifically for skipped saved commands
+        private SimpleBooleanProperty alert = new SimpleBooleanProperty();
+
+        public boolean isAlert() {
+            return alert.get();
+        }
+
+        public SimpleBooleanProperty alertProperty() {
+            return alert;
+        }
+
+        public void setAlert(boolean alert) {
+            this.alert.set(alert);
+        }
+
         public String getText() {
             return text.get();
         }

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

@@ -88,6 +88,8 @@ public class ScriptController {
             if (o != null)
                 o.getScriptArea().textProperty().removeListener(a -> updateSavePoints());
             n.getScriptArea().textProperty().addListener(a -> updateSavePoints());
+
+
             updateSavePoints();
         });
 
@@ -95,48 +97,30 @@ public class ScriptController {
     }
 
     private void updateSavePoints() {
-        try{
-        Optional<ProofScript> ms = getMainScript().find(getCombinedAST());
-        if (ms.isPresent()) {
-            List<SavePoint> list = ms.get().getBody().stream()
-                    .filter(SavePoint::isSaveCommand)
-                    .map(a -> (CallStatement) a)
-                    .map(SavePoint::new)
-                    .collect(Collectors.toList());
-            mainScriptSavePoints.setAll(list);
-           // loggerConsole.info("Found savepoints: " + list);
-        }}catch (Exception e){}
-
-    }
-
-/*
-    public int getLineOfSavepoint(SavePoint sp) {
-        Optional<ProofScript> ms = getMainScript(). find(getCombinedAST());
-
-        if(ms.isPresent()) {
-            List<CallStatement> list = ms.get().getBody().stream()
-                    .filter(SavePoint::isSaveCommand)
-                    .map(a -> (CallStatement) a).
-                    collect(Collectors.toList());
-
-
-            if(!list.isEmpty()) {
-               for(int i = 0; i < list.size(); i++) {
-                   if(true) {
-                       Parameters param = list.get(i).getParameters();
-                       String splistname = ((StringLiteral) param.get(new Variable("#2"))).getText();
-                        if(splistname.equals(sp.getName())) {
-                            int index = ms.get().getBody().indexOf(list.get(i));
-                            return ms.get().getBody().get(index).getStartPosition().getLineNumber();
-                        }
-                   }
-               }
+        try {
+            Optional<ProofScript> ms = getMainScript().find(getCombinedAST());
+            if (ms.isPresent()) {
+                List<SavePoint> list = ms.get().getBody().stream()
+                        .filter(SavePoint::isSaveCommand)
+                        .map(a -> (CallStatement) a)
+                        .map(SavePoint::new)
+                        .collect(Collectors.toList());
+
+                mainScriptSavePoints.setAll(list);
+
+                //set alert gutter annotations
+                List<SavePoint> noForceSp = mainScriptSavePoints.stream()
+                        .filter(a -> a.getForce().equals(SavePoint.ForceOption.NO))
+                        .collect(Collectors.toList());
+                noForceSp.forEach(e -> getMainScript().getScriptArea().setAlertMarker(e.getLineNumber()));
+
+                loggerConsole.info("Found savepoints: " + list);
             }
-        }
-        return -1;
+        } catch (Exception e) {
 
+        }
     }
-    */
+
 
     private void addDefaultInlineActions() {
         actionSuppliers.add(new FindLabelInGoalList());
@@ -373,6 +357,7 @@ public class ScriptController {
     }
 
     public void setMainScript(ProofScript proofScript) {
+
         MainScriptIdentifier msi = new MainScriptIdentifier();
         msi.setLineNumber(proofScript.getStartPosition().getLineNumber());
         msi.setScriptName(proofScript.getName());

ui/src/main/resources/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.fxml

@@ -251,6 +251,15 @@
                                   </tooltip>
                               </Button>-->
 
+                        <Button  disable="false">
+                            <graphic>
+                                <MaterialDesignIconView glyphName="KEYBOARD_BACKSPACE" size="24.0"/>
+                            </graphic>
+                            <tooltip>
+                                <Tooltip text="Prune to savepoint"/>
+                            </tooltip>
+                        </Button>
+
                         <Button onAction="#continueAfterRun" disable="${controller.executeNotPossible}">
                             <graphic>
                                 <MaterialDesignIconView glyphName="PLAY_CIRCLE_OUTLINE" size="24.0"/>

ui/src/main/resources/edu/kit/iti/formal/psdbg/gui/debugger-ui.less

@@ -115,6 +115,13 @@
     -fx-underline: true;
   }
 
+   .underlinesave {
+        -rtfx-underline-cap: butt;
+        -rtfx-underline-color: @cyan;
+        -rtfx-underline-width: 2px;
+        -fx-underline: true;
+    }
+
   .line-highlight-postmortem {
 //    -rtfx-background-color: @cyan;
     -rtfx-background-color: @screenShotMarkerBase;