From c623defbae8e9a42e98110a343eb19d8247cbccb Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 9 Sep 2020 15:20:15 +0200
Subject: [PATCH] Fix current trace being null after failing to load a machine
---
src/main/java/de/prob2/jupyter/ProBKernel.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/de/prob2/jupyter/ProBKernel.java b/src/main/java/de/prob2/jupyter/ProBKernel.java
index 9f852d1..9b68164 100644
--- a/src/main/java/de/prob2/jupyter/ProBKernel.java
+++ b/src/main/java/de/prob2/jupyter/ProBKernel.java
@@ -222,6 +222,7 @@ public final class ProBKernel extends BaseKernel {
BSYMB_COMMAND_DEFINITIONS = Collections.unmodifiableMap(map);
}
+ private final @NotNull ClassicalBFactory classicalBFactory;
private final @NotNull AnimationSelector animationSelector;
private final @NotNull ReusableAnimator animator;
@@ -237,6 +238,7 @@ public final class ProBKernel extends BaseKernel {
this.setShouldReplaceStdStreams(false);
+ this.classicalBFactory = classicalBFactory;
this.animationSelector = animationSelector;
this.animator = animator;
@@ -247,10 +249,7 @@ public final class ProBKernel extends BaseKernel {
this.currentEvalThread = new AtomicReference<>(null);
this.variables = new HashMap<>();
- this.switchMachine(Paths.get(""), stateSpace -> {
- classicalBFactory.create("(initial Jupyter machine)", "MACHINE repl END").loadIntoStateSpace(stateSpace);
- return new Trace(stateSpace);
- });
+ this.switchMachine(Paths.get(""), this::loadDefaultMachine);
this.currentMachineDirectory = Paths.get("");
}
@@ -292,6 +291,11 @@ public final class ProBKernel extends BaseKernel {
this.setCurrentMachineDirectory(Paths.get(""));
}
+ private @NotNull Trace loadDefaultMachine(final @NotNull StateSpace stateSpace) {
+ this.classicalBFactory.create("(empty default machine)", "MACHINE repl END").loadIntoStateSpace(stateSpace);
+ return new Trace(stateSpace);
+ }
+
public void switchMachine(final @NotNull Path machineDirectory, final @NotNull Function<@NotNull StateSpace, @NotNull Trace> newTraceCreator) {
this.unloadMachine();
final StateSpace newStateSpace = this.animator.createStateSpace();
@@ -299,6 +303,8 @@ public final class ProBKernel extends BaseKernel {
this.animationSelector.changeCurrentAnimation(newTraceCreator.apply(newStateSpace));
} catch (final RuntimeException e) {
newStateSpace.kill();
+ final StateSpace defaultStateSpace = this.animator.createStateSpace();
+ this.animationSelector.changeCurrentAnimation(this.loadDefaultMachine(defaultStateSpace));
throw e;
}
this.setCurrentMachineDirectory(machineDirectory);
--
GitLab