diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2020-03-13 17:19:54 +0100 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2020-03-13 17:19:54 +0100 |
| commit | 8f221118d206e8f474fb5c1853cd67018b7801c9 (patch) | |
| tree | afd179067f9520dd102de3b1368471c408ad5819 /passes/cmds | |
| parent | 5b73e7c63a9f939da93dd8dca7d7b1e4c2a949ae (diff) | |
| download | yosys-8f221118d206e8f474fb5c1853cd67018b7801c9.tar.gz yosys-8f221118d206e8f474fb5c1853cd67018b7801c9.tar.bz2 yosys-8f221118d206e8f474fb5c1853cd67018b7801c9.zip | |
Add YS_ prefix to macros, add explanation and apply to older version as well
Diffstat (limited to 'passes/cmds')
| -rw-r--r-- | passes/cmds/logger.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc index 3ca321771..9a27952d4 100644 --- a/passes/cmds/logger.cc +++ b/passes/cmds/logger.cc @@ -96,9 +96,9 @@ struct LoggerPass : public Pass { if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2); try { log("Added regex '%s' for warnings to warn list.\n", pattern.c_str()); - log_warn_regexes.push_back(REGEX_COMPILE(pattern)); + log_warn_regexes.push_back(YS_REGEX_COMPILE(pattern)); } - catch (const REGEX_NS::regex_error& e) { + catch (const YS_REGEX_NS::regex_error& e) { log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str()); } continue; @@ -108,9 +108,9 @@ struct LoggerPass : public Pass { if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2); try { log("Added regex '%s' for warnings to nowarn list.\n", pattern.c_str()); - log_nowarn_regexes.push_back(REGEX_COMPILE(pattern)); + log_nowarn_regexes.push_back(YS_REGEX_COMPILE(pattern)); } - catch (const REGEX_NS::regex_error& e) { + catch (const YS_REGEX_NS::regex_error& e) { log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str()); } continue; @@ -120,9 +120,9 @@ struct LoggerPass : public Pass { if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2); try { log("Added regex '%s' for warnings to werror list.\n", pattern.c_str()); - log_werror_regexes.push_back(REGEX_COMPILE(pattern)); + log_werror_regexes.push_back(YS_REGEX_COMPILE(pattern)); } - catch (const REGEX_NS::regex_error& e) { + catch (const YS_REGEX_NS::regex_error& e) { log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str()); } continue; @@ -159,13 +159,13 @@ struct LoggerPass : public Pass { log("Added regex '%s' for warnings to expected %s list.\n", pattern.c_str(), type.c_str()); try { if (type=="error") - log_expect_error.push_back(std::make_pair(REGEX_COMPILE(pattern), LogExpectedItem(pattern, count))); + log_expect_error.push_back(std::make_pair(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count))); else if (type=="warning") - log_expect_warning.push_back(std::make_pair(REGEX_COMPILE(pattern), LogExpectedItem(pattern, count))); + log_expect_warning.push_back(std::make_pair(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count))); else - log_expect_log.push_back(std::make_pair(REGEX_COMPILE(pattern), LogExpectedItem(pattern, count))); + log_expect_log.push_back(std::make_pair(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count))); } - catch (const REGEX_NS::regex_error& e) { + catch (const YS_REGEX_NS::regex_error& e) { log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str()); } continue; |