fix bug for complie when using mingw and change name parser/generated

apache · Dec 12, 2024 · ddad7f9 · ddad7f9
1 parent 57a4834
commit ddad7f9
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 16 deletions.
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
@@ -51,13 +51,11 @@ set(SNAPPY_LIB_NAME "snappy")
 set(LZ4_LIB_NAME "LZ4")
 set(LZO_LIB_NAME "lzokay")
 set(ZLIB_LIB_NAME "z")
-set(ANTLR4_STATIC_LIB_PATH ${CMAKE_BINARY_DIR}/lib/libantlr4-runtime${CMAKE_STATIC_LIBRARY_SUFFIX})
-set(ANTLR4_SHARED_LIB_PATH ${CMAKE_BINARY_DIR}/lib/libantlr4-runtime${CMAKE_SHARED_LIBRARY_SUFFIX})
-target_link_libraries(parser_obj ${ANTLR4_STATIC_LIB_PATH} ${ANTLR4_SHARED_LIB_PATH})
-target_link_libraries(compress_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME})
-target_link_libraries(common_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME} ${ANTLR4_STATIC_LIB_PATH} ${ANTLR4_SHARED_LIB_PATH})
-target_link_libraries(read_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME})
-target_link_libraries(write_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME})
+target_link_libraries(parser_obj antlr4_shared)
+target_link_libraries(compress_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME} antlr4_shared )
+target_link_libraries(common_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME} antlr4_shared )
+target_link_libraries(read_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME} antlr4_shared )
+target_link_libraries(write_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME} antlr4_shared )
 # set(CMAKE_PREFIX_PATH ../../third-party/lz4-dev/lib)
 # set(LZ4_LIB_DIR ../../third-party/lz4-dev/lib)
 # find_library(my_lz4_lib NAMES lz4 PATHS ${LZ4_LIB_DIR} NO_DEFAULT_PATH REQUIRED)

diff --git a/cpp/src/common/path.h b/cpp/src/common/path.h
@@ -20,7 +20,7 @@
 #define COMMON_READ_COMMON_PATH_H
 
 #include "utils/errno_define.h"
-#include "parser/generator/PathParser.h"
+#include "parser/generated/PathParser.h"
 #include "parser/path_nodes_generator.h"
 
 #include <string>

diff --git a/cpp/src/parser/generator/PathLexer.cpp → cpp/src/parser/generated/PathLexer.cpp b/cpp/src/parser/generator/PathLexer.cpp → cpp/src/parser/generated/PathLexer.cpp
diff --git a/cpp/src/parser/generator/PathLexer.h → cpp/src/parser/generated/PathLexer.h b/cpp/src/parser/generator/PathLexer.h → cpp/src/parser/generated/PathLexer.h
diff --git a/cpp/src/parser/generator/PathParser.cpp → cpp/src/parser/generated/PathParser.cpp b/cpp/src/parser/generator/PathParser.cpp → cpp/src/parser/generated/PathParser.cpp
diff --git a/cpp/src/parser/generator/PathParser.h → cpp/src/parser/generated/PathParser.h b/cpp/src/parser/generator/PathParser.h → cpp/src/parser/generated/PathParser.h
diff --git a/...rser/generator/PathParserBaseListener.cpp → ...rser/generated/PathParserBaseListener.cpp b/...rser/generator/PathParserBaseListener.cpp → ...rser/generated/PathParserBaseListener.cpp
diff --git a/...parser/generator/PathParserBaseListener.h → ...parser/generated/PathParserBaseListener.h b/...parser/generator/PathParserBaseListener.h → ...parser/generated/PathParserBaseListener.h
diff --git a/...arser/generator/PathParserBaseVisitor.cpp → ...arser/generated/PathParserBaseVisitor.cpp b/...arser/generator/PathParserBaseVisitor.cpp → ...arser/generated/PathParserBaseVisitor.cpp
diff --git a/.../parser/generator/PathParserBaseVisitor.h → .../parser/generated/PathParserBaseVisitor.h b/.../parser/generator/PathParserBaseVisitor.h → .../parser/generated/PathParserBaseVisitor.h
diff --git a/...c/parser/generator/PathParserListener.cpp → ...c/parser/generated/PathParserListener.cpp b/...c/parser/generator/PathParserListener.cpp → ...c/parser/generated/PathParserListener.cpp
diff --git a/...src/parser/generator/PathParserListener.h → ...src/parser/generated/PathParserListener.h b/...src/parser/generator/PathParserListener.h → ...src/parser/generated/PathParserListener.h
diff --git a/...rc/parser/generator/PathParserVisitor.cpp → ...rc/parser/generated/PathParserVisitor.cpp b/...rc/parser/generator/PathParserVisitor.cpp → ...rc/parser/generated/PathParserVisitor.cpp
diff --git a/cpp/src/parser/generator/PathParserVisitor.h → cpp/src/parser/generated/PathParserVisitor.h b/cpp/src/parser/generator/PathParserVisitor.h → cpp/src/parser/generated/PathParserVisitor.h
diff --git a/cpp/src/parser/path_nodes_generator.cpp b/cpp/src/parser/path_nodes_generator.cpp
@@ -21,8 +21,8 @@
 
 #include "path_nodes_generator.h"
 #include "utils/errno_define.h"
-#include "generator/PathLexer.h"
-#include "generator/PathParser.h"
+#include "generated/PathLexer.h"
+#include "generated/PathParser.h"
 #include "path_parser_error.h"
 #include "path_visitor.h"
 

diff --git a/cpp/src/parser/path_visitor.h b/cpp/src/parser/path_visitor.h
@@ -20,8 +20,8 @@
 #ifndef PATH_VISITOR_H
 #define PATH_VISITOR_H
 
-#include "generator/PathParserBaseVisitor.h"
-#include "generator/PathParser.h"
+#include "generated/PathParserBaseVisitor.h"
+#include "generated/PathParser.h"
 #include "common/constant/tsfile_constant.h"
 
 namespace storage

diff --git a/cpp/third_party/antlr4-cpp-runtime-4/runtime/src/atn/LexerATNSimulator.cpp b/cpp/third_party/antlr4-cpp-runtime-4/runtime/src/atn/LexerATNSimulator.cpp
@@ -31,8 +31,6 @@ using namespace antlr4;
 using namespace antlr4::atn;
 using namespace antlrcpp;
 
-LexerATNSimulator::SimState::~SimState() {
-}
 
 void LexerATNSimulator::SimState::reset() {
   index = INVALID_INDEX;

diff --git a/cpp/third_party/antlr4-cpp-runtime-4/runtime/src/atn/LexerATNSimulator.h b/cpp/third_party/antlr4-cpp-runtime-4/runtime/src/atn/LexerATNSimulator.h
@@ -19,7 +19,7 @@ namespace atn {
   protected:
     class SimState {
     public:
-      virtual ~SimState();
+      virtual ~SimState() {(void)0;}
 
     protected:
       size_t index;
@@ -95,7 +95,7 @@ namespace atn {
 
     LexerATNSimulator(const ATN &atn, std::vector<dfa::DFA> &decisionToDFA, PredictionContextCache &sharedContextCache);
     LexerATNSimulator(Lexer *recog, const ATN &atn, std::vector<dfa::DFA> &decisionToDFA, PredictionContextCache &sharedContextCache);
-    virtual ~LexerATNSimulator () {}
+    virtual ~LexerATNSimulator () {(void)0;}
 
     virtual void copyState(LexerATNSimulator *simulator);
     virtual size_t match(CharStream *input, size_t mode);