diff options
| author | Mathias Preiner <mathias.preiner@gmail.com> | 2020-03-05 11:42:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 11:42:54 -0800 |
| commit | 04039407e6308070c148de0d5e93640ec1b0a341 (patch) | |
| tree | b66f63d49df0713b1ca2a440bec89f1d60af32a4 /src/theory/sets | |
| parent | 18fe192c29a9a2c37d1925730af01e906b9888c5 (diff) | |
Enable -Wshadow and fix warnings. (#3909)
Fixes all -Wshadow warnings and enables the -Wshadow compile flag globally.
Co-authored-by: Clark Barrett <barrett@cs.stanford.edu>
Co-authored-by: Andres Noetzli <andres.noetzli@gmail.com>
Co-authored-by: Aina Niemetz <aina.niemetz@gmail.com>
Co-authored-by: Alex Ozdemir <aozdemir@hmc.edu>
Co-authored-by: makaimann <makaim@stanford.edu>
Co-authored-by: yoni206 <yoni206@users.noreply.github.com>
Co-authored-by: Andrew Reynolds <andrew.j.reynolds@gmail.com>
Co-authored-by: AleksandarZeljic <zeljic@stanford.edu>
Co-authored-by: Caleb Donovick <cdonovick@users.noreply.github.com>
Co-authored-by: Amalee <amaleewilson@gmail.com>
Co-authored-by: Scott Kovach <dskovach@gmail.com>
Co-authored-by: ntsis <nekuna@gmail.com>
Diffstat (limited to 'src/theory/sets')
| -rw-r--r-- | src/theory/sets/theory_sets_private.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/theory/sets/theory_sets_private.cpp b/src/theory/sets/theory_sets_private.cpp index 1a798414e..866c80863 100644 --- a/src/theory/sets/theory_sets_private.cpp +++ b/src/theory/sets/theory_sets_private.cpp @@ -304,24 +304,25 @@ bool TheorySetsPrivate::assertFact(Node fact, Node exp) Node s = e->d_singleton; if (!s.isNull()) { - Node exp = NodeManager::currentNM()->mkNode( + Node pexp = NodeManager::currentNM()->mkNode( kind::AND, atom, atom[1].eqNode(s)); - d_keep.insert(exp); + d_keep.insert(pexp); if (s.getKind() == kind::SINGLETON) { if (s[0] != atom[0]) { - Trace("sets-prop") << "Propagate mem-eq : " << exp << std::endl; + Trace("sets-prop") + << "Propagate mem-eq : " << pexp << std::endl; Node eq = s[0].eqNode(atom[0]); d_keep.insert(eq); - assertFact(eq, exp); + assertFact(eq, pexp); } } else { Trace("sets-prop") - << "Propagate mem-eq conflict : " << exp << std::endl; - d_state.setConflict(exp); + << "Propagate mem-eq conflict : " << pexp << std::endl; + d_state.setConflict(pexp); } } } @@ -774,8 +775,8 @@ void TheorySetsPrivate::checkUpwardsClosure() std::vector<Node> exp; exp.push_back(itm2m.second); d_state.addEqualityToExp(term[1], itm2m.second[1], exp); - Node k = d_state.getProxy(term); - Node fact = nm->mkNode(kind::MEMBER, x, k); + Node r = d_state.getProxy(term); + Node fact = nm->mkNode(kind::MEMBER, x, r); d_im.assertInference(fact, exp, "upc2"); if (d_state.isInConflict()) { |