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
d8831558
Commit
d8831558
authored
Aug 22, 2017
by
Sarah Grebing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tests
parent
f2a2af9b
Pipeline
#13008
failed with stage
in 4 minutes and 52 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
22 deletions
+31
-22
src/main/java/edu/kit/formal/psdb/termmatcher/MatcherImpl.java
...ain/java/edu/kit/formal/psdb/termmatcher/MatcherImpl.java
+27
-22
src/test/java/edu/kit/formal/psdb/termmatcher/MatcherFacadeTest.java
...va/edu/kit/formal/psdb/termmatcher/MatcherFacadeTest.java
+2
-0
src/test/resources/edu/kit/formal/psdb/termmatcher/test.key
src/test/resources/edu/kit/formal/psdb/termmatcher/test.key
+2
-0
No files found.
src/main/java/edu/kit/formal/psdb/termmatcher/MatcherImpl.java
View file @
d8831558
...
...
@@ -181,26 +181,14 @@ class MatcherImpl extends MatchPatternDualVisitor<Matchings, Term> {
return
NO_MATCH
;
}
@Override
protected
Matchings
visitNumber
(
MatchPatternParser
.
NumberContext
ctx
,
Term
peek
)
{
//we are at a natural number
if
(
peek
.
op
().
name
().
toString
().
equals
(
"Z"
))
{
ImmutableArray
<
Term
>
subs
=
peek
.
subs
();
int
transformedString
=
transformToNumber
(
peek
.
sub
(
0
));
if
(
Integer
.
parseUnsignedInt
(
ctx
.
DIGITS
().
getText
())
==
transformedString
)
{
return
EMPTY_MATCH
;
}
else
{
return
NO_MATCH
;
}
}
else
{
return
NO_MATCH
;
}
}
private
int
transformToNumber
(
Term
sub
)
{
List
<
Integer
>
integ
=
transformHelper
(
new
ArrayList
<>(),
sub
);
/**
* Trasnform a term taht represent a number to int
*
* @param sub
* @return
*/
public
static
int
transformToNumber
(
Term
sub
)
{
List
<
Integer
>
integ
=
MatcherImpl
.
transformHelper
(
new
ArrayList
<>(),
sub
);
int
dec
=
10
;
int
output
=
integ
.
get
(
0
);
...
...
@@ -212,10 +200,9 @@ class MatcherImpl extends MatchPatternDualVisitor<Matchings, Term> {
return
output
;
}
private
List
<
Integer
>
transformHelper
(
List
<
Integer
>
l
,
Term
sub
)
{
private
static
List
<
Integer
>
transformHelper
(
List
<
Integer
>
l
,
Term
sub
)
{
if
(
sub
.
op
().
name
().
toString
().
equals
(
"#"
))
{
return
l
;
}
else
{
...
...
@@ -224,6 +211,24 @@ class MatcherImpl extends MatchPatternDualVisitor<Matchings, Term> {
}
}
@Override
protected
Matchings
visitNumber
(
MatchPatternParser
.
NumberContext
ctx
,
Term
peek
)
{
//we are at a number
if
(
peek
.
op
().
name
().
toString
().
equals
(
"Z"
))
{
ImmutableArray
<
Term
>
subs
=
peek
.
subs
();
int
transformedString
=
transformToNumber
(
peek
.
sub
(
0
));
if
(
Integer
.
parseUnsignedInt
(
ctx
.
DIGITS
().
getText
())
==
transformedString
)
{
return
EMPTY_MATCH
;
}
else
{
return
NO_MATCH
;
}
}
else
{
return
NO_MATCH
;
}
}
/**
* Visit a sequent pattern 'f(x) ==> f(x)', 'f(x) ==>' or '==> f(x)'
*
...
...
src/test/java/edu/kit/formal/psdb/termmatcher/MatcherFacadeTest.java
View file @
d8831558
...
...
@@ -169,6 +169,8 @@ public class MatcherFacadeTest {
//these two need to be checked I think
shouldMatchSeq
(
"pred(a) ==> pred(a), pred(b)"
,
"_ ==> _"
,
"[{EMPTY_MATCH=null}, {EMPTY_MATCH=null}]"
);
shouldMatchSeq
(
"pred(a) ==> pred(a), pred(b)"
,
" ==> _"
,
"[{EMPTY_MATCH=null}, {EMPTY_MATCH=null}]"
);
// shouldMatchSeq("fint2(1,2), fint2(2,3), !p ==> pred(a), p", "fint2(1, ?X), fint2(?X, ?Y) ==> p" , "[{?X=2, ?Y=3}]");
shouldMatchSeq
(
"fint2(1,2), fint2(2,3), !p ==> pred(a), p"
,
"fint2(1, ?X), fint2(?X, ?Y) ==> p"
);
}
...
...
src/test/resources/edu/kit/formal/psdb/termmatcher/test.key
View file @
d8831558
...
...
@@ -24,6 +24,7 @@
S h(S, S);
int fint(int);
}
\predicates {
...
...
@@ -32,6 +33,7 @@
pred(S);
qpred(S, S);
intPred(int);
fint2(int, int);
}
\problem {
...
...
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