You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@locus.apache.org on 2000/03/01 04:01:57 UTC
cvs commit: xml-xalan/src/org/apache/xalan/xpath SimpleNodeLocator.java
sboag 00/02/29 19:01:57
Modified: src/org/apache/xalan/xpath SimpleNodeLocator.java
Log:
Fixed a bunch of the xpath.CONSTANT stuff.
Revision Changes Path
1.16 +76 -76 xml-xalan/src/org/apache/xalan/xpath/SimpleNodeLocator.java
Index: SimpleNodeLocator.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/SimpleNodeLocator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SimpleNodeLocator.java 2000/02/29 23:17:42 1.15
+++ SimpleNodeLocator.java 2000/03/01 03:01:56 1.16
@@ -186,7 +186,7 @@
if(null != doc)
{
int op = xpath.m_opMap[opPos];
- if(xpath.OP_LOCATIONPATH == (op & XPath.LOCATIONPATHEX_MASK))
+ if(XPath.OP_LOCATIONPATH == (op & XPath.LOCATIONPATHEX_MASK))
{
XNodeSet xnl = xpath.locationPath(execContext, doc, opPos, null, null, false);
if(null != xnl)
@@ -238,7 +238,7 @@
opPos = xpath.getFirstChildPos(opPos);
- while((xpath.m_opMap[opPos] & XPath.LOCATIONPATHEX_MASK) == xpath.OP_LOCATIONPATH)
+ while((xpath.m_opMap[opPos] & XPath.LOCATIONPATHEX_MASK) == XPath.OP_LOCATIONPATH)
{
int nextOpPos = xpath.getNextOpPos(opPos);
@@ -312,7 +312,7 @@
/**
* Execute a step and predicates in a location path. This recursivly
* executes each of the steps and predicates.
- * The step can be oneof xpath.OP_VARIABLE, OP_EXTFUNCTION,
+ * The step can be oneof XPath.OP_VARIABLE, OP_EXTFUNCTION,
* OP_FUNCTION, OP_GROUP, FROM_ROOT, FROM_PARENT, FROM_SELF,
* FROM_ANCESTORS, FROM_ANCESTORS_OR_SELF, MATCH_ATTRIBUTE,
* FROM_ATTRIBUTES, MATCH_ANY_ANCESTOR, MATCH_IMMEDIATE_ANCESTOR,
@@ -469,7 +469,7 @@
{
execContext.pushContextNodeList(subQueryResults);
- if(xpath.OP_PREDICATE == nextStepType)
+ if(XPath.OP_PREDICATE == nextStepType)
{
int[] endPredicatesPos =
{
@@ -484,7 +484,7 @@
return null;
XLocator xlocator = this;
- if((xpath.ENDOP != nextStepType) && continueStepRecursion)
+ if((XPath.ENDOP != nextStepType) && continueStepRecursion)
{
int nContexts = subQueryResults.getLength();
for(int i = 0; i < nContexts; i++)
@@ -588,7 +588,7 @@
opPos = xpath.getFirstChildPosOfStep(opPos);
if(argLen > 0)
{
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, context, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, context, opPos, argLen, stepType))
{
// subQueryResults.addNode(context);
if(isSimpleFollowing && (null != callback))
@@ -652,7 +652,7 @@
for( int j=0; j < nAttrs; j++ )
{
Attr attr = (Attr)attributeList.item(j);
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, attr, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, attr, opPos, argLen, stepType))
{
subQueryResults = addNode(subQueryResults, attr);
// If we have an attribute name here, we can quit.
@@ -690,7 +690,7 @@
for( int j=0; j < nAttrs; j++ )
{
Attr attr = (Attr)attributeList.item(j);
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, attr, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, attr, opPos, argLen, stepType))
{
subQueryResults = addNode(subQueryResults, attr);
// If we have an attribute name here, we can quit.
@@ -729,7 +729,7 @@
Node c = context.getFirstChild();
while( null != c )
{
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, c, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, c, opPos, argLen, stepType))
{
// or else call execute method. If no execute method,
// add the node.
@@ -759,7 +759,7 @@
for(int i = 0; i < n; i++)
{
Node c = children.item(i);
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, c, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, c, opPos, argLen, stepType))
{
// subQueryResults.addNode(c);
if(isSimpleFollowing && (null != callback))
@@ -828,7 +828,7 @@
{
if((stepType == XPath.FROM_DESCENDANTS_OR_SELF) || (context != pos))
{
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, pos, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, pos, opPos, argLen, stepType))
{
// subQueryResults.addNode(pos);
if(isSimpleFollowing && (null != callback))
@@ -878,7 +878,7 @@
{
if((stepType == XPath.FROM_DESCENDANTS_OR_SELF) || (!context.equals( pos )))
{
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, pos, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, pos, opPos, argLen, stepType))
{
if(isSimpleFollowing && (null != callback))
{
@@ -955,7 +955,7 @@
Node nextNode;
if(pos != context)
{
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, pos, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, pos, opPos, argLen, stepType))
{
subQueryResults = addNodeInDocOrder(execContext, subQueryResults, pos);
}
@@ -1008,7 +1008,7 @@
Node pos = context.getNextSibling();
while(null != pos)
{
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, pos, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, pos, opPos, argLen, stepType))
{
subQueryResults = addNode(subQueryResults, pos);
}
@@ -1045,7 +1045,7 @@
// a variable or the like, and we may mutate
// below... which results in a hard-to-find bug!
subQueryResults.addNodes(nl);
- return xpath.m_opMap[opPos+xpath.MAPINDEX_LENGTH];
+ return xpath.m_opMap[opPos+XPath.MAPINDEX_LENGTH];
}
/**
@@ -1096,7 +1096,7 @@
opPos = xpath.getFirstChildPosOfStep(opPos);
if(argLen > 0)
{
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, context, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, context, opPos, argLen, stepType))
{
subQueryResults = addNode(subQueryResults, context);
}
@@ -1130,7 +1130,7 @@
opPos = xpath.getFirstChildPosOfStep(opPos);
while(null != context)
{
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, context, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, context, opPos, argLen, stepType))
{
subQueryResults = addNode(subQueryResults, context);
}
@@ -1160,7 +1160,7 @@
opPos = xpath.getFirstChildPosOfStep(opPos);
while(null != context)
{
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, context, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, context, opPos, argLen, stepType))
{
subQueryResults = addNode(subQueryResults, context);
}
@@ -1205,7 +1205,7 @@
if(context.equals( pos ))
break;
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, pos, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, pos, opPos, argLen, stepType))
{
// Ugh. If I could think a little better tonight, I'm
// sure there's a better way to check for the parent.
@@ -1273,7 +1273,7 @@
Node pos = context.getPreviousSibling();
while(null != pos)
{
- if(xpath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, pos, opPos, argLen, stepType))
+ if(XPath.MATCH_SCORE_NONE != nodeTest(xpath, execContext, pos, opPos, argLen, stepType))
{
subQueryResults = addNode(subQueryResults, pos);
}
@@ -1314,7 +1314,7 @@
boolean shouldNotFilter = true;
int nextStepType = xpath.m_opMap[opPos];
- if(xpath.OP_PREDICATE == nextStepType)
+ if(XPath.OP_PREDICATE == nextStepType)
{
execContext.pushDummyXPathContext();
try
@@ -1354,7 +1354,7 @@
{
boolean hasNulls = false;
int nextStepType = xpath.m_opMap[opPos];
- while(xpath.OP_PREDICATE == nextStepType)
+ while(XPath.OP_PREDICATE == nextStepType)
{
int nContexts = subQueryResults.getLength();
for(int i = 0; i < nContexts; i++)
@@ -1376,7 +1376,7 @@
}
opPos = xpath.getNextOpPos(opPos);
nextStepType = xpath.m_opMap[opPos];
- if(xpath.OP_PREDICATE == nextStepType)
+ if(XPath.OP_PREDICATE == nextStepType)
{
// This will reconstruct the node list without the nulls.
subQueryResults = new MutableNodeListImpl(subQueryResults);
@@ -1413,7 +1413,7 @@
opPos = xpath.getFirstChildPos(opPos);
double[] scoreHolder =
{
- xpath.MATCH_SCORE_NONE};
+ XPath.MATCH_SCORE_NONE};
stepPattern(xpath, execContext, context, opPos, scoreHolder);
return scoreHolder[0];
}
@@ -1435,16 +1435,16 @@
int nextStepType = xpath.m_opMap[endStep];
double score;
- if(xpath.ENDOP != nextStepType)
+ if(XPath.ENDOP != nextStepType)
{
// Continue step via recursion...
context = stepPattern(xpath, execContext, context, endStep, scoreHolder);
if(null == context)
- scoreHolder[0] = xpath.MATCH_SCORE_NONE;
- if(scoreHolder[0] == xpath.MATCH_SCORE_NONE)
+ scoreHolder[0] = XPath.MATCH_SCORE_NONE;
+ if(scoreHolder[0] == XPath.MATCH_SCORE_NONE)
return null;
- scoreHolder[0] = xpath.MATCH_SCORE_OTHER;
+ scoreHolder[0] = XPath.MATCH_SCORE_OTHER;
context = execContext.getParentOfNode(context);
if(null == context)
return null;
@@ -1456,16 +1456,16 @@
{
case XPath.OP_FUNCTION:
{
- argLen = xpath.m_opMap[opPos+xpath.MAPINDEX_LENGTH];
+ argLen = xpath.m_opMap[opPos+XPath.MAPINDEX_LENGTH];
XObject obj = xpath.execute(execContext, context, opPos);
NodeList nl = obj.nodeset();
int len = nl.getLength();
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
for(int i = 0; i < len; i++)
{
Node n = nl.item(i);
- score = (n.equals(context)) ? xpath.MATCH_SCORE_OTHER : xpath.MATCH_SCORE_NONE;
- if(score == xpath.MATCH_SCORE_OTHER)
+ score = (n.equals(context)) ? XPath.MATCH_SCORE_OTHER : XPath.MATCH_SCORE_NONE;
+ if(score == XPath.MATCH_SCORE_OTHER)
{
context = n;
break;
@@ -1479,8 +1479,8 @@
opPos = xpath.getFirstChildPosOfStep(opPos);
Document docContext = (Node.DOCUMENT_NODE == context.getNodeType())
? (Document)context : context.getOwnerDocument();
- score = (docContext.equals( context )) ? xpath.MATCH_SCORE_OTHER : xpath.MATCH_SCORE_NONE;
- if(score == xpath.MATCH_SCORE_OTHER)
+ score = (docContext.equals( context )) ? XPath.MATCH_SCORE_OTHER : XPath.MATCH_SCORE_NONE;
+ if(score == XPath.MATCH_SCORE_OTHER)
{
context = docContext;
}
@@ -1498,11 +1498,11 @@
if(context.getNodeType() != Node.ATTRIBUTE_NODE)
{
opPos = xpath.getFirstChildPosOfStep(opPos);
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
while(null != context)
{
score = nodeTest(xpath, execContext, context, opPos, argLen, stepType);
- if(xpath.MATCH_SCORE_NONE != score)
+ if(XPath.MATCH_SCORE_NONE != score)
break;
// context = execContext.getParentOfNode(context);
context = context.getParentNode();
@@ -1510,7 +1510,7 @@
}
else
{
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
}
break;
case XPath.MATCH_IMMEDIATE_ANCESTOR:
@@ -1522,22 +1522,22 @@
}
else
{
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
}
break;
default:
argLen = xpath.getArgLengthOfStep(opPos);
opPos = xpath.getFirstChildPosOfStep(opPos);
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
xpath.error(context, XPATHErrorResources.ER_UNKNOWN_MATCH_OPERATION); //"unknown match operation!");
break;
}
opPos += argLen;
nextStepType = xpath.m_opMap[opPos];
- if(((score != xpath.MATCH_SCORE_NONE)) && (xpath.OP_PREDICATE == nextStepType))
+ if(((score != XPath.MATCH_SCORE_NONE)) && (XPath.OP_PREDICATE == nextStepType))
{
- score = xpath.MATCH_SCORE_OTHER;
+ score = XPath.MATCH_SCORE_OTHER;
// Execute the xpath.predicates, but if we have an index, then we have
// to start over and do a search from the parent. It would be nice
// if I could sense this condition earlier...
@@ -1548,7 +1548,7 @@
int startPredicates = opPos;
opPos = startPredicates;
nextStepType = xpath.m_opMap[opPos];
- while(xpath.OP_PREDICATE == nextStepType)
+ while(XPath.OP_PREDICATE == nextStepType)
{
XObject pred = xpath.predicate(execContext, context, opPos);
if(XObject.CLASS_NUMBER == pred.getType())
@@ -1557,8 +1557,8 @@
}
else if(!pred.bool())
{
- score = xpath.MATCH_SCORE_NONE;
- break; // from while(xpath.OP_PREDICATE == nextStepType)
+ score = XPath.MATCH_SCORE_NONE;
+ break; // from while(XPath.OP_PREDICATE == nextStepType)
}
opPos = xpath.getNextOpPos(opPos);
nextStepType = xpath.m_opMap[opPos];
@@ -1576,13 +1576,13 @@
Node parentContext = execContext.getParentOfNode(context);
MutableNodeList mnl = step(xpath, execContext, parentContext, startOpPos, null, null, false, false);
int nNodes = mnl.getLength();
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
for(int i = 0; i < nNodes; i++)
{
Node child = mnl.item(i);
if((null != child) && child.equals( context ))
{
- score = xpath.MATCH_SCORE_OTHER;
+ score = XPath.MATCH_SCORE_OTHER;
break;
}
}
@@ -1590,11 +1590,11 @@
}
// If we haven't found a score yet, or the test was
// negative, assign the score.
- if((scoreHolder[0] == xpath.MATCH_SCORE_NONE) ||
- (score == xpath.MATCH_SCORE_NONE))
+ if((scoreHolder[0] == XPath.MATCH_SCORE_NONE) ||
+ (score == XPath.MATCH_SCORE_NONE))
scoreHolder[0] = score;
- return (score == xpath.MATCH_SCORE_NONE) ? null : context;
+ return (score == XPath.MATCH_SCORE_NONE) ? null : context;
}
@@ -1619,13 +1619,13 @@
{
case XPath.NODETYPE_COMMENT:
score = (Node.COMMENT_NODE == nodeType)
- ? xpath.MATCH_SCORE_NODETEST : xpath.MATCH_SCORE_NONE;
+ ? XPath.MATCH_SCORE_NODETEST : XPath.MATCH_SCORE_NONE;
break;
case XPath.NODETYPE_TEXT:
score = (((Node.CDATA_SECTION_NODE == nodeType)
|| (Node.TEXT_NODE == nodeType)) &&
(!execContext.shouldStripSourceNode(context)))
- ? xpath.MATCH_SCORE_NODETEST : xpath.MATCH_SCORE_NONE;
+ ? XPath.MATCH_SCORE_NODETEST : XPath.MATCH_SCORE_NONE;
break;
case XPath.NODETYPE_PI:
if( (Node.PROCESSING_INSTRUCTION_NODE == nodeType) )
@@ -1634,21 +1634,21 @@
{
XString name = (XString)xpath.m_tokenQueue[xpath.m_opMap[opPos]];
score = ((ProcessingInstruction)context).getNodeName().equals(name.str())
- ? xpath.MATCH_SCORE_QNAME : xpath.MATCH_SCORE_NONE;
+ ? XPath.MATCH_SCORE_QNAME : XPath.MATCH_SCORE_NONE;
}
else if(argLen == 1)
{
- score = xpath.MATCH_SCORE_NODETEST;
+ score = XPath.MATCH_SCORE_NODETEST;
}
else
{
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
xpath.error(XPATHErrorResources.ER_INCORRECT_ARG_LENGTH); //"Arg length of processing-instruction() node test is incorrect!");
}
}
else
{
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
}
break;
case XPath.NODETYPE_NODE:
@@ -1656,23 +1656,23 @@
|| (Node.TEXT_NODE == nodeType))
{
score = (!execContext.shouldStripSourceNode(context))
- ? xpath.MATCH_SCORE_NODETEST : xpath.MATCH_SCORE_NONE;
+ ? XPath.MATCH_SCORE_NODETEST : XPath.MATCH_SCORE_NONE;
}
else
{
- score = xpath.MATCH_SCORE_NODETEST;
+ score = XPath.MATCH_SCORE_NODETEST;
}
break;
case XPath.NODETYPE_ROOT:
score = ( (Node.DOCUMENT_FRAGMENT_NODE == nodeType)
|| (Node.DOCUMENT_NODE == nodeType))
- ? xpath.MATCH_SCORE_OTHER : xpath.MATCH_SCORE_NONE;
+ ? XPath.MATCH_SCORE_OTHER : XPath.MATCH_SCORE_NONE;
break;
case XPath.NODENAME:
{
if(!((Node.ATTRIBUTE_NODE == nodeType) || (Node.ELEMENT_NODE == nodeType)))
- return xpath.MATCH_SCORE_NONE;
+ return XPath.MATCH_SCORE_NONE;
boolean test;
int queueIndex = xpath.m_opMap[opPos];
@@ -1692,7 +1692,7 @@
// namespace declarations. The node test will be true for any node
// of the principal type whose expanded name has the URI to which
// the prefix expands, regardless of the local part of the name."
- boolean isTotallyWild = (null == targetNS) && (xpath.m_opMap[opPos] == xpath.ELEMWILDCARD);
+ boolean isTotallyWild = (null == targetNS) && (xpath.m_opMap[opPos] == XPath.ELEMWILDCARD);
boolean processNamespaces = execContext.getProcessNamespaces();
boolean didMatchNS = false;
if(!isTotallyWild && processNamespaces)
@@ -1705,7 +1705,7 @@
}
else
{
- test = (xpath.ELEMWILDCARD == queueIndex) ||
+ test = (XPath.ELEMWILDCARD == queueIndex) ||
(((null == contextNS) || (contextNS.length() == 0)) &&
((null == targetNS) || (targetNS.length() == 0)));
}
@@ -1719,7 +1719,7 @@
if(!test)
{
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
}
else
{
@@ -1730,15 +1730,15 @@
{
String attrName = ((Attr)context).getNodeName();
boolean isNamespace = (attrName.startsWith("xmlns:") || attrName.equals("xmlns"));
- if(xpath.ELEMWILDCARD == queueIndex)
+ if(XPath.ELEMWILDCARD == queueIndex)
{
if(stepType == XPath.FROM_ATTRIBUTES)
{
- score = !isNamespace ? xpath.MATCH_SCORE_NODETEST : xpath.MATCH_SCORE_NONE;
+ score = !isNamespace ? XPath.MATCH_SCORE_NODETEST : XPath.MATCH_SCORE_NONE;
}
else
{
- score = isNamespace ? xpath.MATCH_SCORE_NODETEST : xpath.MATCH_SCORE_NONE;
+ score = isNamespace ? XPath.MATCH_SCORE_NODETEST : XPath.MATCH_SCORE_NONE;
}
}
else
@@ -1750,11 +1750,11 @@
String localAttrName
= execContext.getLocalNameOfNode(context);
score = localAttrName.equals(targetLocalName)
- ? xpath.MATCH_SCORE_QNAME : xpath.MATCH_SCORE_NONE;
+ ? XPath.MATCH_SCORE_QNAME : XPath.MATCH_SCORE_NONE;
}
else
{
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
}
}
else
@@ -1769,45 +1769,45 @@
// I let them do both, since I can not otherwise see how
// one does the default namespace, i.e. namespace::xmlns.
score = localAttrName.equals(targetLocalName)
- ? xpath.MATCH_SCORE_QNAME : xpath.MATCH_SCORE_NONE;
+ ? XPath.MATCH_SCORE_QNAME : XPath.MATCH_SCORE_NONE;
}
else
{
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
}
}
}
}
else
{
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
}
break;
case Node.ELEMENT_NODE:
if(stepType != XPath.FROM_ATTRIBUTES)
{
- if(xpath.ELEMWILDCARD == queueIndex)
+ if(XPath.ELEMWILDCARD == queueIndex)
{
score = (didMatchNS ?
- xpath.MATCH_SCORE_NSWILD : xpath.MATCH_SCORE_NODETEST);
+ XPath.MATCH_SCORE_NSWILD : XPath.MATCH_SCORE_NODETEST);
}
else
{
score = (execContext.getLocalNameOfNode(context).equals(targetLocalName))
- ? xpath.MATCH_SCORE_QNAME : xpath.MATCH_SCORE_NONE;
+ ? XPath.MATCH_SCORE_QNAME : XPath.MATCH_SCORE_NONE;
}
}
else
{
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
}
break;
default:
// Trying to match on anything else causes nasty bugs.
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
break;
} // end switch(nodeType)
@@ -1815,7 +1815,7 @@
} // end case xpath.NODENAME
break;
default:
- score = xpath.MATCH_SCORE_NONE;
+ score = XPath.MATCH_SCORE_NONE;
} // end switch(testType)
return score;