diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2020-05-11 10:01:29 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2020-05-14 10:32:07 -0700 |
| commit | 65395168a08c07eff4e49996f4eae4d5a422e586 (patch) | |
| tree | 9e1fbf1ee97e5ebf2e51994bb3c5d0f88dd62c1e /passes/cmds | |
| parent | 5bcde7ccc331e575682823222c97cc414bb3d808 (diff) | |
| download | yosys-65395168a08c07eff4e49996f4eae4d5a422e586.tar.gz yosys-65395168a08c07eff4e49996f4eae4d5a422e586.tar.bz2 yosys-65395168a08c07eff4e49996f4eae4d5a422e586.zip | |
logger: fix for multiple calls with same pattern
Diffstat (limited to 'passes/cmds')
| -rw-r--r-- | passes/cmds/logger.cc | 40 |
1 files changed, 34 insertions, 6 deletions
diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc index 9a27952d4..64f939525 100644 --- a/passes/cmds/logger.cc +++ b/passes/cmds/logger.cc @@ -158,12 +158,40 @@ struct LoggerPass : public Pass { log_cmd_error("Expected error message occurrences must be 1 !\n"); 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(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count))); - else if (type=="warning") - log_expect_warning.push_back(std::make_pair(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count))); - else - log_expect_log.push_back(std::make_pair(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count))); + if (type=="error") { + auto it = log_expect_error.begin(); + auto ie = log_expect_error.end(); + for (; it != ie; it++) + if (it->second.pattern == pattern) { + it->second.expected_count = count; + break; + } + if (it == ie) + log_expect_error.emplace_back(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count)); + } + else if (type=="warning") { + auto it = log_expect_warning.begin(); + auto ie = log_expect_warning.end(); + for (; it != ie; it++) + if (it->second.pattern == pattern) { + it->second.expected_count = count; + break; + } + if (it == ie) + log_expect_warning.emplace_back(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count)); + } + else if (type=="log") { + auto it = log_expect_log.begin(); + auto ie = log_expect_log.end(); + for (; it != ie; it++) + if (it->second.pattern == pattern) { + it->second.expected_count = count; + break; + } + if (it == ie) + log_expect_log.emplace_back(YS_REGEX_COMPILE(pattern), LogExpectedItem(pattern, count)); + } + else log_abort(); } catch (const YS_REGEX_NS::regex_error& e) { log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str()); |