diff options
| author | whitequark <whitequark@whitequark.org> | 2020-04-17 09:07:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 09:07:49 +0000 |
| commit | 115fc261e60ebcd0456e26aac452942137db1ca9 (patch) | |
| tree | 656d88b8f7304b3967e5182573ed22985f0ee9af | |
| parent | 4d1db12133885d35f7ce6fe76db82e5878cee104 (diff) | |
| parent | 586739ecf3c397f34ebc68585ac934dd562e39a9 (diff) | |
| download | yosys-115fc261e60ebcd0456e26aac452942137db1ca9.tar.gz yosys-115fc261e60ebcd0456e26aac452942137db1ca9.tar.bz2 yosys-115fc261e60ebcd0456e26aac452942137db1ca9.zip | |
Merge pull request #1954 from YosysHQ/dave/fix-stdout-conflict
qbfsat: Fix illegal use of 'stdout' identifier
| -rw-r--r-- | passes/sat/qbfsat.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/passes/sat/qbfsat.cc b/passes/sat/qbfsat.cc index 44691425f..981271770 100644 --- a/passes/sat/qbfsat.cc +++ b/passes/sat/qbfsat.cc @@ -39,7 +39,7 @@ USING_YOSYS_NAMESPACE PRIVATE_NAMESPACE_BEGIN struct QbfSolutionType { - std::vector<std::string> stdout; + std::vector<std::string> stdout_lines; dict<std::string, std::string> hole_to_value; bool sat; bool unknown; //true if neither 'sat' nor 'unsat' @@ -72,7 +72,7 @@ void recover_solution(QbfSolutionType &sol) { bool sat_regex_found = false; bool unsat_regex_found = false; dict<std::string, bool> hole_value_recovered; - for (const std::string &x : sol.stdout) { + for (const std::string &x : sol.stdout_lines) { if(YS_REGEX_NS::regex_search(x, m, hole_value_regex)) { std::string loc = m[1].str(); std::string val = m[2].str(); @@ -294,7 +294,7 @@ QbfSolutionType qbf_solve(RTLIL::Module *mod, const QbfSolveOptions &opt) { { const std::string cmd = yosys_smtbmc_exe + " -s z3 -t 1 -g --binary " + (opt.dump_final_smt2? "--dump-smt2 " + opt.dump_final_smt2_file + " " : "") + tempdir_name + "/problem.smt2 2>&1"; auto process_line = [&ret, &smtbmc_warning, &show_smtbmc](const std::string &line) { - ret.stdout.push_back(line.substr(0, line.size()-1)); //don't include trailing newline + ret.stdout_lines.push_back(line.substr(0, line.size()-1)); //don't include trailing newline auto warning_pos = line.find(smtbmc_warning); if (warning_pos != std::string::npos) log_warning("%s", line.substr(warning_pos + smtbmc_warning.size() + 1).c_str()); |