diff options
| author | N. Engelhardt <nak@yosyshq.com> | 2023-01-11 16:05:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 16:05:56 +0100 |
| commit | 41ce00e82a358f9cbb19474be7202899c6af5daa (patch) | |
| tree | ead4a7e07b69dc3acb3d0fb4461da59497052d77 /passes/cmds/exec.cc | |
| parent | 7b476996df962b63656152f643ff2181143f516e (diff) | |
| parent | 4fc5207b1e12d52b247de5f102c2ae9a8518ecc4 (diff) | |
| download | yosys-41ce00e82a358f9cbb19474be7202899c6af5daa.tar.gz yosys-41ce00e82a358f9cbb19474be7202899c6af5daa.tar.bz2 yosys-41ce00e82a358f9cbb19474be7202899c6af5daa.zip | |
Merge pull request #3620 from YosysHQ/gcc48_remove
Diffstat (limited to 'passes/cmds/exec.cc')
| -rw-r--r-- | passes/cmds/exec.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/passes/cmds/exec.cc b/passes/cmds/exec.cc index c15ef23bf..e5fa4fb41 100644 --- a/passes/cmds/exec.cc +++ b/passes/cmds/exec.cc @@ -86,7 +86,7 @@ struct ExecPass : public Pass { bool polarity; //true: this regex must match at least one line //false: this regex must not match any line std::string str; - YS_REGEX_TYPE re; + std::regex re; expect_stdout_elem() : matched(false), polarity(true), str(), re(){}; }; @@ -121,7 +121,7 @@ struct ExecPass : public Pass { x.str = args[argidx]; x.re = YS_REGEX_COMPILE(args[argidx]); expect_stdout.push_back(x); - } catch (const YS_REGEX_NS::regex_error& e) { + } catch (const std::regex_error& e) { log_cmd_error("Error in regex expression '%s' !\n", args[argidx].c_str()); } } else if (args[argidx] == "-not-expect-stdout") { @@ -136,7 +136,7 @@ struct ExecPass : public Pass { x.re = YS_REGEX_COMPILE(args[argidx]); x.polarity = false; expect_stdout.push_back(x); - } catch (const YS_REGEX_NS::regex_error& e) { + } catch (const std::regex_error& e) { log_cmd_error("Error in regex expression '%s' !\n", args[argidx].c_str()); } @@ -171,7 +171,7 @@ struct ExecPass : public Pass { if (flag_expect_stdout) for(auto &x : expect_stdout) - if (YS_REGEX_NS::regex_search(line, x.re)) + if (std::regex_search(line, x.re)) x.matched = true; pos = linebuf.find('\n'); |