Merge pull request #186 from kleinesfilmroellchen/antlr-and-test-fixes

tests+verilog preproc: Fix ANTLR <=4.9, CMake and Icarus tests
Nic30 · Jan 14, 2024 · a3f978c · a3f978c
2 parents 4bcce70 + ec7a130
commit a3f978c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,6 +2,8 @@
 # build of the main library
 ##############################################################################################
 
+set(CMAKE_CXX_STANDARD 17)
+
 include(${CMAKE_CURRENT_SOURCE_DIR}/CMake_antlr4.txt)
 
 include_directories(

diff --git a/src/verilogPreproc/verilogPreproc.cpp b/src/verilogPreproc/verilogPreproc.cpp
@@ -1,3 +1,5 @@
+#include <any>
+
 #include <hdlConvertor/verilogPreproc/verilogPreproc.h>
 
 // antlr4-runtime/
@@ -194,7 +196,7 @@ antlrcpp::Any VerilogPreproc::visitDefine(
 	vector<MacroDefVerilog::param_info_t> params_dummy;
 	if (da) {
 #if !defined(ANTLRCPP_VERSION_MAJOR) || (ANTLRCPP_VERSION_MAJOR == 4 && ANTLRCPP_VERSION_MINOR <= 9)
-		params = visitDefine_args(da);
+		params = visitDefine_args(da).as<vector<MacroDefVerilog::param_info_t> *>();
 #else
 		params = std::any_cast<vector<MacroDefVerilog::param_info_t> *>(visitDefine_args(da));
 #endif

diff --git a/tests/test_icarus_verilog_testsuite.py b/tests/test_icarus_verilog_testsuite.py
@@ -48,6 +48,7 @@ def parse_verilator_record(line, dir_name):
         "sv_string_index": "string_index",
         "sv_timeunit_prec": "sv_timeunit_prec1",
         "sv_timeunit_prec_fail": "sv_timeunit_prec_fail1",
+        "sv_macro3": "sv_macro3a"
     }
     name = name_fix.get(name, name)
     args = columns[1]