Commit 553a1d6a authored by Sarah Grebing's avatar Sarah Grebing

sysoiuts

parent 7fe433e3
......@@ -72,6 +72,7 @@ public class MatcherFacade {
public static Matchings matches(String pattern, Sequent sequent, boolean catchAll) {
MatchPatternParser mpp = getParser(pattern);
MatchPatternParser.SequentPatternContext ctx = mpp.sequentPattern();
logger.error("Matching \n" + pattern + "\n" + sequent.toString());
if (mpp.getNumberOfSyntaxErrors() != 0) {
logger.info("Invalid pattern syntax '{}' no matches returned.", pattern);
return new Matchings();
......@@ -92,6 +93,6 @@ public class MatcherFacade {
* @return
*/
public static Matchings matches(String pattern, Sequent sequent) {
return matches(pattern, sequent, false);
return matches(pattern, sequent, true);
}
}
......@@ -168,6 +168,7 @@ public class MatchEvaluator extends DefaultASTVisitor<List<VariableAssignment>>
//TODO extract the results form the matcher in order to retrieve the selection results
} else if (TypeFacade.isTerm(pattern.getType())) {
va = getMatcher().matchSeq(goal, (String) pattern.getData(), sig);
System.out.println("va = " + va);
}
return va != null ? va : Collections.emptyList();
}
......
......@@ -6,9 +6,9 @@ script prove_transitive(){
//simp_heap;
}
cases{
// case match `seqPerm(?Res0Copy, ?Arr) ==>`:
// case match `seqPerm(?Res0Copy, ?Arr), seqPerm(?R, ?Res0Copy) ==>`:
case match `seqPerm(?Res0Copy, ?Arr), seqPerm(?Res0Sort, ?Res0Copy), seqPerm(?Res1Copy0, ?Res0Sort),seqPerm(?Res2Copy1, ?Res0Sort) ==> seqPerm(?Res2Copy1, ?Arr)`:
//case match `seqPerm(?Res0Copy, ?Arr), seqPerm(?Res0Sort, ?Res0Copy), seqPerm(?Res1Copy0, ?Res0Sort),seqPerm(?Res2Copy1, ?Res0Sort) ==> seqPerm(?Res2Copy1, ?Arr)`:
// SeqPermSym on=`seqPerm(?Res0Copy, ?Arr) ==>`;
// SeqPermSym on=`seqPerm(?Res0Sort, ?Res0Copy) ==>`;
// SeqPermSym on=`seqPerm(?Res1Copy0, ?Res0Sort)==>`;
......
......@@ -34,8 +34,8 @@
-fx-background-color: @basenavy;
-fx-font-family: "Inconsolata", monospace;
//-fx-font-family: "Fira Code Medium", monospace;
//-fx-font-size: 12pt;
-fx-font-size: 18pt;
-fx-font-size: 12pt;
//-fx-font-size: 18pt;
-fx-fill: @base00;
.lineno {
......@@ -131,8 +131,8 @@
.breakpoint-menu {
-fx-skin: "com.sun.javafx.scene.control.skin.ContextMenuSkin";
-fx-font-family: sans-serif;
//was 9
-fx-font-size: 14pt;
//was 14
-fx-font-size: 9pt;
}
......@@ -140,8 +140,8 @@
-fx-background-color: @basenavy;
// -fx-background-color: @base3;
-fx-font-family: "Inconsolata", monospace;
//-fx-font-size: 12pt;
-fx-font-size: 18pt;
-fx-font-size: 12pt;
//-fx-font-size: 18pt;
-fx-fill: @base01;
......@@ -236,8 +236,8 @@
}
.sequent-view {
//-fx-font-size: 14pt;
-fx-font-size: 18pt;
-fx-font-size: 14pt;
//-fx-font-size: 18pt;
-fx-background-color: @basenavy;
-fx-fill: black;
......@@ -248,8 +248,8 @@
}
.closed-sequent-view {
-fx-font-size: 18pt;
//-fx-font-size: 14pt;
//-fx-font-size: 18pt;
-fx-font-size: 14pt;
-fx-background-color: @green;
.sequent-highlight {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment