sboag 00/02/29 18:54:16
Modified: src/org/apache/xalan/xpath XPathProcessorImpl.java
Log:
Fixed a bunch of the m_xpath.CONSTANT stuff.
Revision Changes Path
1.24 +180 -180
xml-xalan/src/org/apache/xalan/xpath/XPathProcessorImpl.java
Index: XPathProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/XPathProcessorImpl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XPathProcessorImpl.java 2000/02/29 23:17:42 1.23
+++ XPathProcessorImpl.java 2000/03/01 02:54:15 1.24
@@ -169,8 +169,8 @@
m_xpath = pathObj;
m_namespaceContext = namespaceContext;
tokenize( expression );
- m_xpath.m_opMap[0] = m_xpath.OP_XPATH;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] = 2;
+ m_xpath.m_opMap[0] = XPath.OP_XPATH;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] = 2;
nextToken();
Expr();
if(null != m_token)
@@ -206,8 +206,8 @@
m_xpath = pathObj;
m_namespaceContext = namespaceContext;
tokenize( expression );
- m_xpath.m_opMap[0] = m_xpath.OP_MATCHPATTERN;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] = 2;
+ m_xpath.m_opMap[0] = XPath.OP_MATCHPATTERN;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] = 2;
nextToken();
Pattern();
if(null != m_token)
@@ -223,8 +223,8 @@
error(XPATHErrorResources.ER_EXTRA_ILLEGAL_TOKENS, new Object[]
{extraTokens}); //"Extra illegal tokens: "+extraTokens);
}
// Terminate for safety.
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_xpath.ENDOP;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = XPath.ENDOP;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
m_xpath.shrink();
}
@@ -1362,13 +1362,13 @@
*/
void insertOp(int pos, int length, int op)
{
- int totalLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int totalLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
for(int i = totalLen - 1; i >= pos; i--)
{
m_xpath.m_opMap[i+length] = m_xpath.m_opMap[i];
}
m_xpath.m_opMap[pos] = op;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] = totalLen + length;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] = totalLen + length;
}
/**
@@ -1378,10 +1378,10 @@
*/
void appendOp(int length, int op)
{
- int totalLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int totalLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
m_xpath.m_opMap[totalLen] = op;
- m_xpath.m_opMap[totalLen+m_xpath.MAPINDEX_LENGTH] = length;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] = totalLen + length;
+ m_xpath.m_opMap[totalLen+XPath.MAPINDEX_LENGTH] = length;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] = totalLen + length;
}
// ============= EXPRESSIONS FUNCTIONS =================
@@ -1409,15 +1409,15 @@
protected void OrExpr()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
AndExpr();
if((null != m_token) && tokenIs("or"))
{
nextToken();
- insertOp(opPos, 2, m_xpath.OP_OR);
+ insertOp(opPos, 2, XPath.OP_OR);
OrExpr();
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH]
- = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH]
+ = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
}
@@ -1431,14 +1431,14 @@
protected void AndExpr()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
EqualityExpr(-1);
if((null != m_token) && tokenIs("and"))
{
nextToken();
- insertOp(opPos, 2, m_xpath.OP_AND);
+ insertOp(opPos, 2, XPath.OP_AND);
AndExpr();
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
}
@@ -1454,7 +1454,7 @@
protected int EqualityExpr(int addPos)
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
if(-1 == addPos)
addPos = opPos;
RelationalExpr(-1);
@@ -1464,20 +1464,20 @@
{
nextToken();
nextToken();
- insertOp(addPos, 2, m_xpath.OP_NOTEQUALS);
- int opPlusLeftHandLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] -
addPos;
+ insertOp(addPos, 2, XPath.OP_NOTEQUALS);
+ int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] -
addPos;
addPos = EqualityExpr(addPos);
- m_xpath.m_opMap[addPos + m_xpath.MAPINDEX_LENGTH]
+ m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
= m_xpath.m_opMap[addPos+opPlusLeftHandLen+1] + opPlusLeftHandLen;
addPos+=2;
}
else if(tokenIs('='))
{
nextToken();
- insertOp(addPos, 2, m_xpath.OP_EQUALS);
- int opPlusLeftHandLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] -
addPos;
+ insertOp(addPos, 2, XPath.OP_EQUALS);
+ int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] -
addPos;
addPos = EqualityExpr(addPos);
- m_xpath.m_opMap[addPos + m_xpath.MAPINDEX_LENGTH]
+ m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
= m_xpath.m_opMap[addPos+opPlusLeftHandLen+1] + opPlusLeftHandLen;
addPos+=2;
}
@@ -1500,7 +1500,7 @@
protected int RelationalExpr(int addPos)
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
if(-1 == addPos)
addPos = opPos;
AdditiveExpr(-1);
@@ -1512,15 +1512,15 @@
if(tokenIs('='))
{
nextToken();
- insertOp(addPos, 2, m_xpath.OP_LTE);
+ insertOp(addPos, 2, XPath.OP_LTE);
}
else
{
- insertOp(addPos, 2, m_xpath.OP_LT);
+ insertOp(addPos, 2, XPath.OP_LT);
}
- int opPlusLeftHandLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] -
addPos;
+ int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] -
addPos;
addPos = RelationalExpr(addPos);
- m_xpath.m_opMap[addPos + m_xpath.MAPINDEX_LENGTH]
+ m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
= m_xpath.m_opMap[addPos+opPlusLeftHandLen+1] + opPlusLeftHandLen;
addPos+=2;
}
@@ -1530,15 +1530,15 @@
if(tokenIs('='))
{
nextToken();
- insertOp(addPos, 2, m_xpath.OP_GTE);
+ insertOp(addPos, 2, XPath.OP_GTE);
}
else
{
- insertOp(addPos, 2, m_xpath.OP_GT);
+ insertOp(addPos, 2, XPath.OP_GT);
}
- int opPlusLeftHandLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] -
addPos;
+ int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] -
addPos;
addPos = RelationalExpr(addPos);
- m_xpath.m_opMap[addPos + m_xpath.MAPINDEX_LENGTH]
+ m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
= m_xpath.m_opMap[addPos+opPlusLeftHandLen+1] + opPlusLeftHandLen;
addPos+=2;
}
@@ -1563,7 +1563,7 @@
protected int AdditiveExpr(int addPos)
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
if(-1 == addPos)
addPos = opPos;
MultiplicativeExpr(-1);
@@ -1572,20 +1572,20 @@
if(tokenIs('+'))
{
nextToken();
- insertOp(addPos, 2, m_xpath.OP_PLUS);
- int opPlusLeftHandLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] -
addPos;
+ insertOp(addPos, 2, XPath.OP_PLUS);
+ int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] -
addPos;
addPos = AdditiveExpr(addPos);
- m_xpath.m_opMap[addPos + m_xpath.MAPINDEX_LENGTH]
+ m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
= m_xpath.m_opMap[addPos+opPlusLeftHandLen+1] + opPlusLeftHandLen;
addPos+=2;
}
else if(tokenIs('-'))
{
nextToken();
- insertOp(addPos, 2, m_xpath.OP_MINUS);
- int opPlusLeftHandLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] -
addPos;
+ insertOp(addPos, 2, XPath.OP_MINUS);
+ int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] -
addPos;
addPos = AdditiveExpr(addPos);
- m_xpath.m_opMap[addPos + m_xpath.MAPINDEX_LENGTH]
+ m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
= m_xpath.m_opMap[addPos+opPlusLeftHandLen+1] + opPlusLeftHandLen;
addPos+=2;
}
@@ -1612,7 +1612,7 @@
protected int MultiplicativeExpr(int addPos)
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
if(-1 == addPos)
addPos = opPos;
UnaryExpr();
@@ -1621,40 +1621,40 @@
if(tokenIs('*'))
{
nextToken();
- insertOp(opPos, 2, m_xpath.OP_MULT);
- int opPlusLeftHandLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] -
addPos;
+ insertOp(opPos, 2, XPath.OP_MULT);
+ int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] -
addPos;
addPos = MultiplicativeExpr(addPos);
- m_xpath.m_opMap[addPos + m_xpath.MAPINDEX_LENGTH]
+ m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
= m_xpath.m_opMap[addPos+opPlusLeftHandLen+1] + opPlusLeftHandLen;
addPos+=2;
}
else if(tokenIs("div"))
{
nextToken();
- insertOp(opPos, 2, m_xpath.OP_DIV);
- int opPlusLeftHandLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] -
addPos;
+ insertOp(opPos, 2, XPath.OP_DIV);
+ int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] -
addPos;
addPos = MultiplicativeExpr(addPos);
- m_xpath.m_opMap[addPos + m_xpath.MAPINDEX_LENGTH]
+ m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
= m_xpath.m_opMap[addPos+opPlusLeftHandLen+1] + opPlusLeftHandLen;
addPos+=2;
}
else if(tokenIs("mod"))
{
nextToken();
- insertOp(opPos, 2, m_xpath.OP_MOD);
- int opPlusLeftHandLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] -
addPos;
+ insertOp(opPos, 2, XPath.OP_MOD);
+ int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] -
addPos;
addPos = MultiplicativeExpr(addPos);
- m_xpath.m_opMap[addPos + m_xpath.MAPINDEX_LENGTH]
+ m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
= m_xpath.m_opMap[addPos+opPlusLeftHandLen+1] + opPlusLeftHandLen;
addPos+=2;
}
else if(tokenIs("quo"))
{
nextToken();
- insertOp(opPos, 2, m_xpath.OP_QUO);
- int opPlusLeftHandLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] -
addPos;
+ insertOp(opPos, 2, XPath.OP_QUO);
+ int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] -
addPos;
addPos = MultiplicativeExpr(addPos);
- m_xpath.m_opMap[addPos + m_xpath.MAPINDEX_LENGTH]
+ m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
= m_xpath.m_opMap[addPos+opPlusLeftHandLen+1] + opPlusLeftHandLen;
addPos+=2;
}
@@ -1674,17 +1674,17 @@
protected void UnaryExpr()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
boolean isNeg = false;
if(m_tokenChar == '-')
{
nextToken();
- appendOp(2, m_xpath.OP_NEG);
+ appendOp(2, XPath.OP_NEG);
isNeg = true;
}
UnionExpr();
if(isNeg)
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
/**
@@ -1695,10 +1695,10 @@
protected void StringExpr()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
- appendOp(2, m_xpath.OP_STRING);
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
+ appendOp(2, XPath.OP_STRING);
Expr();
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
/**
@@ -1710,15 +1710,15 @@
protected void BooleanExpr()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
- appendOp(2, m_xpath.OP_BOOL);
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
+ appendOp(2, XPath.OP_BOOL);
Expr();
- int opLen = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ int opLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
if(opLen == 2)
{
error(XPATHErrorResources.ER_BOOLEAN_ARG_NO_LONGER_OPTIONAL);
//"boolean(...) argument is no longer optional with 19990709 XPath draft.");
}
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] = opLen;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] = opLen;
}
/**
@@ -1730,10 +1730,10 @@
protected void NumberExpr()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
- appendOp(2, m_xpath.OP_NUMBER);
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
+ appendOp(2, XPath.OP_NUMBER);
Expr();
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
/**
@@ -1750,7 +1750,7 @@
protected void UnionExpr()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
boolean continueOrLoop = true;
boolean foundUnion = false;
do
@@ -1762,7 +1762,7 @@
if(false == foundUnion)
{
foundUnion = true;
- insertOp(opPos, 2, m_xpath.OP_UNION);
+ insertOp(opPos, 2, XPath.OP_UNION);
}
nextToken();
}
@@ -1774,7 +1774,7 @@
// this.m_testForDocOrder = true;
}
while(continueOrLoop);
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
/**
@@ -1851,23 +1851,23 @@
protected void PathExpr()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
boolean foundLocationPath;
FilterExpr();
if(tokenIs('/'))
- {
+ {
nextToken();
int locationPathOpPos = opPos;
- insertOp(opPos, 2, m_xpath.OP_LOCATIONPATH);
+ insertOp(opPos, 2, XPath.OP_LOCATIONPATH);
RelativeLocationPath();
// Terminate for safety.
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_xpath.ENDOP;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = XPath.ENDOP;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
if(isLocationPathSimpleFollowing(m_xpath, locationPathOpPos))
{
m_xpath.m_opMap[locationPathOpPos] = XPath.OP_LOCATIONPATH_EX;
@@ -1887,14 +1887,14 @@
protected void FilterExpr()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
// boolean isFunc = lookahead('(', 1);
PrimaryExpr();
if(tokenIs('['))
{
int locationPathOpPos = opPos;
- insertOp(opPos, 2, m_xpath.OP_LOCATIONPATH);
+ insertOp(opPos, 2, XPath.OP_LOCATIONPATH);
while(tokenIs('['))
{
@@ -1908,10 +1908,10 @@
}
// Terminate for safety.
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_xpath.ENDOP;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = XPath.ENDOP;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
if(isLocationPathSimpleFollowing(m_xpath, locationPathOpPos))
{
m_xpath.m_opMap[locationPathOpPos] = XPath.OP_LOCATIONPATH_EX;
@@ -1922,7 +1922,7 @@
* if(tokenIs('['))
* {
* Predicate();
- * m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ * m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
* }
*/
}
@@ -1939,37 +1939,37 @@
protected void PrimaryExpr()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
if((m_tokenChar == '\'') || (m_tokenChar == '"'))
{
- appendOp(2, m_xpath.OP_LITERAL);
+ appendOp(2, XPath.OP_LITERAL);
Literal();
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
else if(m_tokenChar == '$')
{
nextToken(); // consume '$'
- appendOp(2, m_xpath.OP_VARIABLE);
+ appendOp(2, XPath.OP_VARIABLE);
NCName();
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
else if(m_tokenChar == '(')
{
nextToken();
- appendOp(2, m_xpath.OP_GROUP);
+ appendOp(2, XPath.OP_GROUP);
Expr();
consumeExpected(')');
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
else if((null != m_token) &&
((('.' == m_tokenChar) && (m_token.length() > 1) &&
Character.isDigit( m_token.charAt(1) ))
|| Character.isDigit( m_tokenChar )))
{
- appendOp(2, m_xpath.OP_NUMBERLIT);
+ appendOp(2, XPath.OP_NUMBERLIT);
Number();
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
else if(lookahead('(', 1) || (lookahead(':', 1) && lookahead('(', 3)))
{
@@ -1989,10 +1989,10 @@
protected void Argument()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
- appendOp(2, m_xpath.OP_ARGUMENT);
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
+ appendOp(2, XPath.OP_ARGUMENT);
Expr();
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
/**
@@ -2003,14 +2003,14 @@
protected void FunctionCall()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
if(lookahead(':',1))
{
- appendOp(4, m_xpath.OP_EXTFUNCTION);
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH + 1] = m_queueMark-1;
+ appendOp(4, XPath.OP_EXTFUNCTION);
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH + 1] = m_queueMark-1;
nextToken();
consumeExpected(':');
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH + 2] = m_queueMark-1;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH + 2] = m_queueMark-1;
nextToken();
}
else
@@ -2029,8 +2029,8 @@
LocationPath();
return;
default:
- appendOp(3, m_xpath.OP_FUNCTION);
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH + 1] = funcTok;
+ appendOp(3, XPath.OP_FUNCTION);
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH + 1] = funcTok;
}
nextToken();
}
@@ -2054,10 +2054,10 @@
consumeExpected(')');
// Terminate for safety.
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_xpath.ENDOP;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = XPath.ENDOP;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
// ============= GRAMMAR FUNCTIONS =================
@@ -2072,16 +2072,16 @@
protected void LocationPath()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
int locationPathOpPos = opPos;
- appendOp(2, m_xpath.OP_LOCATIONPATH);
+ appendOp(2, XPath.OP_LOCATIONPATH);
if(tokenIs('/'))
{
- appendOp(4, m_xpath.FROM_ROOT);
+ appendOp(4, XPath.FROM_ROOT);
// Tell how long the step is without the predicate
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - 2] = 4;
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - 1] =
m_xpath.NODETYPE_ROOT;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 2] = 4;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 1] =
XPath.NODETYPE_ROOT;
nextToken();
}
if(m_token != null)
@@ -2090,10 +2090,10 @@
}
// Terminate for safety.
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_xpath.ENDOP;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = XPath.ENDOP;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
if(isLocationPathSimpleFollowing(m_xpath, locationPathOpPos))
{
m_xpath.m_opMap[locationPathOpPos] = XPath.OP_LOCATIONPATH_EX;
@@ -2127,7 +2127,7 @@
protected void Step()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
if(tokenIs("."))
{
@@ -2136,18 +2136,18 @@
{
error(XPATHErrorResources.ER_PREDICATE_ILLEGAL_SYNTAX);
//"'..[predicate]' or '.[predicate]' is illegal syntax. Use
'self::node()[predicate]' instead.");
}
- appendOp(4, m_xpath.FROM_SELF);
+ appendOp(4, XPath.FROM_SELF);
// Tell how long the step is without the predicate
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - 2] = 4;
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - 1] =
m_xpath.NODETYPE_NODE;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 2] = 4;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 1] =
XPath.NODETYPE_NODE;
}
else if(tokenIs(".."))
{
nextToken();
- appendOp(4, m_xpath.FROM_PARENT);
+ appendOp(4, XPath.FROM_PARENT);
// Tell how long the step is without the predicate
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - 2] = 4;
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - 1] =
m_xpath.NODETYPE_NODE;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 2] = 4;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 1] =
XPath.NODETYPE_NODE;
}
else
{
@@ -2159,7 +2159,7 @@
}
// Tell how long the entire step is.
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
}
@@ -2171,7 +2171,7 @@
protected void Basis()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
// The next blocks guarantee that a FROM_XXX will be added.
if(lookahead("::", 1))
@@ -2182,12 +2182,12 @@
}
else if(tokenIs('@'))
{
- appendOp(2, m_xpath.FROM_ATTRIBUTES);
+ appendOp(2, XPath.FROM_ATTRIBUTES);
nextToken();
}
else if(tokenIs('/'))
{
- appendOp(2, m_xpath.FROM_DESCENDANTS_OR_SELF);
+ appendOp(2, XPath.FROM_DESCENDANTS_OR_SELF);
// Have to fix up for patterns such as '//@foo' or '//attribute::foo',
// which translate to 'descendant-or-self::node()/attribute::foo'.
@@ -2196,13 +2196,13 @@
// if(lookahead('@', 1) || lookahead("::", 2))
{
// Make room for telling how long the step is without the predicate
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
XPath.NODETYPE_NODE;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] =
XPath.NODETYPE_NODE;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
// Tell how long the step is without the predicate
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH + 1] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH + 1] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
return; // make a quick exit...
}
@@ -2213,16 +2213,16 @@
}
else
{
- appendOp(2, m_xpath.FROM_CHILDREN);
+ appendOp(2, XPath.FROM_CHILDREN);
}
// Make room for telling how long the step is without the predicate
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
NodeTest();
// Tell how long the step is without the predicate
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH + 1] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH + 1] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
/**
@@ -2262,11 +2262,11 @@
{
nextToken();
int nt = ((Integer)nodeTestOp).intValue();
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] = nt;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = nt;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
consumeExpected('(');
- if(m_xpath.NODETYPE_PI == nt)
+ if(XPath.NODETYPE_PI == nt)
{
if(!tokenIs(')'))
{
@@ -2279,38 +2279,38 @@
else
{
// Assume name of attribute or element.
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_xpath.NODENAME;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] =
XPath.NODENAME;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
if(lookahead(':', 1))
{
if(tokenIs('*'))
{
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]]
- = m_xpath.ELEMWILDCARD;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]]
+ = XPath.ELEMWILDCARD;
}
else
{
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_queueMark-1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] =
m_queueMark-1;
}
nextToken();
consumeExpected(':');
}
else
{
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_xpath.EMPTY;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] =
XPath.EMPTY;
}
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
if(tokenIs('*'))
{
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_xpath.ELEMWILDCARD;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] =
XPath.ELEMWILDCARD;
}
else
{
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_queueMark-1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] =
m_queueMark-1;
}
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
nextToken();
}
}
@@ -2339,15 +2339,15 @@
protected void PredicateExpr()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
- appendOp(2, m_xpath.OP_PREDICATE);
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
+ appendOp(2, XPath.OP_PREDICATE);
Expr();
// Terminate for safety.
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_xpath.ENDOP;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = XPath.ENDOP;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
/**
@@ -2358,12 +2358,12 @@
protected void QName()
throws org.xml.sax.SAXException
{
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_queueMark-1;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = m_queueMark-1;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
nextToken();
consumeExpected(':');
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_queueMark-1;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = m_queueMark-1;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
nextToken();
}
@@ -2373,8 +2373,8 @@
*/
protected void NCName()
{
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_queueMark-1;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = m_queueMark-1;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
nextToken();
}
@@ -2402,8 +2402,8 @@
Object obj = new XString(m_token.substring(1, last));
m_xpath.m_tokenQueue[tokenQueuePos] = obj;
// lit = m_token.substring(1, last);
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
tokenQueuePos;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] =
tokenQueuePos;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
nextToken();
}
else
@@ -2437,8 +2437,8 @@
m_xpath.m_tokenQueue[m_queueMark-1]
= new XNumber(num);
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_queueMark - 1;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = m_queueMark
- 1;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
nextToken();
}
}
@@ -2481,18 +2481,18 @@
protected void LocationPathPattern()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
- appendOp(2, m_xpath.OP_LOCATIONPATHPATTERN);
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
+ appendOp(2, XPath.OP_LOCATIONPATHPATTERN);
if(lookahead('(', 1) && (tokenIs(FUNC_ID_STRING) ||
tokenIs(FUNC_KEY_STRING)))
{
IdKeyPattern();
if(tokenIs('/') && lookahead('/', 1))
{
- appendOp(4, m_xpath.MATCH_ANY_ANCESTOR);
+ appendOp(4, XPath.MATCH_ANY_ANCESTOR);
// Tell how long the step is without the predicate
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - 2] = 4;
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - 1] =
m_xpath.NODETYPE_ROOT;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 2] = 4;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 1] =
XPath.NODETYPE_ROOT;
nextToken();
}
}
@@ -2500,15 +2500,15 @@
{
if(lookahead('/', 1))
{
- appendOp(4, m_xpath.MATCH_ANY_ANCESTOR);
+ appendOp(4, XPath.MATCH_ANY_ANCESTOR);
}
else
{
- appendOp(4, m_xpath.FROM_ROOT);
+ appendOp(4, XPath.FROM_ROOT);
}
// Tell how long the step is without the predicate
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - 2] = 4;
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - 1] =
m_xpath.NODETYPE_ROOT;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 2] = 4;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 1] =
XPath.NODETYPE_ROOT;
nextToken();
}
@@ -2518,10 +2518,10 @@
}
// Terminate for safety.
- m_xpath.m_opMap[m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH]] =
m_xpath.ENDOP;
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = XPath.ENDOP;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
/**
@@ -2574,24 +2574,24 @@
protected void AbbreviatedNodeTestStep()
throws org.xml.sax.SAXException
{
- int opPos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
+ int opPos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
// The next blocks guarantee that a MATCH_XXX will be added.
int matchTypePos = -1;
if(tokenIs('@'))
{
- appendOp(2, m_xpath.MATCH_ATTRIBUTE);
+ appendOp(2, XPath.MATCH_ATTRIBUTE);
nextToken();
}
else if(this.lookahead("::", 1))
{
if(tokenIs("attribute"))
{
- appendOp(2, m_xpath.MATCH_ATTRIBUTE);
+ appendOp(2, XPath.MATCH_ATTRIBUTE);
}
else if(tokenIs("child"))
{
- appendOp(2, m_xpath.MATCH_IMMEDIATE_ANCESTOR);
+ appendOp(2, XPath.MATCH_IMMEDIATE_ANCESTOR);
}
else
{
@@ -2602,7 +2602,7 @@
}
else if(tokenIs('/'))
{
- appendOp(2, m_xpath.MATCH_ANY_ANCESTOR);
+ appendOp(2, XPath.MATCH_ANY_ANCESTOR);
nextToken();
}
else
@@ -2611,17 +2611,17 @@
{
nextToken();
}
- matchTypePos = m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH];
- appendOp(2, m_xpath.MATCH_IMMEDIATE_ANCESTOR);
+ matchTypePos = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH];
+ appendOp(2, XPath.MATCH_IMMEDIATE_ANCESTOR);
}
// Make room for telling how long the step is without the predicate
- m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] += 1;
+ m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] += 1;
NodeTest();
// Tell how long the step is without the predicate
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH + 1] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH + 1] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
while(tokenIs('['))
{
@@ -2629,12 +2629,12 @@
}
if((matchTypePos > -1) && tokenIs('/') && lookahead('/', 1))
{
- m_xpath.m_opMap[matchTypePos] = m_xpath.MATCH_ANY_ANCESTOR;
+ m_xpath.m_opMap[matchTypePos] = XPath.MATCH_ANY_ANCESTOR;
nextToken();
}
// Tell how long the entire step is.
- m_xpath.m_opMap[opPos + m_xpath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[m_xpath.MAPINDEX_LENGTH] - opPos;
+ m_xpath.m_opMap[opPos + XPath.MAPINDEX_LENGTH] =
m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - opPos;
}
// ============= GRAMMAR FUNCTIONS =================
