summaryrefslogtreecommitdiffstats
path: root/poxml/antlr
diff options
context:
space:
mode:
Diffstat (limited to 'poxml/antlr')
-rw-r--r--poxml/antlr/antlr/AST.hpp2
-rw-r--r--poxml/antlr/antlr/ASTFactory.hpp2
-rw-r--r--poxml/antlr/antlr/BaseAST.hpp4
-rw-r--r--poxml/antlr/antlr/TokenStreamBasicFilter.hpp2
-rw-r--r--poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp2
-rw-r--r--poxml/antlr/src/ASTFactory.cpp6
-rw-r--r--poxml/antlr/src/BaseAST.cpp10
-rw-r--r--poxml/antlr/src/CharScanner.cpp2
-rw-r--r--poxml/antlr/src/Makefile.am2
-rw-r--r--poxml/antlr/src/TokenStreamBasicFilter.cpp4
-rw-r--r--poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp4
11 files changed, 20 insertions, 20 deletions
diff --git a/poxml/antlr/antlr/AST.hpp b/poxml/antlr/antlr/AST.hpp
index a36ffd15..7eb883c2 100644
--- a/poxml/antlr/antlr/AST.hpp
+++ b/poxml/antlr/antlr/AST.hpp
@@ -59,7 +59,7 @@ public:
virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAll(RefAST t)=0;
virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAllPartial(RefAST t)=0;
- /** Get the first child of this node; null if no children */
+ /** Get the first child of this node; null if no tqchildren */
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 584cee6d..f83bec10 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 children nodes correctly.
+ * a simple list not a tree. Handles null tqchildren 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 7b93c1ef..bf1e1629 100644
--- a/poxml/antlr/antlr/BaseAST.hpp
+++ b/poxml/antlr/antlr/BaseAST.hpp
@@ -70,7 +70,7 @@ public:
virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAll(RefAST t);
virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAllPartial(RefAST t);
- /** Get the first child of this node; null if no children */
+ /** Get the first child of this node; null if no tqchildren */
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 children */
+ /** Remove all tqchildren */
virtual void removeChildren();
/** Set the first child of a node. */
diff --git a/poxml/antlr/antlr/TokenStreamBasicFilter.hpp b/poxml/antlr/antlr/TokenStreamBasicFilter.hpp
index 5438878b..9857a122 100644
--- a/poxml/antlr/antlr/TokenStreamBasicFilter.hpp
+++ b/poxml/antlr/antlr/TokenStreamBasicFilter.hpp
@@ -25,7 +25,7 @@ public:
void discard(int ttype);
- void discard(const BitSet& mask);
+ void discard(const BitSet& tqmask);
RefToken nextToken();
};
diff --git a/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp b/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp
index 47aad001..b7904ce3 100644
--- a/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp
+++ b/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp
@@ -60,7 +60,7 @@ public:
void hide(int m);
- void hide(const BitSet& mask);
+ void hide(const BitSet& tqmask);
protected:
RefToken LA(int i);
diff --git a/poxml/antlr/src/ASTFactory.cpp b/poxml/antlr/src/ASTFactory.cpp
index e44386f7..66902522 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 children of root.
+ // copy all tqchildren 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 children nodes correctly.
+ * a simple list not a tree. Handles null tqchildren 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<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] ) continue; // ignore null nodes
if ( !root ) {
diff --git a/poxml/antlr/src/BaseAST.cpp b/poxml/antlr/src/BaseAST.cpp
index 4080e0e8..d4b7368b 100644
--- a/poxml/antlr/src/BaseAST.cpp
+++ b/poxml/antlr/src/BaseAST.cpp
@@ -64,7 +64,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);
}
@@ -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 children.
+ // if roots match, do full list match test on tqchildren.
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 children.
+ // if roots match, do partial list match test on tqchildren.
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 children.
+ // if roots match, do full list match test on tqchildren.
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 children.
+ // if roots match, do full list partial match test on tqchildren.
if (getFirstChild())
if (!getFirstChild()->equalsListPartial(sub->getFirstChild()))
return false;
diff --git a/poxml/antlr/src/CharScanner.cpp b/poxml/antlr/src/CharScanner.cpp
index ff40138d..93080338 100644
--- a/poxml/antlr/src/CharScanner.cpp
+++ b/poxml/antlr/src/CharScanner.cpp
@@ -55,7 +55,7 @@ ANTLR_C_USING(exit)
ANTLR_C_USING(tolower)
#ifdef ANTLR_REALLY_NO_STRCASECMP
-// Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior
+// Aptqparently, neither strcasecmp nor stricmp is standard, and Codewarrior
// on the mac has neither...
inline int strcasecmp(const char *s1, const char *s2)
{
diff --git a/poxml/antlr/src/Makefile.am b/poxml/antlr/src/Makefile.am
index 7a5d2426..99008d3b 100644
--- a/poxml/antlr/src/Makefile.am
+++ b/poxml/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/poxml/antlr/src/TokenStreamBasicFilter.cpp b/poxml/antlr/src/TokenStreamBasicFilter.cpp
index 71257f46..82922967 100644
--- a/poxml/antlr/src/TokenStreamBasicFilter.cpp
+++ b/poxml/antlr/src/TokenStreamBasicFilter.cpp
@@ -16,9 +16,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/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp b/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp
index 827ca382..5325fed2 100644
--- a/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp
+++ b/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp
@@ -86,9 +86,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 i)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 21:16:06 +0000