corrected handling of match results concerning varaible assignment and added...

corrected handling of match results concerning varaible assignment and added number of nodes and progress to status bar

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

@@ -207,7 +207,9 @@ public class KeYMatcher implements MatcherApi<KeyData> {
     public List<VariableAssignment> matchSeq(GoalNode<KeyData> currentState, String data, Signature sig) {
         System.out.println("State that will be matched " + currentState.getData().getNode().sequent() + " with pattern " + data);
         System.out.println("Signature " + sig.toString());
+
         Matchings m = MatcherFacade.matches(data, currentState.getData().getNode().sequent());
+
         if (m.isEmpty()) {
             return Collections.emptyList();
         } else {
@@ -217,8 +219,13 @@ public class KeYMatcher implements MatcherApi<KeyData> {
                 MatchPath matchPath = firstMatch.get(s);
                 if (!s.equals("EMPTY_MATCH")) {
                     Term matched = (Term) matchPath.getUnit();
+                    if (s.startsWith("?")) {
+
+                        s = s.replaceFirst("\\?", "");
+                    }
                     va.declare(s, new TermType());
                     va.assign(s, Value.from(from(matched)));
+                    System.out.println("Variable " + s + " : " + Value.from(from(matched)));
                 }
             }
             List<VariableAssignment> retList = new LinkedList();

rt-key/src/test/resources/edu/kit/iti/formal/psdbg/interpreter/contraposition/cutTest.kps

 script cutTest(){
-    cut #2=`p`;
+  cases{
+    case match `==>?X -> ?Y`:
+     
+  }
+    //cut #2=`p`;
+    //auto steps=100;
 }
\ No newline at end of file

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

@@ -52,7 +52,13 @@ public class DefaultLookup implements CommandLookup {
                 if (found == null) {
                     found = b;
                 } else {
-                    throw new IllegalStateException("Call on line" + callStatement + " is ambigue.");
+                    found = b; //CUTCommand
+                    System.out.println(b.getClass());
+                    System.out.println(found.getClass());
+                    if (callStatement.getCommand().equals("cut")) {
+                        System.out.println("Cut Case");
+                    }
+                    //throw new IllegalStateException("Call on line" + callStatement + " is ambigue.");
                 }
             }
         }

ui/src/main/java/edu/kit/iti/formal/psdbg/InterpretingService.java

 package edu.kit.iti.formal.psdbg;
 
 import edu.kit.iti.formal.psdbg.gui.controller.PuppetMaster;
+import edu.kit.iti.formal.psdbg.gui.controls.DebuggerStatusBar;
 import edu.kit.iti.formal.psdbg.gui.controls.Utils;
 import edu.kit.iti.formal.psdbg.interpreter.Interpreter;
 import edu.kit.iti.formal.psdbg.interpreter.data.KeyData;
@@ -17,11 +18,11 @@ import javafx.concurrent.Task;
  * @author A. Weigl
  */
 public class InterpretingService extends Service<State<KeyData>> {
-
     /**
-     * The interpreter (with teh appropriate KeY state) that is used to traverse and execute the script
+     * The interpreter (with the appropriate KeY state) that is used to traverse and execute the script
      */
     private final SimpleObjectProperty<Interpreter<KeyData>> interpreter = new SimpleObjectProperty<>();
+    private DebuggerStatusBar statusBar;
 
     /**
      * The main script that is traversed
@@ -41,6 +42,12 @@ public class InterpretingService extends Service<State<KeyData>> {
         this.blocker = blocker;
     }
 
+
+    public InterpretingService(PuppetMaster blocker, DebuggerStatusBar statusBar) {
+        this.blocker = blocker;
+        this.statusBar = statusBar;
+    }
+
     public SimpleBooleanProperty hasRunSucessfullyProperty() {
         return hasRunSucessfully;
     }
@@ -70,6 +77,9 @@ public class InterpretingService extends Service<State<KeyData>> {
         //currentGoals.set(state.getGoals());
         //currentSelectedGoal.set(state.getSelectedGoalNode());
         System.out.println("Updating View");
+        if (statusBar != null) {
+            statusBar.stopProgress();
+        }
         blocker.publishState();
     }
 
@@ -87,6 +97,9 @@ public class InterpretingService extends Service<State<KeyData>> {
              */
             @Override
             protected edu.kit.iti.formal.psdbg.interpreter.data.State<KeyData> call() throws Exception {
+                if (statusBar != null) {
+                    statusBar.indicateProgress();
+                }
                 i.interpret(ast);
                 return i.peekState();
             }

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

@@ -159,6 +159,7 @@ public class DebuggerMain implements Initializable {
      * If the mouse moves other toolbar button, the help text should display in the status bar
      */
     private void registerToolbarToStatusBar() {
+
         /*toolbar.getChildrenUnmodifiable().forEach(
                 n -> n.setOnMouseEntered(statusBar.getTooltipHandler()));
 
@@ -176,6 +177,7 @@ public class DebuggerMain implements Initializable {
         proofTreeController.currentGoalsProperty().addListener((o, old, fresh) -> {
             if (fresh != null) {
                 imodel.setGoals(fresh);
+
             } else {
                 // no goals, set an empty list
                 imodel.setGoals(FXCollections.observableArrayList());
@@ -198,6 +200,11 @@ public class DebuggerMain implements Initializable {
 
         });
 
+        imodel.goalsProperty().addListener((observable, oldValue, newValue) -> statusBar.setNumberOfGoals(newValue.size()));
+
+
+
+
       /*proofTreeController.currentExecutionEndProperty().addListener((observable, oldValue, newValue) -> {
                     scriptController.getMainScript().getScriptArea().removeExecutionMarker();
                     LineMapping lm = new LineMapping(scriptController.getMainScript().getScriptArea().getText());

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

@@ -280,7 +280,7 @@ public class ProofTreeController {
 
             this.stateGraphWrapper.install(currentInterpreter);
             this.stateGraphWrapper.addChangeListener(graphChangedListener);
-
+            statusBar.stopProgress();
             blocker.getStepUntilBlock().set(1);
         }
 
@@ -292,9 +292,10 @@ public class ProofTreeController {
         interpreterService.interpreterProperty().set(currentInterpreter);
 
         interpreterService.mainScriptProperty().set(mainScript.get());
+
         interpreterService.start();
         interpreterService.setOnSucceeded(event -> {
-            statusBar.setText("Executed script until end of script.");
+            statusBar.setText("Executed until end of script.");
             statusBar.stopProgress();
         });
         interpreterService.setOnFailed(event -> {

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

@@ -2,7 +2,9 @@ package edu.kit.iti.formal.psdbg.gui.controls;
 
 import edu.kit.iti.formal.psdbg.gui.controller.Events;
 import edu.kit.iti.formal.psdbg.gui.model.MainScriptIdentifier;
+import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.event.EventHandler;
 import javafx.scene.control.Control;
@@ -26,12 +28,8 @@ public class DebuggerStatusBar extends StatusBar {
     //private LogCatchHandlerFX logCatchHandler = new LogCatchHandlerFX();
 
     private ObjectProperty<MainScriptIdentifier> mainScriptIdentifier = new SimpleObjectProperty<>();
-    private Label lblCurrentNodes = new Label("#nodes: %s");
-    private Label lblMainscript = new Label();
-    private ProgressIndicator progressIndicator = new ProgressIndicator();
-    private EventHandler<MouseEvent> toolTipHandler = event -> {
-        publishMessage(((Control) event.getTarget()).getTooltip().getText());
-    };
+
+    private IntegerProperty numberOfGoals = new SimpleIntegerProperty(0);
 
     public DebuggerStatusBar() {
         //listenOnField("psdbg");
@@ -47,7 +45,9 @@ public class DebuggerStatusBar extends StatusBar {
                 contextMenu.show(this, event.getScreenX(), event.getScreenY());
             }
         });*/
-
+        numberOfGoals.addListener((observable, oldValue, newValue) -> {
+            lblCurrentNodes.setText("#nodes: " + newValue);
+        });
 
         mainScriptIdentifier.addListener((ov, o, n) -> {
             if (n != null) {
@@ -75,6 +75,25 @@ public class DebuggerStatusBar extends StatusBar {
         });
     }
 
+    public int getNumberOfGoals() {
+        return numberOfGoals.get();
+    }
+
+    public void setNumberOfGoals(int numberOfGoals) {
+        this.numberOfGoals.set(numberOfGoals);
+    }
+
+    private Label lblCurrentNodes = new Label("#nodes: %s");
+    private Label lblMainscript = new Label();
+    private ProgressIndicator progressIndicator = new ProgressIndicator();
+    private EventHandler<MouseEvent> toolTipHandler = event -> {
+        publishMessage(((Control) event.getTarget()).getTooltip().getText());
+    };
+
+    public IntegerProperty numberOfGoalsProperty() {
+        return numberOfGoals;
+    }
+
     /*
     private Appender createAppender() {
         PatternLayout layout = PatternLayout.createDefaultLayout();

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

@@ -158,6 +158,7 @@ public class InspectionView extends BorderPane {
             if (goalOptionsMenu.getSelectedViewOption() != null) {
                 text = goalOptionsMenu.getSelectedViewOption().getText(item);
             }
+            //setStyle("-fx-font-size: 12pt;");
             setText(text);
         }
     }

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

@@ -138,7 +138,6 @@
   -fx-background-color: @basenavy;
   //  -fx-background-color: @base3;
   -fx-font-family: "Inconsolata", monospace;
-  //-fx-font-family: "Fira Code Medium", monospace;
   -fx-font-size: 12pt;
   -fx-fill: @base01;
 
@@ -181,8 +180,6 @@
 
   .LINE_COMMENT, .COMMENT {
     -fx-fill: @base01;
-    //-fx-font-family:  "Fira Code Light", monospace;
-    -fx-font-family: "Inconsolata", monospace;
   }
 
   .Identifier {