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
fc3786e4
Commit
fc3786e4
authored
Sep 13, 2017
by
Sarah Grebing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Equivalence in patterns
parent
ef0a0b92
Pipeline
#13607
failed with stage
in 2 minutes and 20 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
9 deletions
+21
-9
matcher/src/main/antlr4/edu/kit/formal/psdb/termmatcher/MatchPattern.g4
...in/antlr4/edu/kit/formal/psdb/termmatcher/MatchPattern.g4
+2
-3
matcher/src/main/java/edu/kit/iti/formal/psdbg/termmatcher/MatchPatternDualVisitor.java
...iti/formal/psdbg/termmatcher/MatchPatternDualVisitor.java
+8
-0
matcher/src/main/java/edu/kit/iti/formal/psdbg/termmatcher/MatcherImpl.java
...ava/edu/kit/iti/formal/psdbg/termmatcher/MatcherImpl.java
+6
-2
rt-key/src/test/resources/edu/kit/iti/formal/psdbg/interpreter/contraposition/cutTest.kps
...t/iti/formal/psdbg/interpreter/contraposition/cutTest.kps
+5
-4
No files found.
matcher/src/main/antlr4/edu/kit/formal/psdb/termmatcher/MatchPattern.g4
View file @
fc3786e4
...
...
@@ -26,13 +26,12 @@ termPattern :
| <assoc=right> termPattern op=(DIV|MOD) termPattern #divMod
| termPattern op=(PLUS|MINUS) termPattern #plusMinus
| termPattern op=(LE|GE|LEQ|GEQ) termPattern #comparison
| termPattern op=(NEQ|EQ) termPattern #equality
| termPattern op=(NEQ|EQ) termPattern
#equality
| termPattern AND termPattern #and
| termPattern OR termPattern #or
| termPattern IMP termPattern #impl
| termPattern XOR termPattern #xor
// | termPattern EQUIV termPattern #equivalence
//| termPattern EQUIV termPattern already covered by EQ/NEQ
| termPattern EQUIV termPattern #equivalence
| MINUS termPattern #exprNegate
| NOT termPattern #exprNot
| '(' termPattern ')' bindClause? #exprParen
...
...
matcher/src/main/java/edu/kit/iti/formal/psdbg/termmatcher/MatchPatternDualVisitor.java
View file @
fc3786e4
...
...
@@ -85,6 +85,7 @@ public abstract class MatchPatternDualVisitor<T, S> extends MatchPatternBaseVisi
return
visitPlusMinus
(
ctx
,
stack
.
peek
());
}
protected
abstract
T
visitPlusMinus
(
MatchPatternParser
.
PlusMinusContext
ctx
,
S
peek
);
@Override
...
...
@@ -164,6 +165,13 @@ public abstract class MatchPatternDualVisitor<T, S> extends MatchPatternBaseVisi
}
protected
abstract
T
visitEquality
(
MatchPatternParser
.
EqualityContext
ctx
,
S
peek
);
@Override
public
T
visitEquivalence
(
MatchPatternParser
.
EquivalenceContext
ctx
)
{
return
visitEquivalence
(
ctx
,
stack
.
peek
());
}
protected
abstract
T
visitEquivalence
(
MatchPatternParser
.
EquivalenceContext
ctx
,
S
peek
);
}
...
...
matcher/src/main/java/edu/kit/iti/formal/psdbg/termmatcher/MatcherImpl.java
View file @
fc3786e4
...
...
@@ -7,6 +7,7 @@ import de.uka.ilkd.key.logic.Term;
import
edu.kit.formal.psdb.termmatcher.MatchPatternLexer
;
import
edu.kit.formal.psdb.termmatcher.MatchPatternParser
;
import
edu.kit.iti.formal.psdbg.termmatcher.mp.MatchPath
;
import
static
edu
.
kit
.
iti
.
formal
.
psdbg
.
termmatcher
.
mp
.
MatchPathFacade
.*;
import
lombok.Getter
;
import
lombok.Setter
;
import
org.antlr.v4.runtime.CommonToken
;
...
...
@@ -17,8 +18,6 @@ import java.util.stream.Collectors;
import
java.util.stream.IntStream
;
import
java.util.stream.Stream
;
import
static
edu
.
kit
.
iti
.
formal
.
psdbg
.
termmatcher
.
mp
.
MatchPathFacade
.*;
/**
* Matchpattern visitor visits the matchpatterns of case-statements
*
...
...
@@ -520,6 +519,11 @@ class MatcherImpl extends MatchPatternDualVisitor<Matchings, MatchPath> {
return
visitBinaryOperation
(
"equals"
,
ctx
.
termPattern
(
0
),
ctx
.
termPattern
(
1
),
peek
);
}
@Override
protected
Matchings
visitEquivalence
(
MatchPatternParser
.
EquivalenceContext
ctx
,
MatchPath
peek
)
{
return
visitBinaryOperation
(
"equiv"
,
ctx
.
termPattern
(
0
),
ctx
.
termPattern
(
1
),
peek
);
}
private
Stream
<
MatchPath
.
MPTerm
>
subTerms
(
MatchPath
.
MPTerm
peek
)
{
ArrayList
<
MatchPath
.
MPTerm
>
list
=
new
ArrayList
<>();
subTerms
(
list
,
peek
);
...
...
rt-key/src/test/resources/edu/kit/iti/formal/psdbg/interpreter/contraposition/cutTest.kps
View file @
fc3786e4
script cutTest(){
cases{
cut `p <->q`;
//cases{
//X:TERM :=`p`;
case match `==>?X -> ?Y`:
cut `?X`[?X \ Y];
//
case match `==>?X -> ?Y`:
//
cut `?X`[?X \ Y];
}
//
}
}
\ 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