bug fix

src/main/java/edu/kit/formal/gui/controller/DebuggerMainWindowController.java

@@ -231,8 +231,9 @@ public class DebuggerMainWindowController implements Initializable {
                 }
             });
             pc.executeScript(this.debugMode.get());
-            model.currentSelectedGoalNodeProperty().bind(pc.currentSelectedGoalProperty());
-            model.currentGoalNodesProperty().bind(pc.currentGoalsProperty());
+            pc.currentGoalsProperty().addListener((observable, oldValue, newValue) -> {
+                model.setCurrentGoalNodes(newValue);
+            });
 
             pc.startHighlightPositionPropertyProperty().addListener((observable, oldValue, newValue) -> {
                 if (newValue.getLineNumber() > -1) {

src/main/java/edu/kit/formal/interpreter/InterpreterBuilder.java

@@ -96,7 +96,7 @@ public class InterpreterBuilder {
     }
 
     public InterpreterBuilder macros(Collection<ProofMacro> macros) {
-        macros.forEach(m -> pmh.getMacros().put(m.getName(), m));
+        macros.forEach(m -> pmh.getMacros().put(m.getScriptCommandName(), m));
         return this;
     }
 

src/main/java/edu/kit/formal/interpreter/funchdl/MacroCommandHandler.java

@@ -2,11 +2,9 @@ package edu.kit.formal.interpreter.funchdl;
 
 import de.uka.ilkd.key.macros.ProofMacro;
 import edu.kit.formal.interpreter.Interpreter;
+import edu.kit.formal.interpreter.data.Value;
 import edu.kit.formal.interpreter.data.VariableAssignment;
-import edu.kit.formal.proofscriptparser.ast.CallStatement;
-import edu.kit.formal.proofscriptparser.ast.Parameters;
-import edu.kit.formal.proofscriptparser.ast.StringLiteral;
-import edu.kit.formal.proofscriptparser.ast.Variable;
+import edu.kit.formal.proofscriptparser.ast.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -36,15 +34,16 @@ public class MacroCommandHandler implements CommandHandler {
                          CallStatement call,
                          VariableAssignment params) {
         //ProofMacro m = macros.get(call.getCommand());
-        macros.forEach((k, v) -> {
-            System.out.println(k);
-        });
         Parameters p = new Parameters();
         p.put(new Variable("#2"), new StringLiteral(call.getCommand()));
         CallStatement macroCall = new CallStatement("macro", p);
         macroCall.setRuleContext(call.getRuleContext());
+        VariableAssignment newParam = new VariableAssignment(null);
+        newParam.declare("#2", Type.STRING);
+        newParam.assign("#2", Value.from(call.getCommand()));
         //macro proofscript command
-        interpreter.getFunctionLookup().callCommand(interpreter, call, params);
+        interpreter.getFunctionLookup().callCommand(interpreter, macroCall, newParam);
+
         //TODO change MacroCommand.Parameters to public
     }
 }

src/main/java/edu/kit/formal/interpreter/funchdl/ProofScriptCommandBuilder.java

@@ -47,7 +47,7 @@ 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.toString()));
+        params.asMap().forEach((k, v) -> map.put(k.getIdentifier(), v.getData().toString()));
         System.out.println(map);
         try {
             EngineState estate = new EngineState(kd.getProof());

src/main/java/edu/kit/formal/interpreter/graphs/ProofTreeController.java

@@ -108,6 +108,7 @@ public class ProofTreeController {
                 this.setCurrentGoals(newValue);
             });
         });
+
         //add listener to nextcomputed node, that is updated whenever a new node is added to the stategraph
         nextComputedNode.addListener((observable, oldValue, newValue) -> {
             //update statepointer

src/main/resources/META-INF/services/de.uka.ilkd.key.macros.scripts.ProofScriptCommand

+#
+# Script commands to be used in proof scripts
+#
+
+#de.uka.ilkd.key.macros.scripts.FinishSymbolicExecutionMacro
\ No newline at end of file