Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
ProofScriptParser
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
24
Issues
24
List
Boards
Labels
Service Desk
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sarah.grebing
ProofScriptParser
Commits
02365c55
Commit
02365c55
authored
May 30, 2017
by
Sarah Grebing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Commented statestack modification after cases. Needs to be reimplemented afterwards
parent
359117a7
Pipeline
#10801
failed with stage
in 1 minute and 16 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
11 deletions
+9
-11
pom.xml
pom.xml
+0
-5
src/main/java/edu/kit/formal/gui/ProofScriptDebugger.java
src/main/java/edu/kit/formal/gui/ProofScriptDebugger.java
+2
-2
src/main/java/edu/kit/formal/gui/controller/DebuggerMainWindowController.java
...t/formal/gui/controller/DebuggerMainWindowController.java
+3
-2
src/main/java/edu/kit/formal/interpreter/Interpreter.java
src/main/java/edu/kit/formal/interpreter/Interpreter.java
+2
-1
src/main/resources/DebuggerMain.fxml
src/main/resources/DebuggerMain.fxml
+2
-1
No files found.
pom.xml
View file @
02365c55
...
...
@@ -115,11 +115,6 @@
<visitor>
true
</visitor>
</configuration>
</plugin>
<plugin>
<groupId>
com.zenjava
</groupId>
<artifactId>
javafx-maven-plugin
</artifactId>
<version>
2.0
</version>
</plugin>
<plugin>
<groupId>
com.zenjava
</groupId>
<artifactId>
javafx-maven-plugin
</artifactId>
...
...
src/main/java/edu/kit/formal/gui/ProofScriptDebugger.java
View file @
02365c55
...
...
@@ -2,7 +2,7 @@ package edu.kit.formal.gui;/**
* Created by sarah on 5/26/17.
*/
import
edu.kit.formal.gui.controller.
Root
Controller
;
import
edu.kit.formal.gui.controller.
DebuggerMainWindow
Controller
;
import
edu.kit.formal.gui.model.RootModel
;
import
javafx.application.Application
;
import
javafx.fxml.FXMLLoader
;
...
...
@@ -26,7 +26,7 @@ public class ProofScriptDebugger extends Application {
Parent
root
=
null
;
try
{
root
=
(
Parent
)
fxmlLoader
.
load
();
RootController
controller
=
fxmlLoader
.<
Root
Controller
>
getController
();
DebuggerMainWindowController
controller
=
fxmlLoader
.<
DebuggerMainWindow
Controller
>
getController
();
controller
.
setStage
(
primaryStage
);
controller
.
setModel
(
rm
);
controller
.
init
();
...
...
src/main/java/edu/kit/formal/gui/controller/
Root
Controller.java
→
src/main/java/edu/kit/formal/gui/controller/
DebuggerMainWindow
Controller.java
View file @
02365c55
...
...
@@ -22,9 +22,10 @@ import java.util.List;
import
java.util.ResourceBundle
;
/**
* Created by sarah on 5/26/17.
* Controller for the Debugger MainWindow
* @author S.Grebing
*/
public
class
Root
Controller
implements
Initializable
{
public
class
DebuggerMainWindow
Controller
implements
Initializable
{
@FXML
Pane
rootPane
;
...
...
src/main/java/edu/kit/formal/interpreter/Interpreter.java
View file @
02365c55
...
...
@@ -205,7 +205,8 @@ public class Interpreter<T> extends DefaultASTVisitor<Void>
}
stateStack
.
push
(
newStateAfterCases
);
}
stateStack
.
peek
().
getGoals
().
removeAll
(
beforeCases
.
getGoals
());
//stateStack.peek().getGoals().removeAll(beforeCases.getGoals());
exitScope
(
casesStatement
);
return
null
;
}
...
...
src/main/resources/DebuggerMain.fxml
View file @
02365c55
...
...
@@ -7,7 +7,8 @@
<Pane
xmlns:fx=
"http://javafx.com/fxml/1"
fx:id=
"rootPane"
maxHeight=
"-Infinity"
maxWidth=
"-Infinity"
minHeight=
"-Infinity"
minWidth=
"-Infinity"
prefHeight=
"400.0"
prefWidth=
"600.0"
xmlns=
"http://javafx.com/javafx/8.0.102-ea"
fx:controller=
"edu.kit.formal.gui.controller.RootController"
>
xmlns=
"http://javafx.com/javafx/8.0.102-ea"
fx:controller=
"edu.kit.formal.gui.controller.DebuggerMainWindowController"
>
<children>
<SplitPane
fx:id=
"splitPane"
dividerPositions=
"0.5"
layoutY=
"29.0"
prefHeight=
"371.0"
prefWidth=
"600.0"
>
<items>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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