github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#1737] Substitute also multi-sequences

Browse Source
This commit is contained in:
Lukas Eder 2013-05-22 20:15:03 +02:00
parent 778dcf823e
commit 8bf94e16fe
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
jOOQ-tools/src/org/jooq/api/rr/BNFGenerator.java
View File

@ -113,17 +113,17 @@ public class BNFGenerator {
while (true) {
// Some debugging....
String check = "UpdateSetMoreStep";
String check = "WindowPartitionByStep";
Set<Edge> e = edgesTo.get(check);
if (e != null) {
System.out.println();
System.out.println();
System.out.println();
System.out.println(string(e, false));
System.out.println(string(edgesFrom.get(check), false));
System.out.println();
System.out.println();
System.out.println();
System.err.println();
System.err.println();
System.err.println();
System.err.println(string(e, false));
System.err.println(string(edgesFrom.get(check), false));
System.err.println();
System.err.println();
System.err.println();
}
// Alternatives with equal paths are substituted
@ -211,6 +211,7 @@ public class BNFGenerator {
// Sequences are substituted (only if B consumed exactly once)
// A ::= B x; B ::= C y; => A ::= C y x;
// -----------------------------------------------------------------
for (int maxSize : new int[] { 1, Integer.MAX_VALUE })
substitutionLoop:
for (String name : new ArrayList<String>(edgesFrom.keySet())) {
if (terminals.contains(name)) {
@ -221,7 +222,25 @@ public class BNFGenerator {
Edge from = edgesFrom.get(name).iterator().next();
Set<Edge> set = edgesTo.get(name);
if (set != null && set.size() == 1) {
if (set != null) {
if (set.size() > maxSize) {
continue substitutionLoop;
}
if (set.size() > 1) {
if (!"".equals(from.expr.toString())) {
continue substitutionLoop;
}
else {
System.out.println();
System.out.println();
System.out.println("Substituting multi-sequence");
System.out.println(string(from));
System.out.println("...");
System.out.println(string(set));
}
}
List<Edge> list = new ArrayList<Edge>(set);
List<Edge> substitutes = new ArrayList<Edge>();