From 7e66d7c3611d907ea28b140281b472bb1c406be6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 12:00:33 -0600 Subject: Remove additional unneeded tq method conversions --- lib/antlr/antlr/AST.hpp | 4 ++-- lib/antlr/antlr/ASTFactory.hpp | 2 +- lib/antlr/antlr/BaseAST.hpp | 4 ++-- lib/antlr/src/ASTFactory.cpp | 10 +++++----- lib/antlr/src/BaseAST.cpp | 12 ++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'lib/antlr') diff --git a/lib/antlr/antlr/AST.hpp b/lib/antlr/antlr/AST.hpp index b14b123b..b01a60a9 100644 --- a/lib/antlr/antlr/AST.hpp +++ b/lib/antlr/antlr/AST.hpp @@ -63,10 +63,10 @@ public: /// Add a node to the end of the child list for this node virtual void addChild(RefAST c) = 0; - /// Get the number of tqchildren. Returns 0 if the node is a leaf + /// Get the number of children. Returns 0 if the node is a leaf virtual size_t getNumberOfChildren() const = 0; - /// Get the first child of this node; null if no tqchildren + /// Get the first child of this node; null if no children virtual RefAST getFirstChild() const = 0; /// Get the next sibling in line after this one virtual RefAST getNextSibling() const = 0; diff --git a/lib/antlr/antlr/ASTFactory.hpp b/lib/antlr/antlr/ASTFactory.hpp index 0fb78dc1..968ab6c5 100644 --- a/lib/antlr/antlr/ASTFactory.hpp +++ b/lib/antlr/antlr/ASTFactory.hpp @@ -86,7 +86,7 @@ public: RefAST dupTree(RefAST t); /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null tqchildren nodes correctly. + * a simple list not a tree. Handles null children nodes correctly. * For example, make(a, b, null, c) yields tree (a b c). make(null,a,b) * yields tree (nil a b). */ diff --git a/lib/antlr/antlr/BaseAST.hpp b/lib/antlr/antlr/BaseAST.hpp index 3a88db32..1bfc4e56 100644 --- a/lib/antlr/antlr/BaseAST.hpp +++ b/lib/antlr/antlr/BaseAST.hpp @@ -96,7 +96,7 @@ public: */ virtual size_t getNumberOfChildren() const; - /// Get the first child of this node; null if no tqchildren + /// Get the first child of this node; null if no children virtual RefAST getFirstChild() const { return RefAST(down); @@ -118,7 +118,7 @@ public: return 0; } - /// Remove all tqchildren + /// Remove all children virtual void removeChildren() { down = static_cast(static_cast(nullAST)); diff --git a/lib/antlr/src/ASTFactory.cpp b/lib/antlr/src/ASTFactory.cpp index a255ca10..98ce6b7a 100644 --- a/lib/antlr/src/ASTFactory.cpp +++ b/lib/antlr/src/ASTFactory.cpp @@ -217,7 +217,7 @@ RefAST ASTFactory::dupList(RefAST t) RefAST ASTFactory::dupTree(RefAST t) { RefAST result = dup(t); // make copy of root - // copy all tqchildren of root. + // copy all children of root. if( t ) result->setFirstChild( dupList(t->getFirstChild()) ); return result; @@ -225,7 +225,7 @@ RefAST ASTFactory::dupTree(RefAST t) /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null tqchildren nodes correctly. + * a simple list not a tree. Handles null children nodes correctly. * For example, make(a, b, null, c) yields tree (a b c). make(null,a,b) * yields tree (nil a b). */ @@ -240,7 +240,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector& nodes) if( root ) root->setFirstChild(RefAST(nullASTptr)); // don't leave any old pointers set - // link in tqchildren; + // link in children; for( unsigned int i = 1; i < nodes.size(); i++ ) { if ( nodes[i] == 0 ) // ignore null nodes @@ -336,7 +336,7 @@ void ASTFactory::loadChildren( ANTLR_USE_NAMESPACE(std)istream& infile, { char ch; - for(;;) // for all tqchildren of this node.... + for(;;) // for all children of this node.... { eatwhite(infile); @@ -438,7 +438,7 @@ RefAST ASTFactory::LoadAST( ANTLR_USE_NAMESPACE(std)istream& infile ) infile.get(ch); // now if we have a '/' here it's a single node. If it's a '>' we get - // a tree with tqchildren + // a tree with children if( ch == '/' ) { diff --git a/lib/antlr/src/BaseAST.cpp b/lib/antlr/src/BaseAST.cpp index 17d8de68..f10f1e16 100644 --- a/lib/antlr/src/BaseAST.cpp +++ b/lib/antlr/src/BaseAST.cpp @@ -47,7 +47,7 @@ void BaseAST::doWorkForFindAll( (!partialMatch && sibling->equalsTree(target)) ) { v.push_back(sibling); } - // regardless of match or not, check any tqchildren for matches + // regardless of match or not, check any children for matches if ( sibling->getFirstChild() ) { RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch); } @@ -70,7 +70,7 @@ bool BaseAST::equalsList(RefAST t) const // as a quick optimization, check roots first. if (!sibling->equals(t)) return false; - // if roots match, do full list match test on tqchildren. + // if roots match, do full list match test on children. if (sibling->getFirstChild()) { if (!sibling->getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -103,7 +103,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const // as a quick optimization, check roots first. if (!sibling->equals(sub)) return false; - // if roots match, do partial list match test on tqchildren. + // if roots match, do partial list match test on children. if (sibling->getFirstChild()) if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; @@ -125,7 +125,7 @@ bool BaseAST::equalsTree(RefAST t) const // check roots first if (!equals(t)) return false; - // if roots match, do full list match test on tqchildren. + // if roots match, do full list match test on children. if (getFirstChild()) { if (!getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -149,7 +149,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const // check roots first if (!equals(sub)) return false; - // if roots match, do full list partial match test on tqchildren. + // if roots match, do full list partial match test on children. if (getFirstChild()) if (!getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; @@ -256,7 +256,7 @@ void BaseAST::toStream( ANTLR_USE_NAMESPACE(std)ostream& out ) const if( need_close_tag ) { - // got tqchildren so write them... + // got children so write them... if( node->getFirstChild() != 0 ) node->getFirstChild()->toStream( out ); -- cgit v1.2.1