Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
sarah.grebing
ProofScriptParser
Commits
bd990c81
Commit
bd990c81
authored
Jan 16, 2018
by
Alexander Weigl
Browse files
fixes for interactive mode
parent
c09d5c41
Pipeline
#16892
failed with stages
in 85 minutes and 33 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/Interpreter.java
View file @
bd990c81
...
...
@@ -80,7 +80,7 @@ public class Interpreter<T> extends DefaultASTVisitor<Object>
* starting point is a statement list
*/
public
void
interpret
(
ProofScript
script
)
{
enterScope
(
script
);
//
enterScope(script);
if
(
stateStack
.
empty
())
{
throw
new
InterpreterRuntimeException
(
"no state on stack. call newState before interpret"
);
}
...
...
@@ -92,7 +92,7 @@ public class Interpreter<T> extends DefaultASTVisitor<Object>
getSelectedNode
().
getAssignments
().
push
(
va
));
}
script
.
accept
(
this
);
exitScope
(
script
);
//
exitScope(script);
}
/**
...
...
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/InteractiveModeController.java
View file @
bd990c81
...
...
@@ -43,11 +43,8 @@ public class InteractiveModeController {
private
static
final
Logger
LOGGER
=
LogManager
.
getLogger
(
InteractiveModeController
.
class
);
private
final
Map
<
Node
,
Statements
>
cases
=
new
HashMap
<>();
private
BooleanProperty
activated
=
new
SimpleBooleanProperty
();
private
final
ScriptController
scriptController
;
private
BooleanProperty
activated
=
new
SimpleBooleanProperty
();
private
ScriptArea
scriptArea
;
private
InspectionModel
model
;
...
...
@@ -157,10 +154,13 @@ public class InteractiveModeController {
ImmutableList
<
Goal
>
ngoals
=
g
.
proof
().
getSubtreeGoals
(
g
.
node
());
goals
.
remove
(
expandedNode
);
GoalNode
<
KeyData
>
last
=
null
;
for
(
Goal
newGoalNode
:
ngoals
)
{
KeyData
kdn
=
new
KeyData
(
kd
,
newGoalNode
.
node
());
goals
.
add
(
new
GoalNode
<>(
expandedNode
,
kdn
,
kdn
.
getNode
().
isClosed
()));
goals
.
add
(
last
=
new
GoalNode
<>(
expandedNode
,
kdn
,
kdn
.
getNode
().
isClosed
()));
}
if
(
last
!=
null
)
model
.
setSelectedGoalNodeToShow
(
last
);
}
catch
(
Exception
e
)
{
if
(
e
.
getClass
().
equals
(
ScriptException
.
class
))
{
System
.
out
.
println
(
"e.getMessage() = "
+
e
.
getMessage
());
...
...
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptArea.java
View file @
bd990c81
...
...
@@ -142,12 +142,13 @@ public class ScriptArea extends BorderPane {
codeArea
.
setMinSize
(
scrollPane
.
getWidth
(),
scrollPane
.
getHeight
());
});
/*
scrollPane.estimatedScrollYProperty().addListener(new ChangeListener<Double>() {
@Override
public void changed(ObservableValue<? extends Double> observable, Double oldValue, Double newValue) {
System.out.println("SCROLL:" + newValue);
}
});
});
*/
codeArea
.
setWrapText
(
true
);
gutter
=
new
GutterFactory
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment