diff --git a/build.gradle b/build.gradle index 2f74a3d1298007cfb5a2179ae7650f210a1b6dd5..c4690f1108de5df195e24770a33937fe03293953 100644 --- a/build.gradle +++ b/build.gradle @@ -6,14 +6,14 @@ apply plugin: 'signing' allprojects { project.group = 'de.hhu.stups' - project.version = '3.3.2' + project.version = '3.3.3' project.ext.isSnapshot = project.version.endsWith("-SNAPSHOT") ext."signing.secretKeyRingFile" = rootProject.file("secring.gpg").absolutePath } wrapper { - gradleVersion = "7.2" + gradleVersion = "7.4.1" } repositories { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a254e91df704a9acc0f2745c0e340d9b582..00e33edef6936b1ada8721cff42201db8c9d8675 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/resources/org/sablecc/sablecc/lexer.txt b/src/main/resources/org/sablecc/sablecc/lexer.txt index d07293f5b6bef573827fa558423aa3e679ce68bc..776e506a9709555c720fe4951860e05608c8e95b 100644 --- a/src/main/resources/org/sablecc/sablecc/lexer.txt +++ b/src/main/resources/org/sablecc/sablecc/lexer.txt @@ -127,8 +127,8 @@ public class Lexer implements ITokenListContainer int accept_pos = -1; int accept_line = -1; - int[][][] gotoTable = Lexer.gotoTable[this.state.id()]; - int[] accept = Lexer.accept[this.state.id()]; + int[][][] gotoTable = Lexer.gotoTable[this.state.id()]; + int[] accept = Lexer.accept[this.state.id()]; this.text.setLength(0); while(true) @@ -175,6 +175,8 @@ public class Lexer implements ITokenListContainer int low = 0; int high = tmp1.length - 1; + // find next DFA state depending on character c + // an entry {Low, Up, Id} -> means if Low <= c <= Up -> goto state Id while(low <= high) { int middle = (low + high) / 2; @@ -194,7 +196,7 @@ public class Lexer implements ITokenListContainer break; } } - }while(dfa_state < -1); + } while(dfa_state < -1); } else { diff --git a/src/main/resources/org/sablecc/sablecc/parser.txt b/src/main/resources/org/sablecc/sablecc/parser.txt index 7c9c93174b04be3bac4f52ffd14863341129ec7d..8d1dc232c77fce1985f3083ea3ad094acbfa4032 100644 --- a/src/main/resources/org/sablecc/sablecc/parser.txt +++ b/src/main/resources/org/sablecc/sablecc/parser.txt @@ -24,8 +24,6 @@ import java.io.IOException; @SuppressWarnings({"rawtypes","unchecked","unused"}) public class Parser implements IParser { - public final Analysis ignoredTokens = new AnalysisAdapter(); - protected ArrayList nodeList; private final Lexer lexer; @@ -289,23 +287,12 @@ Macro:ParserCommon this.getMapping().clear(); push(0, null$0$); - List<Node> ign = null; while(true) { while(index(this.lexer.peek()) == -1) { - if(ign == null) - { - ign = new LinkedList<Node>(); - } - - ign.add(this.lexer.next()); - } - - if(ign != null) - { - this.ignoredTokens.setIn(this.lexer.peek(), ign); - ign = null; + // this is an ignored token + this.lexer.next(); } this.last_pos = this.lexer.peek().getPos();