diff --git a/build.gradle b/build.gradle
index f758cdc48aa321a633f0fdbc78cbc34d1c432e2d..c845eb69a79c997a8c497df5103fb1d764ba1732 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,16 +6,12 @@ apply plugin: 'signing'
allprojects {
project.group = 'de.hhu.stups'
- project.version = '3.4.0'
+ project.version = '3.4.1-SNAPSHOT'
project.ext.isSnapshot = project.version.endsWith("-SNAPSHOT")
ext."signing.secretKeyRingFile" = rootProject.file("secring.gpg").absolutePath
}
-wrapper {
- gradleVersion = "7.4.1"
-}
-
repositories {
mavenCentral()
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4d4fb3f96a785543079b8df6723c946b..c1962a79e29d3e0ab67b14947c167a862655af9b 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 00e33edef6936b1ada8721cff42201db8c9d8675..37aef8d3f0c9fffa920a8290320a6c78095e1591 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787337ffb79f0e3cf8b1e9f00f680a959de1..aeb74cbb43e3931a2455a838345c3f6b8131aaa2 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
esac
done
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
APP_BASE_NAME=${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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done
fi
+
+# 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"'
+
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f93825db68fb0c0b5150917f340eaa5d02..6689b85beecde676054c39c2408085f41e6be6dc 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 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
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
diff --git a/sablecc-runtime/src/main/java/de/hhu/stups/sablecc/patch/SourcePosition.java b/sablecc-runtime/src/main/java/de/hhu/stups/sablecc/patch/SourcePosition.java
index 2b3451b2d6d91a1c6475f6f96fc9c6cddbdcf40e..a2cb828cd72bbd21ba615a85c309ba9624665b21 100644
--- a/sablecc-runtime/src/main/java/de/hhu/stups/sablecc/patch/SourcePosition.java
+++ b/sablecc-runtime/src/main/java/de/hhu/stups/sablecc/patch/SourcePosition.java
@@ -6,6 +6,8 @@
package de.hhu.stups.sablecc.patch;
+import java.util.Objects;
+
public class SourcePosition implements Comparable<SourcePosition> {
private final int line;
@@ -25,10 +27,32 @@ public class SourcePosition implements Comparable<SourcePosition> {
return pos;
}
+ @Override
+ public boolean equals(final Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || this.getClass() != obj.getClass()) {
+ return false;
+ }
+ final SourcePosition other = (SourcePosition)obj;
+ return this.getLine() == other.getLine() && this.getPos() == other.getPos();
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(this.getLine(), this.getPos());
+ }
+
+ @Override
public int compareTo(SourcePosition that) {
- if (that.line < line) return 1;
- if (that.line > line) return -1;
- return pos-that.pos;
+ if (this.line < that.line) {
+ return -1;
+ } else if (this.line > that.line) {
+ return 1;
+ } else {
+ return Integer.compare(this.pos, that.pos);
+ }
}
@Override
diff --git a/src/main/java/org/sablecc/sablecc/analysis/Analysis.java b/src/main/java/org/sablecc/sablecc/analysis/Analysis.java
index bd6623f34ce80085653286105b10c091fb537cab..999e37aa76d901764bba0d5d048dbe255ea3fadd 100644
--- a/src/main/java/org/sablecc/sablecc/analysis/Analysis.java
+++ b/src/main/java/org/sablecc/sablecc/analysis/Analysis.java
@@ -7,24 +7,32 @@ import org.sablecc.sablecc.node.*;
public interface Analysis extends Switch
{
/**
+ * @param node the node for which to look up the associated object
+ * @return the corresponding object previously associated using {@link #setIn(Node, Object)}, or {@code null} if there is none
* @deprecated If you need a map field, declare it yourself.
*/
@Deprecated
Object getIn(Node node);
/**
+ * @param node the node with which to associate the given object
+ * @param o the object to associate with the node
* @deprecated If you need a map field, declare it yourself.
*/
@Deprecated
void setIn(Node node, Object o);
/**
+ * @param node the node for which to look up the associated object
+ * @return the corresponding object previously associated using {@link #setOut(Node, Object)}, or {@code null} if there is none
* @deprecated If you need a map field, declare it yourself.
*/
@Deprecated
Object getOut(Node node);
/**
+ * @param node the node with which to associate the given object
+ * @param o the object to associate with the node
* @deprecated If you need a map field, declare it yourself.
*/
@Deprecated
diff --git a/src/main/java/org/sablecc/sablecc/analysis/AnalysisAdapter.java b/src/main/java/org/sablecc/sablecc/analysis/AnalysisAdapter.java
index 9a756d94c1735dc12b47ac2104c3306eaa20ff8d..c07b2600c60eb1a18f3fef46da7b244d42d8e74a 100644
--- a/src/main/java/org/sablecc/sablecc/analysis/AnalysisAdapter.java
+++ b/src/main/java/org/sablecc/sablecc/analysis/AnalysisAdapter.java
@@ -19,9 +19,6 @@ public class AnalysisAdapter implements Analysis
@Deprecated
private Hashtable<Node,Object> out;
- /**
- * @deprecated If you need a map field, declare it yourself.
- */
@Deprecated
@Override
public Object getIn(Node node)
@@ -34,9 +31,6 @@ public class AnalysisAdapter implements Analysis
return this.in.get(node);
}
- /**
- * @deprecated If you need a map field, declare it yourself.
- */
@Deprecated
@Override
public void setIn(Node node, Object o)
@@ -56,9 +50,6 @@ public class AnalysisAdapter implements Analysis
}
}
- /**
- * @deprecated If you need a map field, declare it yourself.
- */
@Deprecated
@Override
public Object getOut(Node node)
@@ -71,9 +62,6 @@ public class AnalysisAdapter implements Analysis
return this.out.get(node);
}
- /**
- * @deprecated If you need a map field, declare it yourself.
- */
@Deprecated
@Override
public void setOut(Node node, Object o)
diff --git a/src/main/java/org/sablecc/sablecc/parser/Parser.java b/src/main/java/org/sablecc/sablecc/parser/Parser.java
index aadf7435f6aceccef7955e225392839b594c6d00..c9535dfa6f49dd99abe9764e6e84e6094d3f2a5a 100644
--- a/src/main/java/org/sablecc/sablecc/parser/Parser.java
+++ b/src/main/java/org/sablecc/sablecc/parser/Parser.java
@@ -146,6 +146,8 @@ public class Parser implements IParser
}
/**
+ * @param productionRuleAsString internal name of the production rule in question
+ * @return {@code false} if creation of a new list should be skipped, {@code true} for default behavior
* @deprecated Overriding this method no longer has any effect. This optimization is now applied automatically iff it is safe.
*/
@Deprecated
diff --git a/src/main/resources/org/sablecc/sablecc/analyses.txt b/src/main/resources/org/sablecc/sablecc/analyses.txt
index f7c37c0826aa1b0b0a0d42521e32f4b83c8038cd..4a316079af302c480ee5a8f21a58d2a4215dfb89 100644
--- a/src/main/resources/org/sablecc/sablecc/analyses.txt
+++ b/src/main/resources/org/sablecc/sablecc/analyses.txt
@@ -15,24 +15,32 @@ import $1$.*;
public interface Analysis extends Switch
{
/**
+ * @param node the node for which to look up the associated object
+ * @return the corresponding object previously associated using {@link #setIn(Node, Object)}, or {@code null} if there is none
* @deprecated If you need a map field, declare it yourself.
*/
@Deprecated
Object getIn(Node node);
/**
+ * @param node the node with which to associate the given object
+ * @param o the object to associate with the node
* @deprecated If you need a map field, declare it yourself.
*/
@Deprecated
void setIn(Node node, Object o);
/**
+ * @param node the node for which to look up the associated object
+ * @return the corresponding object previously associated using {@link #setOut(Node, Object)}, or {@code null} if there is none
* @deprecated If you need a map field, declare it yourself.
*/
@Deprecated
Object getOut(Node node);
/**
+ * @param node the node with which to associate the given object
+ * @param o the object to associate with the node
* @deprecated If you need a map field, declare it yourself.
*/
@Deprecated
@@ -78,9 +86,6 @@ public class AnalysisAdapter implements Analysis
@Deprecated
private Hashtable<Node,Object> out;
- /**
- * @deprecated If you need a map field, declare it yourself.
- */
@Deprecated
@Override
public Object getIn(Node node)
@@ -93,9 +98,6 @@ public class AnalysisAdapter implements Analysis
return this.in.get(node);
}
- /**
- * @deprecated If you need a map field, declare it yourself.
- */
@Deprecated
@Override
public void setIn(Node node, Object o)
@@ -115,9 +117,6 @@ public class AnalysisAdapter implements Analysis
}
}
- /**
- * @deprecated If you need a map field, declare it yourself.
- */
@Deprecated
@Override
public Object getOut(Node node)
@@ -130,9 +129,6 @@ public class AnalysisAdapter implements Analysis
return this.out.get(node);
}
- /**
- * @deprecated If you need a map field, declare it yourself.
- */
@Deprecated
@Override
public void setOut(Node node, Object o)
diff --git a/src/main/resources/org/sablecc/sablecc/parser.txt b/src/main/resources/org/sablecc/sablecc/parser.txt
index d6d876b18ead8e26bf711fa9d343eb7fc296c64f..e24642dd9c693de1b61f505c08586fdaba81ff72 100644
--- a/src/main/resources/org/sablecc/sablecc/parser.txt
+++ b/src/main/resources/org/sablecc/sablecc/parser.txt
@@ -154,6 +154,8 @@ public class Parser implements IParser
}
/**
+ * @param productionRuleAsString internal name of the production rule in question
+ * @return {@code false} if creation of a new list should be skipped, {@code true} for default behavior
* @deprecated Overriding this method no longer has any effect. This optimization is now applied automatically iff it is safe.
*/
@Deprecated