diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2020-02-26 19:11:31 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-26 19:11:31 -0600 |
commit | d41d2a817f884e0f6c8d5cb3b87b4298bc1b56f5 (patch) | |
tree | 5cfe4336c5aa40cac613238a2625b1fb4aa55d31 /src/smt_util | |
parent | 4b7de240edeee362a0b9ca440c22a8b0744cf34b (diff) |
Initial work towards -Wshadow (#3817)
Diffstat (limited to 'src/smt_util')
-rw-r--r-- | src/smt_util/node_visitor.h | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/smt_util/node_visitor.h b/src/smt_util/node_visitor.h index 58070c0b2..47ed6eff8 100644 --- a/src/smt_util/node_visitor.h +++ b/src/smt_util/node_visitor.h @@ -59,13 +59,15 @@ public: */ struct stack_element { /** The node to be visited */ - TNode node; + TNode d_node; /** The parent of the node */ - TNode parent; + TNode d_parent; /** Have the children been queued up for visitation */ - bool children_added; + bool d_childrenAdded; stack_element(TNode node, TNode parent) - : node(node), parent(parent), children_added(false) {} + : d_node(node), d_parent(parent), d_childrenAdded(false) + { + } };/* struct preprocess_stack_element */ /** @@ -84,20 +86,24 @@ public: while (!toVisit.empty()) { stack_element& stackHead = toVisit.back(); // The current node we are processing - TNode current = stackHead.node; - TNode parent = stackHead.parent; + TNode current = stackHead.d_node; + TNode parent = stackHead.d_parent; if (visitor.alreadyVisited(current, parent)) { // If already visited, we're done toVisit.pop_back(); - } else if (stackHead.children_added) { + } + else if (stackHead.d_childrenAdded) + { // Call the visitor visitor.visit(current, parent); // Done with this node, remove from the stack toVisit.pop_back(); - } else { + } + else + { // Mark that we have added the children - stackHead.children_added = true; + stackHead.d_childrenAdded = true; // We need to add the children for(TNode::iterator child_it = current.begin(); child_it != current.end(); ++ child_it) { TNode childNode = *child_it; |