Merge branch 'antlr:dev' into patch-1

Author: jakubtomany

.github/workflows/hosted.yml

@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [
-          macos-12,
+          macos-15,
           ubuntu-20.04,
           windows-2022
         ]
@@ -147,7 +147,7 @@ jobs:
     - name: Archive artifacts
       if: always()
       continue-on-error: true
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: antlr_${{ matrix.os }}_${{ matrix.compiler }}
         path: antlr_${{ matrix.os }}_${{ matrix.compiler }}.tgz
@@ -160,7 +160,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [
-          macos-12,
+          macos-15,
           ubuntu-20.04,
           windows-2022
         ]
@@ -336,7 +336,7 @@ jobs:
     - name: Archive artifacts
       if: always()
       continue-on-error: true
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: antlr_${{ matrix.os }}_${{ matrix.target }}
         path: antlr_${{ matrix.os }}_${{ matrix.target }}.tgz

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11 AS builder
+FROM eclipse-temurin:21 AS builder
 
 WORKDIR /opt/antlr4
 
@@ -14,23 +14,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install maven git -
     && mvn -DskipTests install --projects tool --also-make \
     && mv ./tool/target/antlr4-*-complete.jar antlr4-tool.jar
 
-FROM eclipse-temurin:11-jre
-
-ARG user=appuser
-ARG group=appuser
-ARG uid=1000
-ARG gid=1000
-
-RUN adduser \
-    --disabled-password \
-    --gecos "" \
-    --home "$(pwd)" \
-    --no-create-home \
-    --uid "${uid}" \
-    "${user}"
+FROM eclipse-temurin:21-jre
 
 COPY --from=builder /opt/antlr4/antlr4/antlr4-tool.jar /usr/local/lib/
 WORKDIR /work
 ENTRYPOINT ["java", "-Xmx500M", "-cp", "/usr/local/lib/antlr4-tool.jar", "org.antlr.v4.Tool"]
-
-

runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/TypeScript.test.stg

@@ -1,5 +1,5 @@
-writeln(s) ::= <<console.log(<s> || '');>>
-write(s) ::= <<process.stdout.write(<s> || '');>>
+writeln(s) ::= <<console.log(<s>);>>
+write(s) ::= <<process.stdout.write(<s>);>>
 writeList(s) ::= <<console.log(<s; separator="+">);>>
 
 False() ::= "false"

runtime/CSharp/src/Atn/ATN.cs

@@ -77,10 +77,10 @@ public class ATN
         private readonly PredictionContextCache contextCache = new PredictionContextCache();
 
         [NotNull]
-		public DFA[] decisionToDFA = new DFA[0];
+		public DFA[] decisionToDFA = Collections.EmptyList<DFA>();
 
         [NotNull]
-		public DFA[] modeToDFA = new DFA[0];
+		public DFA[] modeToDFA = Collections.EmptyList<DFA>();
 
         protected internal readonly ConcurrentDictionary<int, int> LL1Table = new ConcurrentDictionary<int, int>();
 

runtime/CSharp/src/Dfa/DFA.cs

@@ -46,7 +46,7 @@ public DFA(DecisionState atnStartState, int decision)
 			{
 				this.precedenceDfa = true;
 				DFAState precedenceState = new DFAState(new ATNConfigSet());
-				precedenceState.edges = new DFAState[0];
+				precedenceState.edges = Collections.EmptyList<DFAState>();
 				precedenceState.isAcceptState = false;
 				precedenceState.requiresFullContext = false;
 				this.s0 = precedenceState;

runtime/CSharp/src/LexerInterpreter.cs

@@ -33,7 +33,7 @@ public class LexerInterpreter: Lexer
 
         [Obsolete("Use constructor with channelNames argument")]
         public LexerInterpreter(string grammarFileName, IVocabulary vocabulary, IEnumerable<string> ruleNames, IEnumerable<string> modeNames, ATN atn, ICharStream input)
-            : this(grammarFileName, vocabulary, ruleNames, new string[0], modeNames, atn, input)
+            : this(grammarFileName, vocabulary, ruleNames, Collections.EmptyList<string>(), modeNames, atn, input)
         {
         }
 

runtime/CSharp/src/Recognizer.cs

@@ -7,6 +7,7 @@
 using System.Runtime.CompilerServices;
 using Antlr4.Runtime.Atn;
 using Antlr4.Runtime.Misc;
+using Antlr4.Runtime.Sharpen;
 
 namespace Antlr4.Runtime
 {
@@ -286,7 +287,7 @@ public virtual void RemoveErrorListener(IAntlrErrorListener<Symbol> listener)
 
         public virtual void RemoveErrorListeners()
         {
-            _listeners = new IAntlrErrorListener<Symbol>[0];
+            _listeners = Collections.EmptyList<IAntlrErrorListener<Symbol>>();
         }
 
         [NotNull]

runtime/CSharp/src/Sharpen/BitSet.cs

@@ -9,7 +9,7 @@ namespace Antlr4.Runtime.Sharpen
 
     public class BitSet
     {
-        private static readonly ulong[] EmptyBits = new ulong[0];
+        private static readonly ulong[] EmptyBits = Collections.EmptyList<ulong>();
         private const int BitsPerElement = 8 * sizeof(ulong);
 
         private ulong[] _data = EmptyBits;

runtime/CSharp/src/Sharpen/Collections.cs

@@ -9,7 +9,11 @@ namespace Antlr4.Runtime.Sharpen
 
     internal static class Collections
     {
-        public static T[] EmptyList<T>()
+		/// <remarks>
+		/// Available in .NET as Array.Empty but not to the net45 target.
+		/// See: https://learn.microsoft.com/dotnet/api/system.array.empty.
+		/// </remarks>
+		public static T[] EmptyList<T>()
         {
             return EmptyListImpl<T>.Instance;
         }
@@ -31,10 +35,13 @@ public static ReadOnlyDictionary<TKey, TValue> SingletonMap<TKey, TValue>(TKey k
 
         private static class EmptyListImpl<T>
         {
-            public static readonly T[] Instance = new T[0];
-        }
+#pragma warning disable CA1825
+            // Provides a solution for CA1825.
+			public static readonly T[] Instance = new T[0];
+#pragma warning restore CA1825
+		}
 
-        private static class EmptyMapImpl<TKey, TValue>
+		private static class EmptyMapImpl<TKey, TValue>
         {
             public static readonly ReadOnlyDictionary<TKey, TValue> Instance =
                 new ReadOnlyDictionary<TKey, TValue>(new Dictionary<TKey, TValue>());

runtime/CSharp/src/Vocabulary.cs

@@ -16,7 +16,7 @@ namespace Antlr4.Runtime
     /// <author>Sam Harwell</author>
     public class Vocabulary : IVocabulary
     {
-        private static readonly string[] EmptyNames = new string[0];
+        private static readonly string[] EmptyNames = Collections.EmptyList<string>();
 
         /// <summary>
         /// Gets an empty

runtime/Cpp/cmake/README.md

@@ -137,7 +137,7 @@ By defualt the ANTLR C++ runtime source is cloned from GitHub. However, users ma
 
 Visual C++ compiler users may want to additionally define `ANTLR4_WITH_STATIC_CRT` before including the file. Set `ANTLR4_WITH_STATIC_CRT` to true if ANTLR4 C++ runtime library should be compiled with `/MT` flag, otherwise will be compiled with `/MD` flag. This variable has a default value of `OFF`. Changing `ANTLR4_WITH_STATIC_CRT` after building the library may require reinitialization of CMake or `clean` for the library to get rebuilt.
 
-You may need to modify your local copy of ExternalAntlr4Cpp.cpp to modify some build settings. For example, to specify the C++ standard to use when building the runtime, add `-DCMAKE_CXX_STANDARD:STRING=17` to `CMAKE_CACHE_ARGS`.
+You may need to modify your local copy of ExternalAntlr4Cpp.cmake to modify some build settings. For example, to specify the C++ standard to use when building the runtime, add `-DCMAKE_CXX_STANDARD:STRING=17` to `CMAKE_CACHE_ARGS`.
 
 ### Examples
 

runtime/Cpp/runtime/src/ANTLRErrorListener.h

@@ -5,6 +5,11 @@
 
 #pragma once
 
+#include <exception>
+#include <string>
+#include <cstddef>
+#include "antlr4-common.h"
+#include "Token.h"
 #include "RecognitionException.h"
 
 namespace antlrcpp {

runtime/Cpp/runtime/src/ANTLRErrorStrategy.h

@@ -5,9 +5,12 @@
 
 #pragma once
 
+#include <exception>
+#include "antlr4-common.h"
 #include "Token.h"
 
 namespace antlr4 {
+  class Parser;
 
   /// <summary>
   /// The interface for defining strategies to deal with syntax errors encountered

runtime/Cpp/runtime/src/ANTLRFileStream.cpp

@@ -3,6 +3,8 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <string>
+#include "ANTLRInputStream.h"
 #include "ANTLRFileStream.h"
 
 using namespace antlr4;

runtime/Cpp/runtime/src/ANTLRFileStream.h

@@ -5,6 +5,9 @@
 
 #pragma once
 
+#include <string>
+#include <cstddef>
+#include "antlr4-common.h"
 #include "ANTLRInputStream.h"
 
 namespace antlr4 {
@@ -21,7 +24,7 @@ namespace antlr4 {
 
     // Assumes a file name encoded in UTF-8 and file content in the same encoding (with or w/o BOM).
     virtual void loadFromFile(const std::string &fileName);
-    virtual std::string getSourceName() const override;
+    std::string getSourceName() const override;
 
   private:
     std::string _fileName; // UTF-8 encoded file name.

runtime/Cpp/runtime/src/ANTLRInputStream.cpp

@@ -3,9 +3,14 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <string_view>
+#include <cassert>
+#include <utility>
+#include <string>
 #include <string.h>
 
 #include "Exceptions.h"
+#include "antlr4-common.h"
 #include "misc/Interval.h"
 #include "IntStream.h"
 

runtime/Cpp/runtime/src/ANTLRInputStream.h

@@ -5,8 +5,12 @@
 
 #pragma once
 
+#include <string>
+#include <cstddef>
 #include <string_view>
 
+#include "antlr4-common.h"
+#include "misc/Interval.h"
 #include "CharStream.h"
 
 namespace antlr4 {
@@ -46,31 +50,31 @@ namespace antlr4 {
     /// when the object was created *except* the data array is not
     /// touched.
     virtual void reset();
-    virtual void consume() override;
-    virtual size_t LA(ssize_t i) override;
+    void consume() override;
+    size_t LA(ssize_t i) override;
     virtual size_t LT(ssize_t i);
 
     /// <summary>
     /// Return the current input symbol index 0..n where n indicates the
     ///  last symbol has been read.  The index is the index of char to
     ///  be returned from LA(1).
     /// </summary>
-    virtual size_t index() override;
-    virtual size_t size() override;
+    size_t index() override;
+    size_t size() override;
 
     /// <summary>
     /// mark/release do nothing; we have entire buffer </summary>
-    virtual ssize_t mark() override;
-    virtual void release(ssize_t marker) override;
+    ssize_t mark() override;
+    void release(ssize_t marker) override;
 
     /// <summary>
     /// consume() ahead until p==index; can't just set p=index as we must
     ///  update line and charPositionInLine. If we seek backwards, just set p
     /// </summary>
-    virtual void seek(size_t index) override;
-    virtual std::string getText(const misc::Interval &interval) override;
-    virtual std::string getSourceName() const override;
-    virtual std::string toString() const override;
+    void seek(size_t index) override;
+    std::string getText(const misc::Interval &interval) override;
+    std::string getSourceName() const override;
+    std::string toString() const override;
 
   private:
     void InitializeInstanceFields();

runtime/Cpp/runtime/src/BailErrorStrategy.cpp

@@ -3,7 +3,9 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <exception>
 #include "Exceptions.h"
+#include "Token.h"
 #include "ParserRuleContext.h"
 #include "InputMismatchException.h"
 #include "Parser.h"

runtime/Cpp/runtime/src/BailErrorStrategy.h

@@ -5,6 +5,9 @@
 
 #pragma once
 
+#include <exception>
+#include "antlr4-common.h"
+#include "Token.h"
 #include "DefaultErrorStrategy.h"
 
 namespace antlr4 {
@@ -45,15 +48,15 @@ namespace antlr4 {
     ///  original <seealso cref="RecognitionException"/>.
     /// </summary>
   public:
-    virtual void recover(Parser *recognizer, std::exception_ptr e) override;
+    void recover(Parser *recognizer, std::exception_ptr e) override;
 
     /// Make sure we don't attempt to recover inline; if the parser
     ///  successfully recovers, it won't throw an exception.
-    virtual Token* recoverInline(Parser *recognizer) override;
+    Token* recoverInline(Parser *recognizer) override;
 
     /// <summary>
     /// Make sure we don't attempt to recover from problems in subrules. </summary>
-    virtual void sync(Parser *recognizer) override;
+    void sync(Parser *recognizer) override;
   };
 
 } // namespace antlr4

runtime/Cpp/runtime/src/BaseErrorListener.cpp

@@ -3,7 +3,11 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <exception>
+#include <string>
+#include <cstddef>
 #include "BaseErrorListener.h"
+#include "Token.h"
 #include "RecognitionException.h"
 
 using namespace antlr4;

runtime/Cpp/runtime/src/BaseErrorListener.h

@@ -5,6 +5,11 @@
 
 #pragma once
 
+#include <exception>
+#include <string>
+#include <cstddef>
+#include "antlr4-common.h"
+#include "Token.h"
 #include "ANTLRErrorListener.h"
 
 namespace antlrcpp {
@@ -20,16 +25,16 @@ namespace antlr4 {
    */
   class ANTLR4CPP_PUBLIC BaseErrorListener : public ANTLRErrorListener {
 
-    virtual void syntaxError(Recognizer *recognizer, Token * offendingSymbol, size_t line, size_t charPositionInLine,
+    void syntaxError(Recognizer *recognizer, Token * offendingSymbol, size_t line, size_t charPositionInLine,
       const std::string &msg, std::exception_ptr e) override;
 
-    virtual void reportAmbiguity(Parser *recognizer, const dfa::DFA &dfa, size_t startIndex, size_t stopIndex, bool exact,
+    void reportAmbiguity(Parser *recognizer, const dfa::DFA &dfa, size_t startIndex, size_t stopIndex, bool exact,
       const antlrcpp::BitSet &ambigAlts, atn::ATNConfigSet *configs) override;
 
-    virtual void reportAttemptingFullContext(Parser *recognizer, const dfa::DFA &dfa, size_t startIndex, size_t stopIndex,
+    void reportAttemptingFullContext(Parser *recognizer, const dfa::DFA &dfa, size_t startIndex, size_t stopIndex,
       const antlrcpp::BitSet &conflictingAlts, atn::ATNConfigSet *configs) override;
 
-    virtual void reportContextSensitivity(Parser *recognizer, const dfa::DFA &dfa, size_t startIndex, size_t stopIndex,
+    void reportContextSensitivity(Parser *recognizer, const dfa::DFA &dfa, size_t startIndex, size_t stopIndex,
       size_t prediction, atn::ATNConfigSet *configs) override;
   };