From fd25d27a7197e974ed23bce6f2933d24fee78f91 Mon Sep 17 00:00:00 2001 From: Shatur95 Date: Thu, 29 Jul 2021 11:10:13 +0300 Subject: [PATCH 1/3] Remove experimental filesystem header --- parser-verilog/verilog_data.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser-verilog/verilog_data.hpp b/parser-verilog/verilog_data.hpp index 59366e6..c4350ee 100644 --- a/parser-verilog/verilog_data.hpp +++ b/parser-verilog/verilog_data.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace verilog { From a9bd60d6c17b8ac5d95e7c90f81f632cd6fe3772 Mon Sep 17 00:00:00 2001 From: Shatur95 Date: Thu, 29 Jul 2021 11:38:59 +0300 Subject: [PATCH 2/3] Include flex directories for FlexLexer.h --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b362caa..61a275b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,6 +45,7 @@ add_executable(sample_parser ${FLEX_verilog_lexer_OUTPUTS} ${BISON_verilog_parser_OUTPUTS} ) +target_include_directories(sample_parser SYSTEM PRIVATE ${FLEX_INCLUDE_DIRS}) # A drop-in replacement OpenTimer Verilog parser add_executable(ot_parser @@ -52,6 +53,7 @@ add_executable(ot_parser ${FLEX_verilog_lexer_OUTPUTS} ${BISON_verilog_parser_OUTPUTS} ) +target_include_directories(ot_parser SYSTEM PRIVATE ${FLEX_INCLUDE_DIRS}) @@ -67,5 +69,6 @@ set(VP_UTEST_DIR ${PROJECT_SOURCE_DIR}/unittest) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${VP_UTEST_DIR}) add_executable(regression unittest/regression.cpp ${FLEX_verilog_lexer_OUTPUTS} ${BISON_verilog_parser_OUTPUTS}) +target_include_directories(regression SYSTEM PRIVATE ${FLEX_INCLUDE_DIRS}) add_test(regression ${VP_UTEST_DIR}/regression) From 37d63f2d5f0f97f5922af6863c4a53dfd794cbbf Mon Sep 17 00:00:00 2001 From: Shatur95 Date: Thu, 29 Jul 2021 11:39:22 +0300 Subject: [PATCH 3/3] Include stdint.h to avoid redefinition warnings on MSVC --- parser-verilog/verilog_lexer.l | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/parser-verilog/verilog_lexer.l b/parser-verilog/verilog_lexer.l index ce7f194..9880c71 100644 --- a/parser-verilog/verilog_lexer.l +++ b/parser-verilog/verilog_lexer.l @@ -1,3 +1,8 @@ +/* Avoid redefinition warnings on MSVC */ +%top{ +#include +} + %{ /* C++ string header, for string ops below */ #include