Unverified Commit dfde6d07 authored by Umang Yadav's avatar Umang Yadav Committed by GitHub
Browse files

Fix compile warnings for shadowing variable names (#1825)

parent 26aabd2a
......@@ -135,14 +135,14 @@ template <class M>
auto bind_match(M m, std::string name)
{
return make_function_matcher(
[=, name = std::move(name)](matcher_context& ctx,
[=, m_name = std::move(name)](matcher_context& ctx,
instruction_ref ins) -> optional<instruction_ref> {
auto result = m.match(ctx, ins);
if(result)
{
if(not ctx.has_instruction(ins))
return nullopt;
ctx.instructions[name] = ins;
ctx.instructions[m_name] = ins;
}
return result;
});
......@@ -655,9 +655,9 @@ auto skip_output(Ms... ms)
inline auto var(std::string s)
{
return make_basic_fun_matcher(
[=, s = std::move(s)](const matcher_context& ctx,
[=, m_s = std::move(s)](const matcher_context& ctx,
instruction_ref) -> optional<instruction_ref> {
auto it = ctx.instructions.find(s);
auto it = ctx.instructions.find(m_s);
if(it == ctx.instructions.end())
return nullopt;
return it->second;
......@@ -667,7 +667,7 @@ inline auto var(std::string s)
inline auto name(std::string s)
{
return make_basic_pred_matcher(
[=, s = std::move(s)](instruction_ref ins) { return ins->name() == s; });
[=, m_s = std::move(s)](instruction_ref ins) { return ins->name() == m_s; });
}
inline auto name_contains(const std::string& name)
......@@ -678,8 +678,8 @@ inline auto name_contains(const std::string& name)
inline auto name(std::unordered_set<std::string> names)
{
return make_basic_pred_matcher([=, names = std::move(names)](instruction_ref ins) {
return names.count(ins->name()) > 0;
return make_basic_pred_matcher([=, m_names = std::move(names)](instruction_ref ins) {
return m_names.count(ins->name()) > 0;
});
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment