Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
ProofScriptParser
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
24
Issues
24
List
Boards
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sarah.grebing
ProofScriptParser
Commits
47be55f7
Commit
47be55f7
authored
Jan 22, 2019
by
Lulu Luong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix of script Tree (java simple) + System in
parent
b7c7dac6
Pipeline
#38188
passed with stages
in 2 minutes and 19 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
8 deletions
+34
-8
rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/funchdl/RuleCommandHandler.java
.../formal/psdbg/interpreter/funchdl/RuleCommandHandler.java
+3
-1
ui/build.gradle
ui/build.gradle
+2
-1
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptTree/ScriptTreeNode.java
.../formal/psdbg/gui/controls/ScriptTree/ScriptTreeNode.java
+15
-6
ui/src/main/resources/edu/kit/iti/formal/psdbg/examples/java/simple/script.kps
.../edu/kit/iti/formal/psdbg/examples/java/simple/script.kps
+14
-0
No files found.
rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/funchdl/RuleCommandHandler.java
View file @
47be55f7
...
...
@@ -149,6 +149,8 @@ public class RuleCommandHandler implements CommandHandler<KeyData> {
AbstractUserInterfaceControl
uiControl
=
new
DefaultUserInterfaceControl
();
c
.
execute
(
uiControl
,
cc
,
estate
);
//TODO auslagern / finally
ImmutableList
<
Goal
>
ngoals
=
kd
.
getProof
().
getSubtreeGoals
(
kd
.
getNode
());
state
.
getGoals
().
remove
(
expandedNode
);
if
(
state
.
getSelectedGoalNode
().
equals
(
expandedNode
))
{
...
...
@@ -177,7 +179,7 @@ public class RuleCommandHandler implements CommandHandler<KeyData> {
System
.
out
.
flush
();
// User input
try
{
inputindex
=
System
.
in
.
read
(
new
byte
[
System
.
in
.
available
()]
);
inputindex
=
System
.
in
.
read
();
}
catch
(
IOException
ioe
)
{
System
.
out
.
println
(
"No valid input"
);
...
...
ui/build.gradle
View file @
47be55f7
...
...
@@ -41,6 +41,7 @@ dependencies {
def
mainClassName
=
'edu.kit.iti.formal.psdbg.gui.ProofScriptDebugger'
task
runApp
(
type:
JavaExec
)
{
standardInput
=
System
.
in
jvmArgs
<<
'-Dsun.awt.disablegrab=true'
<<
'-Dglass.disableGrab=true'
/*applicationDefaultJvmArgs = [
// For accessing VirtualFlow field from the base class in GridViewSkin
...
...
@@ -72,4 +73,4 @@ task customFatJar(type: Jar) {
from
{
configurations
.
compile
.
collect
{
it
.
isDirectory
()
?
it
:
zipTree
(
it
)
}
}
with
jar
}
customFatJar
.
dependsOn
jar
\ No newline at end of file
customFatJar
.
dependsOn
jar
ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptTree/ScriptTreeNode.java
View file @
47be55f7
...
...
@@ -4,10 +4,7 @@ import de.uka.ilkd.key.proof.Node;
import
edu.kit.iti.formal.psdbg.gui.controls.TreeNode
;
import
edu.kit.iti.formal.psdbg.interpreter.data.KeyData
;
import
edu.kit.iti.formal.psdbg.interpreter.dbg.PTreeNode
;
import
edu.kit.iti.formal.psdbg.parser.ast.CallStatement
;
import
edu.kit.iti.formal.psdbg.parser.ast.GuardedCaseStatement
;
import
edu.kit.iti.formal.psdbg.parser.ast.MatchExpression
;
import
edu.kit.iti.formal.psdbg.parser.ast.TermLiteral
;
import
edu.kit.iti.formal.psdbg.parser.ast.*
;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
import
lombok.Setter
;
...
...
@@ -42,8 +39,20 @@ public class ScriptTreeNode extends AbstractTreeNode {
String
label
;
if
(
isMatchEx
())
{
String
matchexpression
=
(
scriptState
.
getStatement
()
instanceof
GuardedCaseStatement
)?((
TermLiteral
)
((
MatchExpression
)
((
GuardedCaseStatement
)
scriptState
.
getStatement
()).
getGuard
()).
getPattern
()).
getContent
()
:
"default"
;
String
matchexpression
=
""
;
if
(
scriptState
.
getStatement
()
instanceof
GuardedCaseStatement
)
{
MatchExpression
me
=
(
MatchExpression
)
((
GuardedCaseStatement
)
scriptState
.
getStatement
()).
getGuard
();
try
{
matchexpression
=
((
TermLiteral
)
me
.
getPattern
()).
getContent
();
}
catch
(
ClassCastException
cce
)
{
//not a Termliteral but a Stringliteral
matchexpression
=
((
StringLiteral
)
me
.
getPattern
()).
getText
();
}
}
else
{
//default case statement
matchexpression
=
"default"
;
}
label
=
"match ("
+
matchexpression
+
") in line "
+
linenr
;
}
else
{
label
=
((
CallStatement
)
scriptState
.
getStatement
()).
getCommand
()
+
" (line "
+
linenr
+
")"
;
...
...
ui/src/main/resources/edu/kit/iti/formal/psdbg/examples/java/simple/script.kps
View file @
47be55f7
script example(x:INT){
symbex; //Mutator
foreach{ //Kontrollfluss
simp_heap;
}
cases{ //Selektoren
case match '==> ?X>0':
tryclose;
default: auto;
}
}
script t1(){
symbex;
foreach{
...
...
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