projects
/
yosys.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1848 from YosysHQ/eddie/fix_dynslice
[yosys.git]
/
kernel
/
driver.cc
diff --git
a/kernel/driver.cc
b/kernel/driver.cc
index 9040408bc0dc58c71b282b7f666908be611c54e2..5f0959776786ff4acec88596cc1ec0c73e807f44 100644
(file)
--- a/
kernel/driver.cc
+++ b/
kernel/driver.cc
@@
-413,22
+413,13
@@
int main(int argc, char **argv)
scriptfile_tcl = true;
break;
case 'W':
scriptfile_tcl = true;
break;
case 'W':
- log_warn_regexes.push_back(std::regex(optarg,
- std::regex_constants::nosubs |
- std::regex_constants::optimize |
- std::regex_constants::egrep));
+ log_warn_regexes.push_back(YS_REGEX_COMPILE(optarg));
break;
case 'w':
break;
case 'w':
- log_nowarn_regexes.push_back(std::regex(optarg,
- std::regex_constants::nosubs |
- std::regex_constants::optimize |
- std::regex_constants::egrep));
+ log_nowarn_regexes.push_back(YS_REGEX_COMPILE(optarg));
break;
case 'e':
break;
case 'e':
- log_werror_regexes.push_back(std::regex(optarg,
- std::regex_constants::nosubs |
- std::regex_constants::optimize |
- std::regex_constants::egrep));
+ log_werror_regexes.push_back(YS_REGEX_COMPILE(optarg));
break;
case 'D':
vlog_defines.push_back(optarg);
break;
case 'D':
vlog_defines.push_back(optarg);
@@
-558,6
+549,10
@@
int main(int argc, char **argv)
fprintf(f, "\n");
}
fprintf(f, "\n");
}
+ if (log_expect_no_warnings && log_warnings_count_noexpect)
+ log_error("Unexpected warnings found: %d unique messages, %d total, %d expected\n", GetSize(log_warnings),
+ log_warnings_count, log_warnings_count - log_warnings_count_noexpect);
+
if (print_stats)
{
std::string hash = log_hasher->final().substr(0, 10);
if (print_stats)
{
std::string hash = log_hasher->final().substr(0, 10);
@@
-664,6
+659,8
@@
int main(int argc, char **argv)
}
#endif
}
#endif
+ log_check_expected();
+
yosys_atexit();
memhasher_off();
yosys_atexit();
memhasher_off();