Merge branch 'develop'

Signed-off-by: Michael Leuschel <leuschel@uni-duesseldorf.de>

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 {

gradle/wrapper/gradle-wrapper.properties

 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

src/main/resources/org/sablecc/sablecc/lexer.txt

@@ -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;

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();