Merge branch 'antlr:dev' into dev

Author: Tiscs

.github/workflows/hosted.yml

@@ -22,7 +22,7 @@ jobs:
       matrix:
         os: [
           macos-15,
-          ubuntu-20.04,
+          ubuntu-22.04,
           windows-2022
         ]
         compiler: [ clang, gcc ]
@@ -161,7 +161,7 @@ jobs:
       matrix:
         os: [
           macos-15,
-          ubuntu-20.04,
+          ubuntu-22.04,
           windows-2022
         ]
         target: [

runtime/Cpp/CMakeLists.txt

@@ -138,10 +138,11 @@ if(WITH_DEMO)
  add_subdirectory(demo)
 endif(WITH_DEMO)
 
+include(GNUInstallDirs)
+
 # Generate CMake Package Files only if install is active
 if (ANTLR4_INSTALL)
 
-  include(GNUInstallDirs)
   include(CMakePackageConfigHelpers)
 
   if(NOT ANTLR4_CMAKE_DIR)
@@ -202,14 +203,14 @@ endif(ANTLR4_INSTALL)
 
 if(EXISTS LICENSE.txt)
 install(FILES LICENSE.txt
-        DESTINATION "share/doc/libantlr4")
+        DESTINATION ${CMAKE_INSTALL_DOCDIR})
 elseif(EXISTS ../../LICENSE.txt)
 install(FILES ../../LICENSE.txt
-    DESTINATION "share/doc/libantlr4")
+    DESTINATION ${CMAKE_INSTALL_DOCDIR})
 endif()
 
 install(FILES README.md VERSION
-    DESTINATION "share/doc/libantlr4")
+    DESTINATION ${CMAKE_INSTALL_DOCDIR})
 
 set(CPACK_PACKAGE_CONTACT "[email protected]")
 set(CPACK_PACKAGE_VERSION ${ANTLR_VERSION})

runtime/Cpp/runtime/CMakeLists.txt

@@ -7,7 +7,7 @@ if (NOT ANTLR_BUILD_SHARED AND NOT ANTLR_BUILD_STATIC)
   message(FATAL_ERROR "Options ANTLR_BUILD_SHARED and ANTLR_BUILD_STATIC can't both be OFF")
 endif()
 
-set(libantlrcpp_INCLUDE_INSTALL_DIR "include/antlr4-runtime")
+set(libantlrcpp_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/antlr4-runtime")
 
 set(libantlrcpp_INCLUDE_DIRS
   ${PROJECT_SOURCE_DIR}/runtime/src
@@ -70,7 +70,7 @@ if (ANTLR_BUILD_CPP_TESTS)
 
   FetchContent_Declare(
     googletest
-    URL https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.zip
+    URL https://github.com/google/googletest/archive/refs/tags/v1.16.0.zip
   )
 
   if(WITH_STATIC_CRT)

runtime/Cpp/runtime/src/RuleContext.h

@@ -138,8 +138,6 @@ namespace antlr4 {
 
     virtual std::string toString(const std::vector<std::string> &ruleNames, RuleContext *stop);
 
-    bool operator == (const RuleContext &other) { return this == &other; } // Simple address comparison.
-
   private:
     void InitializeInstanceFields();
   };

runtime/JavaScript/src/antlr4/Parser.d.ts

@@ -46,5 +46,6 @@ export declare class Parser extends Recognizer<Token> {
     setTokenStream(input: TokenStream): void;
     notifyErrorListeners(msg: string, offendingToken: Token, err: RecognitionException | undefined): void;
     getCurrentToken(): Token;
+    getInvokingContext(ruleIndex: number): ParserRuleContext;
 
 }

runtime/JavaScript/src/antlr4/misc/index.d.ts

@@ -1,3 +1,4 @@
+export * from './BitSet'
 export * from './Interval'
 export * from './IntervalSet';
 

runtime/JavaScript/src/antlr4/misc/index.js

@@ -1,4 +1,5 @@
+import BitSet from './BitSet.js';
 import Interval from './Interval.js';
 import IntervalSet from './IntervalSet.js';
 
-export default { Interval, IntervalSet }
+export default { BitSet, Interval, IntervalSet }