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
96e41055
Commit
96e41055
authored
Jan 16, 2018
by
Sarah Grebing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed first bug for step into proof tree, still not working properly yet
parent
a027d3f9
Pipeline
#16870
passed with stages
in 10 minutes and 27 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
59 additions
and
23 deletions
+59
-23
rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/dbg/ContinueCommand.java
...kit/iti/formal/psdbg/interpreter/dbg/ContinueCommand.java
+5
-5
rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/dbg/StepOverCommand.java
...kit/iti/formal/psdbg/interpreter/dbg/StepOverCommand.java
+5
-0
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java
...edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java
+36
-18
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ProofTree.java
...java/edu/kit/iti/formal/psdbg/gui/controls/ProofTree.java
+7
-0
ui/src/main/resources/edu/kit/iti/formal/psdbg/examples/contraposition/script.kps
...u/kit/iti/formal/psdbg/examples/contraposition/script.kps
+6
-0
No files found.
rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/dbg/ContinueCommand.java
View file @
96e41055
...
...
@@ -5,6 +5,11 @@ import edu.kit.iti.formal.psdbg.parser.ast.ASTNode;
import
java.util.Arrays
;
import
java.util.function.Supplier
;
/**
* Continue Command if interpreter stopped at a breakpoint
*
* @param <T>
*/
public
class
ContinueCommand
<
T
>
extends
DebuggerCommand
<
T
>
{
@Override
public
void
execute
(
DebuggerFramework
<
T
>
dbg
)
{
...
...
@@ -24,11 +29,6 @@ public class ContinueCommand<T> extends DebuggerCommand<T> {
}
Supplier
<
Integer
>
currenDepth
=
()
->
dbg
.
getStatePointer
().
getContext
().
length
;
//Blocker.BlockPredicate predicate = new Blocker.ParentInContext(ctx);
// Blocker.SmallerContext predicate = new Blocker.SmallerContext(
// currenDepth.get(), currenDepth);
//dbg.releaseUntil(predicate);
dbg
.
release
();
}
else
{
...
...
rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/dbg/StepOverCommand.java
View file @
96e41055
...
...
@@ -5,6 +5,11 @@ import edu.kit.iti.formal.psdbg.parser.ast.ASTNode;
import
java.util.Arrays
;
import
java.util.function.Supplier
;
/**
* Step Over Command, to step Over a proof command
*
* @param <T>
*/
public
class
StepOverCommand
<
T
>
extends
DebuggerCommand
<
T
>
{
@Override
public
void
execute
(
DebuggerFramework
<
T
>
dbg
)
{
...
...
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java
View file @
96e41055
...
...
@@ -65,13 +65,12 @@ import java.io.PrintWriter;
import
java.net.URL
;
import
java.nio.charset.Charset
;
import
java.time.Duration
;
import
java.util.List
;
import
java.util.Optional
;
import
java.util.ResourceBundle
;
import
java.util.Set
;
import
java.util.*
;
import
java.util.concurrent.*
;
import
java.util.stream.Collectors
;
import
org.reactfx.util.Timer
;
/**
* Controller for the Debugger MainWindow
*
...
...
@@ -711,7 +710,11 @@ public class DebuggerMain implements Initializable {
}
/**
* Continue after the interpreter has reached a breakpoint
*
* @param event
*/
@FXML
public
void
continueAfterRun
(
ActionEvent
event
)
{
LOGGER
.
debug
(
"DebuggerMain.continueAfterBreakpoint"
);
...
...
@@ -724,6 +727,10 @@ public class DebuggerMain implements Initializable {
}
}
/**
* Reload a problem from the beginning
* @param event
*/
@FXML
public
void
reloadProblem
(
ActionEvent
event
)
{
//abort current execution();
...
...
@@ -745,9 +752,6 @@ public class DebuggerMain implements Initializable {
iModel
.
getGoals
().
clear
();
iModel
.
setSelectedGoalNodeToShow
(
null
);
// init();
//reload File
try
{
FACADE
.
reload
(
lastLoaded
);
if
(
iModel
.
getGoals
().
size
()
>
0
)
{
...
...
@@ -1111,24 +1115,37 @@ public class DebuggerMain implements Initializable {
Proof
proof
=
beforeNode
.
getData
().
getProof
();
Node
pnode
=
beforeNode
.
getData
().
getNode
();
System
.
out
.
println
(
"pnode.serialNr() = "
+
pnode
.
serialNr
());
stateAfterStmt
.
forEach
(
keyDataGoalNode
->
System
.
out
.
println
(
"keyDataGoalNode.getData().getNode().serialNr() = "
+
keyDataGoalNode
.
getData
().
getNode
().
serialNr
()));
// stateAfterStmt.forEach(keyDataGoalNode -> System.out.println("keyDataGoalNode.getData().getNode().serialNr() = " + keyDataGoalNode.getData().getNode().serialNr()));
ptree
.
setProof
(
proof
);
ptree
.
setRoot
(
pnode
);
ptree
.
setDeactivateRefresh
(
true
);
//TODO Traversierung WICHTIG
//this is always 0 subtreegoals dies not return the subtree
//getSubtreegoals == 0
//traverse tree to closed goals -> set Sentinels
//laeves of PNode wenn aftestmt leer
//sonst nodes nodes afterstmt
Set
<
Node
>
sentinels
=
proof
.
getSubtreeGoals
(
pnode
)
.
stream
()
.
map
(
Goal:
:
node
)
.
collect
(
Collectors
.
toSet
());
System
.
out
.
println
(
"Sentinels: "
+
sentinels
.
isEmpty
());
ptree
.
getSentinels
().
addAll
(
sentinels
);
if
(
stateAfterStmt
.
size
()
>
0
)
{
Set
<
Node
>
sentinels
=
proof
.
getSubtreeGoals
(
pnode
)
.
stream
()
.
map
(
Goal:
:
node
)
.
collect
(
Collectors
.
toSet
());
ptree
.
getSentinels
().
addAll
(
sentinels
);
}
else
{
Set
<
Node
>
sentinels
=
new
HashSet
<>();
Iterator
<
Node
>
nodeIterator
=
beforeNode
.
getData
().
getNode
().
leavesIterator
();
while
(
nodeIterator
.
hasNext
())
{
Node
next
=
nodeIterator
.
next
();
sentinels
.
add
(
next
.
parent
());
}
ptree
.
getSentinels
().
addAll
(
sentinels
);
//traverseProofTreeAndAddSentinelsToLeaves();
}
ptree
.
expandRootToLeaves
();
//TODO set coloring of starting and end node
DockNode
node
=
new
DockNode
(
ptree
,
"Proof Tree for Step Into: "
+
...
...
@@ -1138,6 +1155,7 @@ public class DebuggerMain implements Initializable {
node
.
dock
(
dockStation
,
DockPos
.
CENTER
,
scriptController
.
getOpenScripts
().
get
(
getScriptController
().
getMainScript
().
getScriptArea
()));
}
}
//endregion
}
//deprecated
...
...
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ProofTree.java
View file @
96e41055
...
...
@@ -160,6 +160,13 @@ public class ProofTree extends BorderPane {
}
public
void
expandRootToLeaves
()
{
if
(
getTreeProof
().
getRoot
()
==
null
)
{
if
(
root
.
get
()
!=
null
)
{
TreeItem
<
TreeNode
>
item
=
new
TreeItem
<>(
new
TreeNode
(
root
.
get
().
serialNr
()
+
": "
+
toString
(
root
.
get
()),
root
.
get
()));
treeProof
.
setRoot
(
item
);
}
}
expandRootToLeaves
(
getTreeProof
().
getRoot
());
}
...
...
ui/src/main/resources/edu/kit/iti/formal/psdbg/examples/contraposition/script.kps
View file @
96e41055
// Please select one of the following scripts.
//
script test1234(){
impRight;
auto;
}
script test23(){
impRight;
x:term := find(match `?rt ==>`);
...
...
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