Upgrade Antlr to v4.9.2 (#161)

libs/CMakeLists.txt

@@ -91,11 +91,9 @@ import_external_library(antlr4 STATIC
   CMAKE_ARGS # http://stackoverflow.com/questions/37096062/get-a-basic-c-program-to-compile-using-clang-on-ubuntu-16/38385967#38385967
              -DWITH_LIBCXX=OFF # because of debian bug
              -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=true
+             -DCMAKE_CXX_STANDARD=20
   BUILD_COMMAND $(MAKE) antlr4_static
-  # Make a License.txt out of thin air, so that antlr4.6 knows how to build.
-  # When we upgrade antlr, this will no longer be needed.
-  INSTALL_COMMAND touch ${CMAKE_CURRENT_SOURCE_DIR}/antlr4/runtime/Cpp/License.txt
-  COMMAND $(MAKE) install)
+  INSTALL_COMMAND $(MAKE) install)
 
 # Setup google benchmark.
 import_external_library(benchmark STATIC

libs/setup.sh

@@ -93,7 +93,7 @@ repo_clone_try_double () {
 # Download from primary_urls might fail because the cache is not installed.
 declare -A primary_urls=(
   ["antlr4-code"]="http://$local_cache_host/git/antlr4.git"
-  ["antlr4-generator"]="http://$local_cache_host/file/antlr-4.6-complete.jar"
+  ["antlr4-generator"]="http://$local_cache_host/file/antlr-4.9.2-complete.jar"
   ["cppitertools"]="http://$local_cache_host/git/cppitertools.git"
   ["fmt"]="http://$local_cache_host/git/fmt.git"
   ["rapidcheck"]="http://$local_cache_host/git/rapidcheck.git"
@@ -119,7 +119,7 @@ declare -A primary_urls=(
 # should fail.
 declare -A secondary_urls=(
   ["antlr4-code"]="https://github.com/antlr/antlr4.git"
-  ["antlr4-generator"]="http://www.antlr.org/download/antlr-4.6-complete.jar"
+  ["antlr4-generator"]="http://www.antlr.org/download/antlr-4.9.2-complete.jar"
   ["cppitertools"]="https://github.com/ryanhaining/cppitertools.git"
   ["fmt"]="https://github.com/fmtlib/fmt.git"
   ["rapidcheck"]="https://github.com/emil-e/rapidcheck.git"
@@ -142,12 +142,12 @@ declare -A secondary_urls=(
 # antlr
 file_get_try_double "${primary_urls[antlr4-generator]}" "${secondary_urls[antlr4-generator]}"
 
-antlr4_tag="aacd2a2c95816d8dc1c05814051d631bfec4cf3e" # v4.6
+antlr4_tag="5e5b6d35b4183fd330102c40947b95c4b5c6abb5" # v4.9.2
 repo_clone_try_double "${primary_urls[antlr4-code]}" "${secondary_urls[antlr4-code]}" "antlr4" "$antlr4_tag"
-# fix missing include
-sed -i 's/^#pragma once/#pragma once\n#include <functional>/' antlr4/runtime/Cpp/runtime/src/support/CPPUtils.h
 # remove shared library from install dependencies
 sed -i 's/install(TARGETS antlr4_shared/install(TARGETS antlr4_shared OPTIONAL/' antlr4/runtime/Cpp/runtime/CMakeLists.txt
+# fix issue https://github.com/antlr/antlr4/issues/3194 - should update Antlr commit once the PR related to the issue gets merged
+sed -i 's/std::is_nothrow_copy_constructible/std::is_copy_constructible/' antlr4/runtime/Cpp/runtime/src/support/Any.h
 
 # cppitertools v2.0 2019-12-23
 cppitertools_ref="cb3635456bdb531121b82b4d2e3afc7ae1f56d47"

src/query/CMakeLists.txt

@@ -72,7 +72,7 @@ add_custom_command(
     OUTPUT ${antlr_opencypher_generated_src} ${antlr_opencypher_generated_include}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${opencypher_generated}
     COMMAND
-        java -jar ${CMAKE_SOURCE_DIR}/libs/antlr-4.6-complete.jar
+        java -jar ${CMAKE_SOURCE_DIR}/libs/antlr-4.9.2-complete.jar
             -Dlanguage=Cpp -visitor -package antlropencypher
             -o ${opencypher_generated}
             ${opencypher_lexer_grammar} ${opencypher_parser_grammar}

src/query/frontend/opencypher/parser.hpp

@@ -35,7 +35,7 @@ class Parser {
 
  private:
   class FirstMessageErrorListener : public antlr4::BaseErrorListener {
-    void syntaxError(antlr4::IRecognizer *, antlr4::Token *, size_t line, size_t position, const std::string &message,
+    void syntaxError(antlr4::Recognizer *, antlr4::Token *, size_t line, size_t position, const std::string &message,
                      std::exception_ptr) override {
       if (error_.empty()) {
         error_ = "line " + std::to_string(line) + ":" + std::to_string(position + 1) + " " + message;
@@ -48,7 +48,7 @@ class Parser {
 
   FirstMessageErrorListener error_listener_;
   std::string query_;
-  antlr4::ANTLRInputStream input_{query_.c_str()};
+  antlr4::ANTLRInputStream input_{query_};
   antlropencypher::MemgraphCypherLexer lexer_{&input_};
   antlr4::CommonTokenStream tokens_{&lexer_};
 

tests/manual/antlr_parser.cpp

@@ -8,7 +8,7 @@ using namespace antlropencypher;
 using namespace antlr4;
 
 int main(int, const char **a) {
-  const char *query = a[1];
+  std::string_view query{a[1]};
 
   ANTLRInputStream input(query);
   MemgraphCypherLexer lexer(&input);