From: Christopher L. Conway Date: Mon, 5 Apr 2010 14:28:41 +0000 (+0000) Subject: Typos and renames for code review X-Git-Tag: cvc5-1.0.0~9136 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=342c81e52224be3afc255a8a719747fa5eafdb32;p=cvc5.git Typos and renames for code review --- diff --git a/src/expr/node_manager.cpp b/src/expr/node_manager.cpp index e735b7f09..d953907ae 100644 --- a/src/expr/node_manager.cpp +++ b/src/expr/node_manager.cpp @@ -113,7 +113,7 @@ void NodeManager::reclaimZombies() { // NodeValue's children, which may (recursively) reclaim them. // // Let's say we're reclaiming zombie NodeValue "A" and its child "B" - // then becomes a zombie (NodeManager::gc(B) is called). + // then becomes a zombie (NodeManager::markForDeletion(B) is called). // // One way to handle B's zombification would be simply to put it // into d_zombies. This is what we do. However, if we were to diff --git a/src/expr/node_manager.h b/src/expr/node_manager.h index 04d2ddac7..83f28a842 100644 --- a/src/expr/node_manager.h +++ b/src/expr/node_manager.h @@ -106,7 +106,7 @@ class NodeManager { /** * Look up a NodeValue in the pool associated to this NodeManager. * The NodeValue argument need not be a "completely-constructed" - * NodeValue. In particular, "non-inlined" constants are permited + * NodeValue. In particular, "non-inlined" constants are permitted * (see below). * * For non-CONSTANT metakinds, nv's d_kind and d_nchildren should be @@ -155,7 +155,7 @@ class NodeManager { /** * Register a NodeValue as a zombie. */ - inline void gc(expr::NodeValue* nv) { + inline void markForDeletion(expr::NodeValue* nv) { Assert(nv->d_rc == 0); // if d_reclaiming is set, make sure we don't call // reclaimZombies(), because it's already running. @@ -532,7 +532,7 @@ public: // of Expr functions, it needs to set the current NodeManager // correctly (and to do that it needs access to // ExprManager::getNodeManager()). So, we make ExprManagerScope a -// friend of ExprManager's, since it's implementation is simple to +// friend of ExprManager's, since its implementation is simple to // read and understand (and verify that it doesn't do any mischief). // // ExprManager::getNodeManager() can't just be made public, since diff --git a/src/expr/node_value.h b/src/expr/node_value.h index 9e8854e8f..a998dd8e4 100644 --- a/src/expr/node_value.h +++ b/src/expr/node_value.h @@ -296,7 +296,7 @@ inline void NodeValue::dec() { Assert(NodeManager::currentNM() != NULL, "No current NodeManager on destruction of NodeValue: " "maybe a public CVC4 interface function is missing a NodeManagerScope ?"); - NodeManager::currentNM()->gc(this); + NodeManager::currentNM()->markForDeletion(this); } } }