Skip to content

GitLab

Commit 9ab25960 authored by Sarah Grebing's avatar Sarah Grebing
Browse files

fixed notsupported exception for non execution area highlighting and... 

fixed notsupported exception for non execution area highlighting and implemnted mainscriptidentifier for prooftreecontroller
parent 559327a5
Pipeline #13294 failed with stage
in 11 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 23 deletions
rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/data/State.java
View file @ 9ab25960
......@@ -85,7 +85,7 @@ public class State<T> {
for (GoalNode<T> goal : goals) {
GoalNode<T> deepcopy = goal.deepCopy();
copiedGoals.add(deepcopy);
if (goal.equals(selectedGoalNode)) {
if (goal.equals(getSelectedGoalNode())) {
refToSelGoal = deepcopy;
}
}
......
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java
View file @ 9ab25960
......@@ -10,7 +10,7 @@ import edu.kit.iti.formal.psdbg.gui.ProofScriptDebugger;
import edu.kit.iti.formal.psdbg.gui.controls.*;
import edu.kit.iti.formal.psdbg.gui.model.Breakpoint;
import edu.kit.iti.formal.psdbg.gui.model.InspectionModel;
import edu.kit.iti.formal.psdbg.interpreter.Interpreter;
import edu.kit.iti.formal.psdbg.gui.model.MainScriptIdentifier;
import edu.kit.iti.formal.psdbg.interpreter.InterpreterBuilder;
import edu.kit.iti.formal.psdbg.interpreter.KeYProofFacade;
import edu.kit.iti.formal.psdbg.interpreter.KeyInterpreter;
......@@ -190,8 +190,11 @@ public class DebuggerMain implements Initializable {
//System.out.println("Pos: "+newValue.getData().getNode().getNodeInfo().getActiveStatement().getPositionInfo());
});
//TODO nullpointer
proofTreeController.currentHighlightNodeProperty().addListener((observable, oldValue, newValue) -> {
scriptController.getDebugPositionHighlighter().highlight(newValue);
if (newValue != null) {
scriptController.getDebugPositionHighlighter().highlight(newValue);
}
});
......@@ -425,12 +428,13 @@ public class DebuggerMain implements Initializable {
}
/**
* Execute the script that with using the interpreter that is build using teh interpreterbuilder
* Execute the script that with using the interpreter that is build using the interpreterbuilder
*
* @param ib
* @param debugMode
*/
private void executeScript(InterpreterBuilder ib, boolean debugMode) {
Set<Breakpoint> breakpoints = scriptController.getBreakpoints();
if (proofTreeController.isAlreadyExecuted()) {
......@@ -441,13 +445,34 @@ public class DebuggerMain implements Initializable {
try {
List<ProofScript> scripts = scriptController.getCombinedAST();
int n = 0;
if (scriptController.getMainScript() == null) {
MainScriptIdentifier msi = new MainScriptIdentifier();
msi.setLineNumber(scripts.get(0).getStartPosition().getLineNumber());
msi.setScriptName(scripts.get(0).getName());
msi.setSourceName(scripts.get(0).getRuleContext().getStart().getInputStream().getSourceName());
msi.setScriptArea(scriptController.findEditor(new File(scripts.get(0).getRuleContext().getStart().getInputStream().getSourceName())));
scriptController.setMainScript(msi);
n = 0;
} else {
for (int i = 0; i < scripts.size(); i++) {
ProofScript proofScript = scripts.get(i);
if (proofScript.getName().equals(scriptController.getMainScript().getScriptName())) {
n = i;
break;
}
}
}
statusBar.publishMessage("Creating new Interpreter instance ...");
ib.setScripts(scripts);
KeyInterpreter currentInterpreter = ib.build();
proofTreeController.setCurrentInterpreter(currentInterpreter);
proofTreeController.setMainScript(scripts.get(0));
statusBar.publishMessage("Executing script " + scripts.get(0).getName());
proofTreeController.setMainScript(scripts.get(n));
statusBar.publishMessage("Executing script " + scripts.get(n).getName());
proofTreeController.executeScript(this.debugMode.get(), statusBar, breakpoints);
//highlight signature of main script
//scriptController.setDebugMark(scripts.get(0).getStartPosition().getLineNumber());
......
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/ProofTreeController.java
View file @ 9ab25960
......@@ -92,24 +92,33 @@ public class ProofTreeController {
private PTreeNode<KeyData> statePointer = null;
/**
* Teh mainscipt that is executed
* The mainscipt that is executed
*/
private ProofScript mainScript;
private SimpleObjectProperty<ProofScript> mainScript = new SimpleObjectProperty<>();
/**
* Add a change listener for the stategraph, whenever a new node is added it receives an event
*/
private GraphChangedListener graphChangedListener = nodeAddedEvent -> {
if (statePointer.equals(nodeAddedEvent.getLastPointer())) {
//if (statePointer.equals(nodeAddedEvent.getLastPointer())) {
//set value of newly computed node
nextComputedNode.setValue(nodeAddedEvent.getAddedNode());
//setNewState(this.statePointer.getState());
Events.fire(new Events.NewNodeExecuted(nodeAddedEvent.getAddedNode().getScriptstmt()));
}
//}
};
public ProofScript getMainScript() {
return mainScript.get();
}
public void setMainScript(ProofScript mainScript) {
this.mainScript.set(mainScript);
}
public SimpleObjectProperty<ProofScript> mainScriptProperty() {
return mainScript;
}
/**
* Create a new ProofTreeController
* and bind properties
......@@ -258,12 +267,12 @@ public class ProofTreeController {
} else {
statusBar.setText("Starting in debug mode for script " + mainScript.getName());
statusBar.indicateProgress();
setCurrentHighlightNode(mainScript.getSignature());
setCurrentHighlightNode(mainScript.get());
//build CFG
buildControlFlowGraph(mainScript);
buildControlFlowGraph(mainScript.get());
//build StateGraph
this.stateGraphWrapper = new StateGraphWrapper(currentInterpreter, this.mainScript, this.controlFlowGraphVisitor);
this.stateGraphWrapper = new StateGraphWrapper(currentInterpreter, mainScript.get(), this.controlFlowGraphVisitor);
this.stateGraphWrapper.install(currentInterpreter);
this.stateGraphWrapper.addChangeListener(graphChangedListener);
......@@ -277,7 +286,8 @@ public class ProofTreeController {
interpreterService.reset();
}
interpreterService.interpreterProperty().set(currentInterpreter);
interpreterService.mainScriptProperty().set(mainScript);
interpreterService.mainScriptProperty().set(mainScript.get());
interpreterService.start();
interpreterService.setOnSucceeded(event -> {
statusBar.setText("Executed script until end of script.");
......@@ -298,6 +308,7 @@ public class ProofTreeController {
private void buildControlFlowGraph(ProofScript mainScript) {
this.controlFlowGraphVisitor = new ControlFlowVisitor(currentInterpreter.getFunctionLookup());
mainScript.accept(controlFlowGraphVisitor);
this.setMainScript(mainScript);
System.out.println("CFG\n" + controlFlowGraphVisitor.asdot());
}
......@@ -335,10 +346,10 @@ public class ProofTreeController {
this.currentInterpreter = currentInterpreter;
}
public void setMainScript(ProofScript mainScript) {
/* public void setMainScript(ProofScript mainScript) {
this.mainScript = mainScript;
}
}*/
public StateGraphWrapper getStateVisitor() {
return this.stateGraphWrapper;
......
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptArea.java
View file @ 9ab25960
......@@ -54,6 +54,7 @@ import java.time.Duration;
import java.util.*;
import java.util.function.Consumer;
import java.util.function.IntFunction;
import java.util.function.UnaryOperator;
/**
* ScriptArea is the {@link CodeArea} for writing Proof Scripts.
......@@ -225,10 +226,42 @@ public class ScriptArea extends CodeArea {
private void highlightNonExecutionArea() {
if (hasExecutionMarker()) {
getStyleSpans(0, getExecutionMarkerPosition()).forEach(span -> {
span.getStyle().add("NON_EXE_AREA");
System.out.println("getExecutionMarkerPosition() = " + getExecutionMarkerPosition());
/* getStyleSpans(0, getExecutionMarkerPosition()).stream()
.map(span -> {
Collection<String> style = span.getStyle();
if (style.isEmpty()) {
Collections.singleton("NON_EXE_AREA");
} else {
style.add("NON_EXE_AREA");
}
return style;
});*/
UnaryOperator<Collection<String>> styleMapper = strings -> {
if (strings.isEmpty()) {
return Collections.singleton("NON_EXE_AREA");
} else {
Collection res = strings;
res.add("NON_EXE_AREA");
return res;
}
};
setStyleSpans(0, getStyleSpans(0, getExecutionMarkerPosition()).mapStyles(styleMapper));
/* getStyleSpans(0, getExecutionMarkerPosition()).forEach(span -> {
Collection<String> style = span.getStyle();
if (style.isEmpty()) {
style.add("NON_EXE_AREA");
//setStyle(0, getExecutionMarkerPosition(), Collections.singleton("NON_EXE_AREA"));
} else {
style.add("NON_EXE_AREA");
}
});
//setStyle(0, getExecutionMarkerPosition(), Collections.singleton("NON_EXE_AREA"));
*/
}
}
......@@ -305,7 +338,7 @@ public class ScriptArea extends CodeArea {
public Collection<? extends Breakpoint> getBreakpoints() {
List<Breakpoint> list = new ArrayList<>();
int line = 0;
int line = 1;
for (GutterAnnotation s : gutter.lineAnnotations) {
if (s.isBreakpoint()) {
Breakpoint b = new Breakpoint(filePath.get(), line);
......
Markdown is supported
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