Merge branch 'release/3.2.14'

.editorconfig

+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+insert_final_newline = true

.gitignore

+# Gradle
+.gradle/
 build/
-ParserAspects/
-bin/
+
+# Eclipse
 .classpath
 .project
-.settings/org.eclipse.jdt.core.prefs
-.gradle/
-logs/
-*.swp
-*.log
-*~
-! .gitkeep
-.DS_Store
-tmp/
-PROB_LOGFILE_IS_UNDEFINED
-.settings/org.eclipse.jdt.ui.prefs
-src/main/resources/build.properties
-config.groovy
-local.*
-Version.java
+.settings
+/bin/

.gitlab-ci.yml

+image: openjdk:8-jdk-slim
+
+stages:
+  - test
+  - deploy
+
+variables:
+  GRADLE_OPTIONS: --no-daemon --info --stacktrace --warning-mode=all
+
+cache:
+  paths:
+    - .gradle/wrapper
+    - .gradle/caches
+
+before_script:
+  - export GRADLE_USER_HOME=`pwd`/.gradle
+
+tests:
+  stage: test
+  script: ./gradlew ${GRADLE_OPTIONS} check
+
+tests:jdk-11:
+  extends: tests
+  image: openjdk:11-jdk-slim
+
+tests:jdk-14:
+  extends: tests
+  image: openjdk:14-jdk-slim
+
+publish:
+  stage: deploy
+  script:
+    - openssl aes-256-cbc -pass "env:ENCRYPTION_PASSWORD" -d -a -md md5 -in secring.gpg.enc -out secring.gpg
+    - openssl aes-256-cbc -pass "env:ENCRYPTION_PASSWORD" -d -a -md md5 -in pubring.gpg.enc -out pubring.gpg
+    - openssl aes-256-cbc -pass "env:ENCRYPTION_PASSWORD" -d -a -md md5 -in gradle.properties.enc -out gradle.properties
+    - ./gradlew ${GRADLE_OPTIONS} publish
+  only:
+    - master@general/stups/sablecc-stups
+    - develop@general/stups/sablecc-stups

.travis.yml

-language: java
-
-before_install:
-- openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in secring.gpg.enc -out secring.gpg -d
-- openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in pubring.gpg.enc -out pubring.gpg -d
-- openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in gradle.properties.enc -out gradle.properties -d
-
-script: gradle uploadArchives
-
-env:
-  global:
-    secure: kFKnWpX4wkRGZ6gdP5Y7Nl/Gd5EZYYuJfv8qU2wfullMfLxeB/N1ANhUVqS+pP9oTbA52SHy7gzHTKxk4aeYBgPoiVx4RwRFV1wPYzv9SENNGsHrDdtSNRGM0OBpDkem6rX+OZ5FJ2GRCtX5ba3frclo11HUiAsYvAtoX8sk6lU=

README.md

@@ -27,8 +27,8 @@ This derived work is, like SableCC, covered by the GNU Lesser General Public Lic
 Building
 ---
 
-* Clone the repository
-* Run the deploy target using gradle. If you don't have gradle installed, you can use the gradlew wrapper scripts, e.g., under Linux use './gradlew deploy'
+* Clone the repository.
+* Run the `assemble` target using Gradle (`./gradlew assemble` on Linux/macOS/etc., `gradlew.bat assemble` on Windows).
 * The binary is located in the build/libs subdirectory.
 
 Documentation

build.gradle

+apply plugin: 'application'
 apply plugin: 'java'
 apply plugin: 'eclipse'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
 
-project.version = '3.2.13'
+project.version = '3.2.14'
 project.group = 'de.hhu.stups'
-project.archivesBaseName = "sablecc"
 
-allprojects {
-    sourceCompatibility = 1.5
-    targetCompatibility = 1.5
+wrapper {
+  gradleVersion = "6.3"
+  distributionType = Wrapper.DistributionType.ALL
 }
 
-dependencies {
- testCompile 'junit:junit:4.8.2'
-}
+final isSnapshot = project.version.endsWith("-SNAPSHOT")
 
+sourceCompatibility = 7
+targetCompatibility = 7
 
-task javadocJar(type: Jar) {
-    classifier = 'javadoc'
-    from javadoc
-}
-
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
+repositories {
+  jcenter()
 }
 
-jar {
-	manifest {
-		attributes 'Main-Class': 'org.sablecc.sablecc.SableCC'
-	}
-}
+mainClassName = "org.sablecc.sablecc.SableCC"
 
-artifacts {
-    archives javadocJar, sourcesJar
+java {
+  withSourcesJar()
+  withJavadocJar()
 }
 
-task writeVersion() {
-
-  doFirst {
-  def buildconstants_class = """
-  package org.sablecc.sablecc;
-
-  public class Version
-  {
-    public static final String VERSION = "${project.version}";
-  }
-  """
-  File f = file("src/main/java/org/sablecc/sablecc/Version.java")
-  f.delete()
-  f <<  buildconstants_class
+processResources {
+  inputs.property("project.version", project.version)
+  filesMatching("org/sablecc/sablecc/build.properties") {
+    expand(version: project.version)
   }
 }
 
-compileJava {
-  dependsOn = ['writeVersion']
-}
-
-task deploy(dependsOn: [jar,test,javadoc], group: 'Build')
-
-if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
-
-apply plugin: 'signing'
-
-signing {
-    sign configurations.archives
+jar {
+  manifest {
+    attributes 'Main-Class': mainClassName
   }
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-      repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-        authentication(userName: ossrhUsername, password: ossrhPassword)
 }
 
-      snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-        authentication(userName: ossrhUsername, password: ossrhPassword)
-      }
+publishing {
+  publications {
+    mavenJava(MavenPublication) {
+      from components.java
 
-      pom.project {
-        name 'SableCC - Stups fork'
-        packaging 'jar'
-        // optionally artifactId can be defined here
-        description 'This version of SableCC enriches the abstract syntax tree with information about tokens.'
-        url 'https://github.com/bendisposto/sablecc-stups'
+      pom {
+        name = 'SableCC - Stups fork'
+        description = 'This version of SableCC enriches the abstract syntax tree with information about tokens.'
+        url = 'https://gitlab.cs.uni-duesseldorf.de/general/stups/sablecc-stups'
 
         licenses {
           license {
-            name 'GNU Lesser General Public License, Version 2.1'
-            url 'http://www.gnu.org/licenses/lgpl-2.1.html'
+            name = 'GNU Lesser General Public License, Version 2.1'
+            url = 'http://www.gnu.org/licenses/lgpl-2.1.html'
           }
         }
 
         scm {
-          connection 'scm:git:git://github.com/bendisposto/sablecc-stups.git'
-          developerConnection 'scm:git:git@github.com:bendisposto/sablecc-stups.git'
-          url 'https://github.com/bendisposto/sablecc-stups'
+          connection = 'scm:git:https://gitlab.cs.uni-duesseldorf.de/general/stups/sablecc-stups.git'
+          developerConnection = 'scm:git:git@gitlab.cs.uni-duesseldorf.de:general/stups/sablecc-stups.git'
+          url = 'https://gitlab.cs.uni-duesseldorf.de/general/stups/sablecc-stups'
         }
 
-
         developers {
           developer {
-            id 'bendisposto'
-            name 'Jens Bendisposto'
-            email 'jens@bendisposto.de'
+            id = 'bendisposto'
+            name = 'Jens Bendisposto'
+            email = 'jens@bendisposto.de'
           }
         }
       }
     }
   }
+
+  repositories {
+    maven {
+      final releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
+      final snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots"
+      url isSnapshot ? snapshotsRepoUrl : releasesRepoUrl
+      if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
+        credentials {
+          username project.ossrhUsername
+          password project.ossrhPassword
+        }
+      }
     }
   }
+}
+
+signing {
+  sign publishing.publications.mavenJava
+}

gradle.properties.enc

-Salted__LnX$o HJ1zVI2(,IA};p^E{q m1Vb7P4Moj^(]lpߝ[|USղD02BOz;+1e#/3`wWO-6TR+InxB/lG>SNj&G!iSy+#4Xf}ꏥ1E*+sS
\ No newline at end of file
+U2FsdGVkX1+772WWsEs8y4Z+vdhQLZyW24cH/04lX8CxgZ4JycDLZWPBAc70ZGyT
+w1lgwUF18NmTGDpjwyDkUQmXdYUHYRGUCLTeNays57gOaxEVQQz0zm0kKAISdnNW
+9IgD8BI/lbftz7Y8dqxMUBxfcUTijzJfXz+uEK53jwBoxKYVznzzCCfwEv+1KMR9
+oypMpm9HRBMEZyDkPRPJ2DKOFhW6YCdcszCjTNKmeJkOwVjfyltC43WXzcrzYKR/
+S2pGjR+7mcBg9zq0yMI+1DgMWwmrAaLP9pKnyDqDgXK1yJIKKE80C4NkJN6XVhHc
+qjWQ8xnLXRorA7j0lkWAhw==

gradle/wrapper/gradle-wrapper.properties

-#Wed Jun 08 11:31:31 CEST 2011
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://repo.gradle.org/gradle/distributions/gradle-1.0-milestone-3-bin.zip

gradlew

+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

gradlew.bat

+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle

+rootProject.name = "sablecc"

src/main/java/org/sablecc/sablecc/Version.java

+
+package org.sablecc.sablecc;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
+import java.util.Properties;
+
+public class Version
+{
+  public static final String VERSION;
+  static
+  {
+    final Properties buildProperties = new Properties();
+    final InputStream is = Version.class.getResourceAsStream("build.properties");
+    if(is == null)
+    {
+      throw new IllegalStateException("Build properties not found, this should never happen!");
+    }
+    else
+    {
+      try(final Reader r = new InputStreamReader(is, StandardCharsets.UTF_8))
+      {
+        buildProperties.load(r);
+      }
+      catch(final IOException e)
+      {
+        throw new IllegalStateException("IOException while loading build properties, this should never happen!", e);
+      }
+    }
+    VERSION = buildProperties.getProperty("version");
+  }
+}

src/main/resources/org/sablecc/sablecc/build.properties

+# The values for these properties are generated during the build.
+# See the configuration of the processResources task in build.gradle.
+version=${version}

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

@@ -39,8 +39,8 @@ public class Lexer implements ITokenListContainer
     protected State state = State.$2$;
 
     private PushbackReader in;
-    private int line;
-    private int pos;
+    protected int line;
+    protected int pos;
     private boolean cr;
     private boolean eof;
     private final StringBuffer text = new StringBuffer();

src/main/resources/patchfiles/IParser.txt

-/** 
+/*
  * (c) 2009 Lehrstuhl fuer Softwaretechnik und Programmiersprachen, 
  * Heinrich Heine Universitaet Duesseldorf
  * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) 

src/main/resources/patchfiles/IToken.txt

-/** 
+/*
  * (c) 2009 Lehrstuhl fuer Softwaretechnik und Programmiersprachen, 
  * Heinrich Heine Universitaet Duesseldorf
  * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) 

src/main/resources/patchfiles/ITokenListContainer.txt

-/** 
+/*
  * (c) 2009 Lehrstuhl fuer Softwaretechnik und Programmiersprachen, 
  * Heinrich Heine Universitaet Duesseldorf
  * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)