summaryrefslogtreecommitdiffstats
path: root/lib/antlr/src
diff options
context:
space:
mode:
Diffstat (limited to 'lib/antlr/src')
-rw-r--r--lib/antlr/src/ASTFactory.cpp10
-rw-r--r--lib/antlr/src/BaseAST.cpp12
-rw-r--r--lib/antlr/src/Makefile.am2
-rw-r--r--lib/antlr/src/TokenStreamBasicFilter.cpp4
-rw-r--r--lib/antlr/src/TokenStreamHiddenTokenFilter.cpp4
5 files changed, 16 insertions, 16 deletions
diff --git a/lib/antlr/src/ASTFactory.cpp b/lib/antlr/src/ASTFactory.cpp
index 98ce6b7a..a255ca10 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 children of root.
+ // copy all tqchildren 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 children nodes correctly.
+ * a simple list not a tree. Handles null tqchildren 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<RefAST>& nodes)
if( root )
root->setFirstChild(RefAST(nullASTptr)); // don't leave any old pointers set
- // link in children;
+ // link in tqchildren;
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 children of this node....
+ for(;;) // for all tqchildren 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 children
+ // a tree with tqchildren
if( ch == '/' )
{
diff --git a/lib/antlr/src/BaseAST.cpp b/lib/antlr/src/BaseAST.cpp
index f10f1e16..17d8de68 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 children for matches
+ // regardless of match or not, check any tqchildren 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 children.
+ // if roots match, do full list match test on tqchildren.
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 children.
+ // if roots match, do partial list match test on tqchildren.
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 children.
+ // if roots match, do full list match test on tqchildren.
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 children.
+ // if roots match, do full list partial match test on tqchildren.
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 children so write them...
+ // got tqchildren so write them...
if( node->getFirstChild() != 0 )
node->getFirstChild()->toStream( out );
diff --git a/lib/antlr/src/Makefile.am b/lib/antlr/src/Makefile.am
index b1af9fca..3d3b94af 100644
--- a/lib/antlr/src/Makefile.am
+++ b/lib/antlr/src/Makefile.am
@@ -1,6 +1,6 @@
# Make #include <antlr/xxx> work..
-INCLUDES = -I$(srcdir)/..
+INCLUDES = -I$(srcdir)/.. $(all_includes)
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
noinst_LTLIBRARIES = libantlr.la
diff --git a/lib/antlr/src/TokenStreamBasicFilter.cpp b/lib/antlr/src/TokenStreamBasicFilter.cpp
index 982e8645..ac6156da 100644
--- a/lib/antlr/src/TokenStreamBasicFilter.cpp
+++ b/lib/antlr/src/TokenStreamBasicFilter.cpp
@@ -24,9 +24,9 @@ void TokenStreamBasicFilter::discard(int ttype)
discardMask.add(ttype);
}
-void TokenStreamBasicFilter::discard(const BitSet& mask)
+void TokenStreamBasicFilter::discard(const BitSet& tqmask)
{
- discardMask = mask;
+ discardMask = tqmask;
}
RefToken TokenStreamBasicFilter::nextToken()
diff --git a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp
index 431df0c3..90d48d5a 100644
--- a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp
+++ b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp
@@ -94,9 +94,9 @@ void TokenStreamHiddenTokenFilter::hide(int m)
hideMask.add(m);
}
-void TokenStreamHiddenTokenFilter::hide(const BitSet& mask)
+void TokenStreamHiddenTokenFilter::hide(const BitSet& tqmask)
{
- hideMask = mask;
+ hideMask = tqmask;
}
RefToken TokenStreamHiddenTokenFilter::LA(int)