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
ddc82c18
Commit
ddc82c18
authored
Aug 01, 2017
by
Sarah Grebing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
isClosable now implemented
parent
90be741d
Pipeline
#12459
failed with stage
in 1 minute and 41 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
16 deletions
+55
-16
src/main/java/edu/kit/formal/interpreter/Interpreter.java
src/main/java/edu/kit/formal/interpreter/Interpreter.java
+37
-8
src/test/resources/edu/kit/formal/interpreter/javaExample/test.kps
...resources/edu/kit/formal/interpreter/javaExample/test.kps
+3
-8
src/test/resources/edu/kit/formal/interpreter/javaExample/testIsClosable.kps
...edu/kit/formal/interpreter/javaExample/testIsClosable.kps
+15
-0
No files found.
src/main/java/edu/kit/formal/interpreter/Interpreter.java
View file @
ddc82c18
...
...
@@ -5,10 +5,9 @@ import com.google.common.collect.BiMap;
import
com.google.common.collect.ImmutableBiMap
;
import
de.uka.ilkd.key.api.ScriptApi
;
import
de.uka.ilkd.key.api.VariableAssignments
;
import
edu.kit.formal.interpreter.data.GoalNode
;
import
edu.kit.formal.interpreter.data.State
;
import
edu.kit.formal.interpreter.data.Value
;
import
edu.kit.formal.interpreter.data.VariableAssignment
;
import
de.uka.ilkd.key.proof.Goal
;
import
de.uka.ilkd.key.proof.Proof
;
import
edu.kit.formal.interpreter.data.*
;
import
edu.kit.formal.interpreter.exceptions.InterpreterRuntimeException
;
import
edu.kit.formal.interpreter.funchdl.CommandLookup
;
import
edu.kit.formal.proofscriptparser.DefaultASTVisitor
;
...
...
@@ -16,9 +15,12 @@ import edu.kit.formal.proofscriptparser.Visitor;
import
edu.kit.formal.proofscriptparser.ast.*
;
import
lombok.Getter
;
import
lombok.Setter
;
import
org.key_project.util.collection.ImmutableList
;
import
java.util.*
;
import
java.util.logging.Logger
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
/**
* Main Class for interpreter
...
...
@@ -164,6 +166,28 @@ public class Interpreter<T> extends DefaultASTVisitor<Object>
enterScope
(
isClosableCase
);
executeBody
(
isClosableCase
.
getBody
(),
selectedGoalNode
,
new
VariableAssignment
(
selectedGoalNode
.
getAssignments
()));
State
<
T
>
stateafterIsClosable
=
peekState
();
List
<
GoalNode
<
T
>>
goals
=
stateafterIsClosable
.
getGoals
();
boolean
allClosed
=
true
;
for
(
GoalNode
<
T
>
goal
:
goals
)
{
KeyData
data
=
(
KeyData
)
goal
.
getData
();
if
(!
data
.
getNode
().
isClosed
())
{
allClosed
=
false
;
break
;
}
}
if
(!
allClosed
)
{
System
.
out
.
println
(
"IsClosable was not successful, rolling back proof"
);
Proof
currentKeYproof
=
((
KeyData
)
selectedGoalNode
.
getData
()).
getProof
();
ImmutableList
<
Goal
>
subtreeGoals
=
currentKeYproof
.
getSubtreeGoals
(((
KeyData
)
selectedGoalNode
.
getData
()).
getNode
());
//subtreeGoals.forEach(goal -> System.out.println(goal.node().serialNr()));
//System.out.println(subtreeGoals);
currentKeYproof
.
pruneProof
(((
KeyData
)
selectedGoalCopy
.
getData
()).
getNode
());
//ImmutableList<Goal> subtreeGoals1 = currentKeYproof.getSubtreeGoals(((KeyData) selectedGoalNode.getData()).getNode());
//subtreeGoals1.forEach(goal -> System.out.println(goal.node().serialNr()));
popState
();
pushState
(
currentStateToMatchCopy
);
}
//check if state is closed
exitScope
(
isClosableCase
);
return
false
;
...
...
@@ -277,12 +301,17 @@ public class Interpreter<T> extends DefaultASTVisitor<Object>
State
<
T
>
newStateAfterCases
;
if
(!
goalsAfterCases
.
isEmpty
())
{
//goalsAfterCases.forEach(node -> node.exitScope());
if
(
goalsAfterCases
.
size
()
==
1
)
{
Stream
<
GoalNode
<
T
>>
goalNodeStream
=
goalsAfterCases
.
stream
().
filter
(
tGoalNode
->
!((
KeyData
)
tGoalNode
.
getData
()).
getNode
().
isClosed
());
List
<
GoalNode
<
T
>>
openGoalListAfterCases
=
goalNodeStream
.
collect
(
Collectors
.
toList
());
/*if (goalsAfterCases.size() == 1) {
newStateAfterCases = new State<T>(goalsAfterCases, 0);
} else {
//TODO check for closed goals?
newStateAfterCases
=
new
State
<
T
>(
goalsAfterCases
,
null
);
// newStateAfterCases = new State<T>(goalsAfterCases, null);
}*/
if
(
openGoalListAfterCases
.
size
()
==
1
)
{
newStateAfterCases
=
new
State
<
T
>(
openGoalListAfterCases
,
0
);
}
else
{
newStateAfterCases
=
new
State
<
T
>(
openGoalListAfterCases
,
null
);
}
stateStack
.
push
(
newStateAfterCases
);
}
...
...
src/test/resources/edu/kit/formal/interpreter/javaExample/test.kps
View file @
ddc82c18
...
...
@@ -2,15 +2,10 @@
script t1(){
symbex;
cases{
case match
'.*x.*'
:{
a
uto;
case match
isCloseable
:{
a
ndRight; //should not close proof
}
// case match `T >= 0 ==> ` using[ ?T:int]:{
// auto;
// }
default{
auto;
}
}
}
...
...
src/test/resources/edu/kit/formal/interpreter/javaExample/testIsClosable.kps
0 → 100644
View file @
ddc82c18
script t1(){
symbex;
cases{
case match '.*x.*':{
auto;
}
// case match `T >= 0 ==> ` using[ ?T:int]:{
// auto;
// }
default{
auto;
}
}
}
\ No newline at end of file
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