From f78838f2f736acc2b235d8b680f3379a07a6d372 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:34 -0600 Subject: Remove additional unneeded tq method conversions --- poxml/antlr/antlr/AST.hpp | 2 +- poxml/antlr/antlr/ASTFactory.hpp | 2 +- poxml/antlr/antlr/BaseAST.hpp | 4 ++-- poxml/antlr/src/ASTFactory.cpp | 6 +++--- poxml/antlr/src/BaseAST.cpp | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'poxml/antlr') diff --git a/poxml/antlr/antlr/AST.hpp b/poxml/antlr/antlr/AST.hpp index 7eb883c2..a36ffd15 100644 --- a/poxml/antlr/antlr/AST.hpp +++ b/poxml/antlr/antlr/AST.hpp @@ -59,7 +59,7 @@ public: virtual ANTLR_USE_NAMESPACE(std)vector findAll(RefAST t)=0; virtual ANTLR_USE_NAMESPACE(std)vector findAllPartial(RefAST t)=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/poxml/antlr/antlr/ASTFactory.hpp b/poxml/antlr/antlr/ASTFactory.hpp index f83bec10..584cee6d 100644 --- a/poxml/antlr/antlr/ASTFactory.hpp +++ b/poxml/antlr/antlr/ASTFactory.hpp @@ -90,7 +90,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, build(a, b, null, c) yields tree (a b c). build(null,a,b) * yields tree (nil a b). */ diff --git a/poxml/antlr/antlr/BaseAST.hpp b/poxml/antlr/antlr/BaseAST.hpp index bf1e1629..7b93c1ef 100644 --- a/poxml/antlr/antlr/BaseAST.hpp +++ b/poxml/antlr/antlr/BaseAST.hpp @@ -70,7 +70,7 @@ public: virtual ANTLR_USE_NAMESPACE(std)vector findAll(RefAST t); virtual ANTLR_USE_NAMESPACE(std)vector findAllPartial(RefAST t); - /** 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; /** Get the next sibling in line after this one */ virtual RefAST getNextSibling() const; @@ -80,7 +80,7 @@ public: /** Get the token type for this node */ virtual int getType() const; - /** Remove all tqchildren */ + /** Remove all children */ virtual void removeChildren(); /** Set the first child of a node. */ diff --git a/poxml/antlr/src/ASTFactory.cpp b/poxml/antlr/src/ASTFactory.cpp index 66902522..e44386f7 100644 --- a/poxml/antlr/src/ASTFactory.cpp +++ b/poxml/antlr/src/ASTFactory.cpp @@ -144,7 +144,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()) ); } @@ -152,7 +152,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, build(a, b, null, c) yields tree (a b c). build(null,a,b) * yields tree (nil a b). */ @@ -165,7 +165,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; iequalsTree(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); } @@ -96,7 +96,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; @@ -129,7 +129,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; @@ -151,7 +151,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; @@ -175,7 +175,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; -- cgit v1.2.3