You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mm...@locus.apache.org on 2000/02/08 15:29:55 UTC
cvs commit: xml-xalan/src/org/apache/xalan/xpath/dtm DTMNodeLocator.java
mmidy 00/02/08 06:29:55
Modified: src/org/apache/xalan/xpath SimpleNodeLocator.java
XPathProcessorImpl.java
src/org/apache/xalan/xpath/dtm DTMNodeLocator.java
Log:
Change to use static XPath constants.
Revision Changes Path
1.10 +26 -26 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SimpleNodeLocator.java 2000/01/31 08:28:04 1.9
+++ SimpleNodeLocator.java 2000/02/08 14:29:53 1.10
@@ -686,63 +686,63 @@
boolean mightHaveToChangeLocators = false;
switch(stepType)
{
- case xpath.OP_VARIABLE:
- case xpath.OP_EXTFUNCTION:
- case xpath.OP_FUNCTION:
- case xpath.OP_GROUP:
+ case XPath.OP_VARIABLE:
+ case XPath.OP_EXTFUNCTION:
+ case XPath.OP_FUNCTION:
+ case XPath.OP_GROUP:
argLen = findNodeSet(xpath, execContext, context, opPos,
stepType, subQueryResults);
mightHaveToChangeLocators = true;
break;
- case xpath.FROM_ROOT:
+ case XPath.FROM_ROOT:
argLen = findRoot(xpath, execContext, context, opPos, stepType, subQueryResults);
break;
- case xpath.FROM_PARENT:
+ case XPath.FROM_PARENT:
argLen = findParent(xpath, execContext, context, opPos, stepType, subQueryResults);
break;
- case xpath.FROM_SELF:
+ case XPath.FROM_SELF:
argLen = findSelf(xpath, execContext, context, opPos, stepType, subQueryResults);
break;
- case xpath.FROM_ANCESTORS:
+ case XPath.FROM_ANCESTORS:
argLen = findAncestors(xpath, execContext, context, opPos, stepType, subQueryResults);
shouldReorder = true;
break;
- case xpath.FROM_ANCESTORS_OR_SELF:
+ case XPath.FROM_ANCESTORS_OR_SELF:
argLen = findAncestorsOrSelf(xpath, execContext, context, opPos, stepType, subQueryResults);
shouldReorder = true;
break;
- case xpath.MATCH_ATTRIBUTE:
+ case XPath.MATCH_ATTRIBUTE:
continueStepRecursion = false;
// fall-through on purpose.
- case xpath.FROM_ATTRIBUTES:
+ case XPath.FROM_ATTRIBUTES:
argLen = findAttributes(xpath, execContext, context, opPos, stepType, subQueryResults);
break;
- case xpath.MATCH_ANY_ANCESTOR:
- case xpath.MATCH_IMMEDIATE_ANCESTOR:
+ case XPath.MATCH_ANY_ANCESTOR:
+ case XPath.MATCH_IMMEDIATE_ANCESTOR:
continueStepRecursion = false;
// fall-through on purpose.
- case xpath.FROM_CHILDREN:
+ case XPath.FROM_CHILDREN:
argLen = findChildren(xpath, execContext, context, opPos, stepType, subQueryResults);
break;
- case xpath.FROM_DESCENDANTS:
- case xpath.FROM_DESCENDANTS_OR_SELF:
+ case XPath.FROM_DESCENDANTS:
+ case XPath.FROM_DESCENDANTS_OR_SELF:
argLen = findDescendants(xpath, execContext, context, opPos, stepType, subQueryResults);
break;
- case xpath.FROM_FOLLOWING:
+ case XPath.FROM_FOLLOWING:
argLen = findFollowing(xpath, execContext, context, opPos, stepType, subQueryResults);
break;
- case xpath.FROM_FOLLOWING_SIBLINGS:
+ case XPath.FROM_FOLLOWING_SIBLINGS:
argLen = findFollowingSiblings(xpath, execContext, context, opPos, stepType, subQueryResults);
break;
- case xpath.FROM_PRECEDING:
+ case XPath.FROM_PRECEDING:
argLen = findPreceding(xpath, execContext, context, opPos, stepType, subQueryResults);
shouldReorder = true;
break;
- case xpath.FROM_PRECEDING_SIBLINGS:
+ case XPath.FROM_PRECEDING_SIBLINGS:
argLen = findPrecedingSiblings(xpath, execContext, context, opPos, stepType, subQueryResults);
shouldReorder = true;
break;
- case xpath.FROM_NAMESPACE:
+ case XPath.FROM_NAMESPACE:
argLen = findNamespace(xpath, execContext, context, opPos, stepType, subQueryResults);
break;
default:
@@ -1542,7 +1542,7 @@
switch(stepType)
{
- case xpath.OP_FUNCTION:
+ case XPath.OP_FUNCTION:
{
argLen = xpath.m_opMap[opPos+xpath.MAPINDEX_LENGTH];
XObject obj = xpath.execute(execContext, context, opPos);
@@ -1561,7 +1561,7 @@
}
}
break;
- case xpath.FROM_ROOT:
+ case XPath.FROM_ROOT:
{
argLen = xpath.getArgLengthOfStep(opPos);
opPos = xpath.getFirstChildPosOfStep(opPos);
@@ -1574,14 +1574,14 @@
}
}
break;
- case xpath.MATCH_ATTRIBUTE:
+ case XPath.MATCH_ATTRIBUTE:
{
argLen = xpath.getArgLengthOfStep(opPos);
opPos = xpath.getFirstChildPosOfStep(opPos);
score = nodeTest(xpath, execContext, context, opPos, argLen, xpath.FROM_ATTRIBUTES);
break;
}
- case xpath.MATCH_ANY_ANCESTOR:
+ case XPath.MATCH_ANY_ANCESTOR:
argLen = xpath.getArgLengthOfStep(opPos);
if(context.getNodeType() != Node.ATTRIBUTE_NODE)
{
@@ -1601,7 +1601,7 @@
score = xpath.MATCH_SCORE_NONE;
}
break;
- case xpath.MATCH_IMMEDIATE_ANCESTOR:
+ case XPath.MATCH_IMMEDIATE_ANCESTOR:
argLen = xpath.getArgLengthOfStep(opPos);
if(context.getNodeType() != Node.ATTRIBUTE_NODE)
{
1.14 +154 -154 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XPathProcessorImpl.java 2000/01/18 06:58:15 1.13
+++ XPathProcessorImpl.java 2000/02/08 14:29:54 1.14
@@ -2598,86 +2598,86 @@
indent(indent);
switch(xpath.m_opMap[opPos])
{
- case xpath.OP_XPATH:
+ case XPath.OP_XPATH:
opPos = diagnoseXPathUnaryOperation("OP_XPATH", xpath, opPos, indent);
break;
- case xpath.EMPTY:
+ case XPath.EMPTY:
System.out.println("{EMPTY}");
opPos++;
break;
- case xpath.OP_OR:
+ case XPath.OP_OR:
opPos = diagnoseXPathBinaryOperation("OP_OR", xpath, opPos, indent);
break;
- case xpath.OP_AND:
+ case XPath.OP_AND:
opPos = diagnoseXPathBinaryOperation("OP_AND", xpath, opPos, indent);
break;
- case xpath.OP_NOTEQUALS:
+ case XPath.OP_NOTEQUALS:
opPos = diagnoseXPathBinaryOperation("OP_NOTEQUALS", xpath, opPos, indent);
break;
- case xpath.OP_EQUALS:
+ case XPath.OP_EQUALS:
opPos = diagnoseXPathBinaryOperation("OP_EQUALS", xpath, opPos, indent);
break;
- case xpath.OP_LTE:
+ case XPath.OP_LTE:
opPos = diagnoseXPathBinaryOperation("OP_LTE", xpath, opPos, indent);
break;
- case xpath.OP_LT:
+ case XPath.OP_LT:
opPos = diagnoseXPathBinaryOperation("OP_LT", xpath, opPos, indent);
break;
- case xpath.OP_GTE:
+ case XPath.OP_GTE:
opPos = diagnoseXPathBinaryOperation("OP_GTE", xpath, opPos, indent);
break;
- case xpath.OP_GT:
+ case XPath.OP_GT:
opPos = diagnoseXPathBinaryOperation("OP_GT", xpath, opPos, indent);
break;
- case xpath.OP_PLUS:
+ case XPath.OP_PLUS:
opPos = diagnoseXPathBinaryOperation("OP_PLUS", xpath, opPos, indent);
break;
- case xpath.OP_MINUS:
+ case XPath.OP_MINUS:
opPos = diagnoseXPathBinaryOperation("OP_MINUS", xpath, opPos, indent);
break;
- case xpath.OP_MULT:
+ case XPath.OP_MULT:
opPos = diagnoseXPathBinaryOperation("OP_MULT", xpath, opPos, indent);
break;
- case xpath.OP_DIV:
+ case XPath.OP_DIV:
opPos = diagnoseXPathBinaryOperation("OP_DIV", xpath, opPos, indent);
break;
- case xpath.OP_MOD:
+ case XPath.OP_MOD:
opPos = diagnoseXPathBinaryOperation("OP_MOD", xpath, opPos, indent);
break;
- case xpath.OP_QUO:
+ case XPath.OP_QUO:
opPos = diagnoseXPathBinaryOperation("OP_QUO", xpath, opPos, indent);
break;
- case xpath.OP_NEG:
+ case XPath.OP_NEG:
opPos = diagnoseXPathUnaryOperation("OP_NEG", xpath, opPos, indent);
break;
- case xpath.OP_STRING:
+ case XPath.OP_STRING:
opPos = diagnoseXPathUnaryOperation("OP_STRING", xpath, opPos, indent);
break;
- case xpath.OP_BOOL:
+ case XPath.OP_BOOL:
opPos = diagnoseXPathUnaryOperation("OP_BOOL", xpath, opPos, indent);
break;
- case xpath.OP_NUMBER:
+ case XPath.OP_NUMBER:
opPos = diagnoseXPathUnaryOperation("OP_NUMBER", xpath, opPos, indent);
break;
- case xpath.OP_UNION:
+ case XPath.OP_UNION:
opPos = diagnoseXPathMultiOperation("OP_UNION", xpath.OP_LOCATIONPATH, xpath, opPos, indent);
break;
- case xpath.OP_LITERAL:
+ case XPath.OP_LITERAL:
opPos = diagnoseXPathSimpleOperation("OP_LITERAL", xpath, opPos, indent);
break;
- case xpath.OP_VARIABLE:
+ case XPath.OP_VARIABLE:
opPos = diagnoseXPathSimpleOperation("OP_VARIABLE", xpath, opPos, indent);
break;
- case xpath.OP_GROUP:
+ case XPath.OP_GROUP:
opPos = diagnoseXPathUnaryOperation("OP_GROUP", xpath, opPos, indent);
break;
- case xpath.OP_NUMBERLIT:
+ case XPath.OP_NUMBERLIT:
opPos = diagnoseXPathSimpleOperation("OP_NUMBERLIT", xpath, opPos, indent);
break;
- case xpath.OP_ARGUMENT:
+ case XPath.OP_ARGUMENT:
opPos = diagnoseXPathUnaryOperation("OP_ARGUMENT", xpath, opPos, indent);
break;
- case xpath.OP_EXTFUNCTION:
+ case XPath.OP_EXTFUNCTION:
{
System.out.println("OP_EXTFUNCTION {");
int endExtFunc = opPos+xpath.m_opMap[opPos+1]-1;
@@ -2704,7 +2704,7 @@
opPos++;
}
break;
- case xpath.OP_FUNCTION:
+ case XPath.OP_FUNCTION:
{
System.out.println("OP_FUNCTION {");
int endFunc = opPos+xpath.m_opMap[opPos+1]-1;
@@ -2713,41 +2713,41 @@
int funcID = xpath.m_opMap[opPos];
switch(funcID)
{
- case xpath.FUNC_LAST: System.out.print("FUNC_LAST"); break;
- case xpath.FUNC_POSITION: System.out.print("FUNC_POSITION"); break;
- case xpath.FUNC_COUNT: System.out.print("FUNC_COUNT"); break;
- case xpath.FUNC_ID: System.out.print("FUNC_ID"); break;
- case xpath.FUNC_KEY: System.out.print("FUNC_KEY"); break;
- // case xpath.FUNC_DOC: System.out.print("FUNC_DOC"); break;
- case xpath.FUNC_LOCAL_PART: System.out.print("FUNC_LOCAL_PART"); break;
- case xpath.FUNC_NAMESPACE: System.out.print("FUNC_NAMESPACE"); break;
- case xpath.FUNC_QNAME: System.out.print("FUNC_QNAME"); break;
- case xpath.FUNC_GENERATE_ID: System.out.print("FUNC_GENERATE_ID"); break;
- case xpath.FUNC_NOT: System.out.print("FUNC_NOT"); break;
- case xpath.FUNC_TRUE: System.out.print("FUNC_TRUE"); break;
- case xpath.FUNC_FALSE: System.out.print("FUNC_FALSE"); break;
- case xpath.FUNC_BOOLEAN: System.out.print("FUNC_BOOLEAN"); break;
- case xpath.FUNC_LANG: System.out.print("FUNC_LANG"); break;
- case xpath.FUNC_NUMBER: System.out.print("FUNC_NUMBER"); break;
- case xpath.FUNC_FLOOR: System.out.print("FUNC_FLOOR"); break;
- case xpath.FUNC_CEILING: System.out.print("FUNC_CEILING"); break;
- case xpath.FUNC_ROUND: System.out.print("FUNC_ROUND"); break;
- case xpath.FUNC_SUM: System.out.print("FUNC_SUM"); break;
- case xpath.FUNC_STRING: System.out.print("FUNC_STRING"); break;
- case xpath.FUNC_STARTS_WITH: System.out.print("FUNC_STARTS_WITH"); break;
- case xpath.FUNC_CONTAINS: System.out.print("FUNC_CONTAINS"); break;
- case xpath.FUNC_SUBSTRING_BEFORE: System.out.print("FUNC_SUBSTRING_BEFORE"); break;
- case xpath.FUNC_SUBSTRING_AFTER: System.out.print("FUNC_SUBSTRING_AFTER"); break;
- case xpath.FUNC_NORMALIZE_SPACE: System.out.print("FUNC_NORMALIZE_SPACE"); break;
- case xpath.FUNC_TRANSLATE: System.out.print("FUNC_TRANSLATE"); break;
- case xpath.FUNC_CONCAT: System.out.print("FUNC_CONCAT"); break;
+ case XPath.FUNC_LAST: System.out.print("FUNC_LAST"); break;
+ case XPath.FUNC_POSITION: System.out.print("FUNC_POSITION"); break;
+ case XPath.FUNC_COUNT: System.out.print("FUNC_COUNT"); break;
+ case XPath.FUNC_ID: System.out.print("FUNC_ID"); break;
+ case XPath.FUNC_KEY: System.out.print("FUNC_KEY"); break;
+ // case XPath.FUNC_DOC: System.out.print("FUNC_DOC"); break;
+ case XPath.FUNC_LOCAL_PART: System.out.print("FUNC_LOCAL_PART"); break;
+ case XPath.FUNC_NAMESPACE: System.out.print("FUNC_NAMESPACE"); break;
+ case XPath.FUNC_QNAME: System.out.print("FUNC_QNAME"); break;
+ case XPath.FUNC_GENERATE_ID: System.out.print("FUNC_GENERATE_ID"); break;
+ case XPath.FUNC_NOT: System.out.print("FUNC_NOT"); break;
+ case XPath.FUNC_TRUE: System.out.print("FUNC_TRUE"); break;
+ case XPath.FUNC_FALSE: System.out.print("FUNC_FALSE"); break;
+ case XPath.FUNC_BOOLEAN: System.out.print("FUNC_BOOLEAN"); break;
+ case XPath.FUNC_LANG: System.out.print("FUNC_LANG"); break;
+ case XPath.FUNC_NUMBER: System.out.print("FUNC_NUMBER"); break;
+ case XPath.FUNC_FLOOR: System.out.print("FUNC_FLOOR"); break;
+ case XPath.FUNC_CEILING: System.out.print("FUNC_CEILING"); break;
+ case XPath.FUNC_ROUND: System.out.print("FUNC_ROUND"); break;
+ case XPath.FUNC_SUM: System.out.print("FUNC_SUM"); break;
+ case XPath.FUNC_STRING: System.out.print("FUNC_STRING"); break;
+ case XPath.FUNC_STARTS_WITH: System.out.print("FUNC_STARTS_WITH"); break;
+ case XPath.FUNC_CONTAINS: System.out.print("FUNC_CONTAINS"); break;
+ case XPath.FUNC_SUBSTRING_BEFORE: System.out.print("FUNC_SUBSTRING_BEFORE"); break;
+ case XPath.FUNC_SUBSTRING_AFTER: System.out.print("FUNC_SUBSTRING_AFTER"); break;
+ case XPath.FUNC_NORMALIZE_SPACE: System.out.print("FUNC_NORMALIZE_SPACE"); break;
+ case XPath.FUNC_TRANSLATE: System.out.print("FUNC_TRANSLATE"); break;
+ case XPath.FUNC_CONCAT: System.out.print("FUNC_CONCAT"); break;
//case xpath.FUNC_FORMAT_NUMBER: System.out.print("FUNC_FORMAT_NUMBER"); break;
- case xpath.FUNC_SYSTEM_PROPERTY: System.out.print("FUNC_SYSTEM_PROPERTY"); break;
- case xpath.FUNC_EXT_FUNCTION_AVAILABLE: System.out.print("FUNC_EXT_FUNCTION_AVAILABLE"); break;
- case xpath.FUNC_EXT_ELEM_AVAILABLE: System.out.print("FUNC_EXT_ELEM_AVAILABLE"); break;
- case xpath.FUNC_SUBSTRING: System.out.print("FUNC_SUBSTRING"); break;
- case xpath.FUNC_STRING_LENGTH: System.out.print("FUNC_STRING_LENGTH"); break;
- case xpath.FUNC_DOCLOCATION: System.out.print("FUNC_DOCLOCATION"); break;
+ case XPath.FUNC_SYSTEM_PROPERTY: System.out.print("FUNC_SYSTEM_PROPERTY"); break;
+ case XPath.FUNC_EXT_FUNCTION_AVAILABLE: System.out.print("FUNC_EXT_FUNCTION_AVAILABLE"); break;
+ case XPath.FUNC_EXT_ELEM_AVAILABLE: System.out.print("FUNC_EXT_ELEM_AVAILABLE"); break;
+ case XPath.FUNC_SUBSTRING: System.out.print("FUNC_SUBSTRING"); break;
+ case XPath.FUNC_STRING_LENGTH: System.out.print("FUNC_STRING_LENGTH"); break;
+ case XPath.FUNC_DOCLOCATION: System.out.print("FUNC_DOCLOCATION"); break;
}
opPos++;
System.out.println("");
@@ -2768,7 +2768,7 @@
opPos++;
}
break;
- case xpath.OP_LOCATIONPATH:
+ case XPath.OP_LOCATIONPATH:
System.out.println("OP_LOCATIONPATH"+" {");
int endPath = opPos+xpath.m_opMap[opPos+1]-1;
opPos+=2;
@@ -2784,7 +2784,7 @@
}
opPos++;
break;
- case xpath.OP_PREDICATE:
+ case XPath.OP_PREDICATE:
opPos = diagnoseXPathUnaryOperation("OP_PREDICATE", xpath, opPos, indent);
if(xpath.m_opMap[opPos] != xpath.ENDOP)
{
@@ -2792,72 +2792,72 @@
}
opPos++;
break;
- case xpath.FROM_ANCESTORS:
+ case XPath.FROM_ANCESTORS:
opPos = diagnoseXPathLocationStep("FROM_ANCESTORS", xpath, opPos, 1);
break;
- case xpath.FROM_ANCESTORS_OR_SELF:
+ case XPath.FROM_ANCESTORS_OR_SELF:
opPos = diagnoseXPathLocationStep("FROM_ANCESTORS_OR_SELF", xpath, opPos, 1);
break;
- case xpath.FROM_ATTRIBUTES:
+ case XPath.FROM_ATTRIBUTES:
opPos = diagnoseXPathLocationStep("FROM_ATTRIBUTES", xpath, opPos, 1);
break;
- case xpath.FROM_CHILDREN:
+ case XPath.FROM_CHILDREN:
opPos = diagnoseXPathLocationStep("FROM_CHILDREN", xpath, opPos, 1);
break;
- case xpath.FROM_DESCENDANTS:
+ case XPath.FROM_DESCENDANTS:
opPos = diagnoseXPathLocationStep("FROM_DESCENDANTS", xpath, opPos, 1);
break;
- case xpath.FROM_DESCENDANTS_OR_SELF:
+ case XPath.FROM_DESCENDANTS_OR_SELF:
opPos = diagnoseXPathLocationStep("FROM_DESCENDANTS_OR_SELF", xpath, opPos, 1);
break;
- case xpath.FROM_FOLLOWING:
+ case XPath.FROM_FOLLOWING:
opPos = diagnoseXPathLocationStep("FROM_FOLLOWING", xpath, opPos, indent);
break;
- case xpath.FROM_FOLLOWING_SIBLINGS:
+ case XPath.FROM_FOLLOWING_SIBLINGS:
opPos = diagnoseXPathLocationStep("FROM_FOLLOWING_SIBLINGS", xpath, opPos, indent);
break;
- case xpath.FROM_PARENT:
+ case XPath.FROM_PARENT:
opPos = diagnoseXPathLocationStep("FROM_PARENT", xpath, opPos, indent);
break;
- case xpath.FROM_PRECEDING:
+ case XPath.FROM_PRECEDING:
opPos = diagnoseXPathLocationStep("FROM_PRECEDING", xpath, opPos, indent);
break;
- case xpath.FROM_PRECEDING_SIBLINGS:
+ case XPath.FROM_PRECEDING_SIBLINGS:
opPos = diagnoseXPathLocationStep("FROM_PRECEDING_SIBLINGS", xpath, opPos, indent);
break;
- case xpath.FROM_SELF:
+ case XPath.FROM_SELF:
opPos = diagnoseXPathLocationStep("FROM_SELF", xpath, opPos, indent);
break;
- case xpath.FROM_NAMESPACE:
+ case XPath.FROM_NAMESPACE:
opPos = diagnoseXPathLocationStep("FROM_NAMESPACE", xpath, opPos, indent);
break;
- // case xpath.FROM_ATTRIBUTE:
+ // case XPath.FROM_ATTRIBUTE:
// opPos = diagnoseXPathLocationStep("FROM_ATTRIBUTE", xpath, opPos, indent);
// break;
- // case xpath.FROM_DOC:
+ // case XPath.FROM_DOC:
// opPos = diagnoseXPathLocationStep("FROM_DOC", xpath, opPos, indent);
// break;
- // case xpath.FROM_DOCREF:
+ // case XPath.FROM_DOCREF:
// opPos = diagnoseXPathLocationStep("FROM_DOCREF", xpath, opPos, indent);
// break;
- // case xpath.FROM_ID:
+ // case XPath.FROM_ID:
// opPos = diagnoseXPathLocationStep("FROM_ID", xpath, opPos, indent);
// break;
- // case xpath.FROM_IDREF:
+ // case XPath.FROM_IDREF:
// opPos = diagnoseXPathLocationStep("FROM_IDREF", xpath, opPos, indent);
// break;
- case xpath.FROM_ROOT:
+ case XPath.FROM_ROOT:
opPos = diagnoseXPathLocationStep("FROM_ROOT", xpath, opPos, indent);
break;
- case xpath.NODETYPE_COMMENT:
+ case XPath.NODETYPE_COMMENT:
System.out.println("{NODETYPE_COMMENT}");
opPos++;
break;
- case xpath.NODETYPE_TEXT:
+ case XPath.NODETYPE_TEXT:
System.out.println("{NODETYPE_TEXT}");
opPos++;
break;
- case xpath.NODETYPE_PI:
+ case XPath.NODETYPE_PI:
int piLen = xpath.m_opMap[opPos-1];
System.out.println("{NODETYPE_PI ");
opPos++;
@@ -2866,19 +2866,19 @@
opPos = diagnoseToken(xpath, opPos);
}
break;
- case xpath.NODETYPE_NODE:
+ case XPath.NODETYPE_NODE:
System.out.println("{NODETYPE_NODE}");
opPos++;
break;
- case xpath.NODETYPE_ROOT:
+ case XPath.NODETYPE_ROOT:
System.out.println("{NODETYPE_ROOT}");
opPos++;
break;
- case xpath.NODETYPE_ANYELEMENT:
+ case XPath.NODETYPE_ANYELEMENT:
System.out.println("{NODETYPE_ANYELEMENT}");
opPos++;
break;
- case xpath.NODENAME:
+ case XPath.NODENAME:
System.out.print("{NODENAME ");
opPos++;
if(xpath.m_opMap[opPos] < 0)
@@ -3045,86 +3045,86 @@
indent(indent);
switch(xpath.m_opMap[opPos])
{
- case xpath.OP_XPATH:
+ case XPath.OP_XPATH:
opPos = diagnoseXPathUnaryOperation2("OP_XPATH", xpath, opPos, indent);
break;
- case xpath.EMPTY:
+ case XPath.EMPTY:
diagnoseOpOnly2(opPos, "EMPTY");
opPos++;
break;
- case xpath.OP_OR:
+ case XPath.OP_OR:
opPos = diagnoseXPathBinaryOperation2("OP_OR", xpath, opPos, indent);
break;
- case xpath.OP_AND:
+ case XPath.OP_AND:
opPos = diagnoseXPathBinaryOperation2("OP_AND", xpath, opPos, indent);
break;
- case xpath.OP_NOTEQUALS:
+ case XPath.OP_NOTEQUALS:
opPos = diagnoseXPathBinaryOperation2("OP_NOTEQUALS", xpath, opPos, indent);
break;
- case xpath.OP_EQUALS:
+ case XPath.OP_EQUALS:
opPos = diagnoseXPathBinaryOperation2("OP_EQUALS", xpath, opPos, indent);
break;
- case xpath.OP_LTE:
+ case XPath.OP_LTE:
opPos = diagnoseXPathBinaryOperation2("OP_LTE", xpath, opPos, indent);
break;
- case xpath.OP_LT:
+ case XPath.OP_LT:
opPos = diagnoseXPathBinaryOperation2("OP_LT", xpath, opPos, indent);
break;
- case xpath.OP_GTE:
+ case XPath.OP_GTE:
opPos = diagnoseXPathBinaryOperation2("OP_GTE", xpath, opPos, indent);
break;
- case xpath.OP_GT:
+ case XPath.OP_GT:
opPos = diagnoseXPathBinaryOperation2("OP_GT", xpath, opPos, indent);
break;
- case xpath.OP_PLUS:
+ case XPath.OP_PLUS:
opPos = diagnoseXPathBinaryOperation2("OP_PLUS", xpath, opPos, indent);
break;
- case xpath.OP_MINUS:
+ case XPath.OP_MINUS:
opPos = diagnoseXPathBinaryOperation2("OP_MINUS", xpath, opPos, indent);
break;
- case xpath.OP_MULT:
+ case XPath.OP_MULT:
opPos = diagnoseXPathBinaryOperation2("OP_MULT", xpath, opPos, indent);
break;
- case xpath.OP_DIV:
+ case XPath.OP_DIV:
opPos = diagnoseXPathBinaryOperation2("OP_DIV", xpath, opPos, indent);
break;
- case xpath.OP_MOD:
+ case XPath.OP_MOD:
opPos = diagnoseXPathBinaryOperation2("OP_MOD", xpath, opPos, indent);
break;
- case xpath.OP_QUO:
+ case XPath.OP_QUO:
opPos = diagnoseXPathBinaryOperation2("OP_QUO", xpath, opPos, indent);
break;
- case xpath.OP_NEG:
+ case XPath.OP_NEG:
opPos = diagnoseXPathUnaryOperation2("OP_NEG", xpath, opPos, indent);
break;
- case xpath.OP_STRING:
+ case XPath.OP_STRING:
opPos = diagnoseXPathUnaryOperation2("OP_STRING", xpath, opPos, indent);
break;
- case xpath.OP_BOOL:
+ case XPath.OP_BOOL:
opPos = diagnoseXPathUnaryOperation2("OP_BOOL", xpath, opPos, indent);
break;
- case xpath.OP_NUMBER:
+ case XPath.OP_NUMBER:
opPos = diagnoseXPathUnaryOperation2("OP_NUMBER", xpath, opPos, indent);
break;
- case xpath.OP_UNION:
+ case XPath.OP_UNION:
opPos = diagnoseXPathMultiOperation2("OP_UNION", xpath.OP_LOCATIONPATH, xpath, opPos, indent);
break;
- case xpath.OP_LITERAL:
+ case XPath.OP_LITERAL:
opPos = diagnoseXPathSimpleOperation2("OP_LITERAL", xpath, opPos, indent);
break;
- case xpath.OP_VARIABLE:
+ case XPath.OP_VARIABLE:
opPos = diagnoseXPathSimpleOperation2("OP_VARIABLE", xpath, opPos, indent);
break;
- case xpath.OP_GROUP:
+ case XPath.OP_GROUP:
opPos = diagnoseXPathUnaryOperation2("OP_GROUP", xpath, opPos, indent);
break;
- case xpath.OP_NUMBERLIT:
+ case XPath.OP_NUMBERLIT:
opPos = diagnoseXPathSimpleOperation2("OP_NUMBERLIT", xpath, opPos, indent);
break;
- case xpath.OP_ARGUMENT:
+ case XPath.OP_ARGUMENT:
opPos = diagnoseXPathUnaryOperation2("OP_ARGUMENT", xpath, opPos, indent);
break;
- case xpath.OP_EXTFUNCTION:
+ case XPath.OP_EXTFUNCTION:
{
diagnoseOp2SameLine("OP_EXTFUNCTION", xpath, opPos);
int endExtFunc = opPos+xpath.m_opMap[opPos+1]-1;
@@ -3144,7 +3144,7 @@
opPos++;
}
break;
- case xpath.OP_FUNCTION:
+ case XPath.OP_FUNCTION:
{
diagnoseOp2SameLine("OP_FUNCTION", xpath, opPos);
int endFunc = opPos+xpath.m_opMap[opPos+1]-1;
@@ -3152,41 +3152,41 @@
int funcID = xpath.m_opMap[opPos];
switch(funcID)
{
- case xpath.FUNC_LAST: diagnoseOpNoLable2(opPos, "FUNC_LAST"); break;
- case xpath.FUNC_POSITION: diagnoseOpNoLable2(opPos, "FUNC_POSITION"); break;
- case xpath.FUNC_COUNT: diagnoseOpNoLable2(opPos, "FUNC_COUNT"); break;
- case xpath.FUNC_ID: diagnoseOpNoLable2(opPos, "FUNC_ID"); break;
- case xpath.FUNC_KEY: diagnoseOpNoLable2(opPos, "FUNC_KEY"); break;
+ case XPath.FUNC_LAST: diagnoseOpNoLable2(opPos, "FUNC_LAST"); break;
+ case XPath.FUNC_POSITION: diagnoseOpNoLable2(opPos, "FUNC_POSITION"); break;
+ case XPath.FUNC_COUNT: diagnoseOpNoLable2(opPos, "FUNC_COUNT"); break;
+ case XPath.FUNC_ID: diagnoseOpNoLable2(opPos, "FUNC_ID"); break;
+ case XPath.FUNC_KEY: diagnoseOpNoLable2(opPos, "FUNC_KEY"); break;
// case xpath.FUNC_DOC: diagnoseOpNoLable2(opPos, "FUNC_DOC"); break;
- case xpath.FUNC_LOCAL_PART: diagnoseOpNoLable2(opPos, "FUNC_LOCAL_PART"); break;
- case xpath.FUNC_NAMESPACE: diagnoseOpNoLable2(opPos, "FUNC_NAMESPACE"); break;
- case xpath.FUNC_QNAME: diagnoseOpNoLable2(opPos, "FUNC_QNAME"); break;
- case xpath.FUNC_GENERATE_ID: diagnoseOpNoLable2(opPos, "FUNC_GENERATE_ID"); break;
- case xpath.FUNC_NOT: diagnoseOpNoLable2(opPos, "FUNC_NOT"); break;
- case xpath.FUNC_TRUE: diagnoseOpNoLable2(opPos, "FUNC_TRUE"); break;
- case xpath.FUNC_FALSE: diagnoseOpNoLable2(opPos, "FUNC_FALSE"); break;
- case xpath.FUNC_BOOLEAN: diagnoseOpNoLable2(opPos, "FUNC_BOOLEAN"); break;
- case xpath.FUNC_LANG: diagnoseOpNoLable2(opPos, "FUNC_LANG"); break;
- case xpath.FUNC_NUMBER: diagnoseOpNoLable2(opPos, "FUNC_NUMBER"); break;
- case xpath.FUNC_FLOOR: diagnoseOpNoLable2(opPos, "FUNC_FLOOR"); break;
- case xpath.FUNC_CEILING: diagnoseOpNoLable2(opPos, "FUNC_CEILING"); break;
- case xpath.FUNC_ROUND: diagnoseOpNoLable2(opPos, "FUNC_ROUND"); break;
- case xpath.FUNC_SUM: diagnoseOpNoLable2(opPos, "FUNC_SUM"); break;
- case xpath.FUNC_STRING: diagnoseOpNoLable2(opPos, "FUNC_STRING"); break;
- case xpath.FUNC_STARTS_WITH: diagnoseOpNoLable2(opPos, "FUNC_STARTS_WITH"); break;
- case xpath.FUNC_CONTAINS: diagnoseOpNoLable2(opPos, "FUNC_CONTAINS"); break;
- case xpath.FUNC_SUBSTRING_BEFORE: diagnoseOpNoLable2(opPos, "FUNC_SUBSTRING_BEFORE"); break;
- case xpath.FUNC_SUBSTRING_AFTER: diagnoseOpNoLable2(opPos, "FUNC_SUBSTRING_AFTER"); break;
- case xpath.FUNC_NORMALIZE_SPACE: diagnoseOpNoLable2(opPos, "FUNC_NORMALIZE_SPACE"); break;
- case xpath.FUNC_TRANSLATE: diagnoseOpNoLable2(opPos, "FUNC_TRANSLATE"); break;
- case xpath.FUNC_CONCAT: diagnoseOpNoLable2(opPos, "FUNC_CONCAT"); break;
- //case xpath.FUNC_FORMAT_NUMBER: diagnoseOpNoLable2(opPos, "FUNC_FORMAT_NUMBER"); break;
- case xpath.FUNC_SYSTEM_PROPERTY: diagnoseOpNoLable2(opPos, "FUNC_SYSTEM_PROPERTY"); break;
- case xpath.FUNC_EXT_FUNCTION_AVAILABLE: diagnoseOpNoLable2(opPos, "FUNC_EXT_FUNCTION_AVAILABLE"); break;
- case xpath.FUNC_EXT_ELEM_AVAILABLE: diagnoseOpNoLable2(opPos, "FUNC_EXT_ELEM_AVAILABLE"); break;
- case xpath.FUNC_SUBSTRING: diagnoseOpNoLable2(opPos, "FUNC_SUBSTRING"); break;
- case xpath.FUNC_STRING_LENGTH: diagnoseOpNoLable2(opPos, "FUNC_STRING_LENGTH"); break;
- case xpath.FUNC_DOCLOCATION: diagnoseOpNoLable2(opPos, "FUNC_DOCLOCATION"); break;
+ case XPath.FUNC_LOCAL_PART: diagnoseOpNoLable2(opPos, "FUNC_LOCAL_PART"); break;
+ case XPath.FUNC_NAMESPACE: diagnoseOpNoLable2(opPos, "FUNC_NAMESPACE"); break;
+ case XPath.FUNC_QNAME: diagnoseOpNoLable2(opPos, "FUNC_QNAME"); break;
+ case XPath.FUNC_GENERATE_ID: diagnoseOpNoLable2(opPos, "FUNC_GENERATE_ID"); break;
+ case XPath.FUNC_NOT: diagnoseOpNoLable2(opPos, "FUNC_NOT"); break;
+ case XPath.FUNC_TRUE: diagnoseOpNoLable2(opPos, "FUNC_TRUE"); break;
+ case XPath.FUNC_FALSE: diagnoseOpNoLable2(opPos, "FUNC_FALSE"); break;
+ case XPath.FUNC_BOOLEAN: diagnoseOpNoLable2(opPos, "FUNC_BOOLEAN"); break;
+ case XPath.FUNC_LANG: diagnoseOpNoLable2(opPos, "FUNC_LANG"); break;
+ case XPath.FUNC_NUMBER: diagnoseOpNoLable2(opPos, "FUNC_NUMBER"); break;
+ case XPath.FUNC_FLOOR: diagnoseOpNoLable2(opPos, "FUNC_FLOOR"); break;
+ case XPath.FUNC_CEILING: diagnoseOpNoLable2(opPos, "FUNC_CEILING"); break;
+ case XPath.FUNC_ROUND: diagnoseOpNoLable2(opPos, "FUNC_ROUND"); break;
+ case XPath.FUNC_SUM: diagnoseOpNoLable2(opPos, "FUNC_SUM"); break;
+ case XPath.FUNC_STRING: diagnoseOpNoLable2(opPos, "FUNC_STRING"); break;
+ case XPath.FUNC_STARTS_WITH: diagnoseOpNoLable2(opPos, "FUNC_STARTS_WITH"); break;
+ case XPath.FUNC_CONTAINS: diagnoseOpNoLable2(opPos, "FUNC_CONTAINS"); break;
+ case XPath.FUNC_SUBSTRING_BEFORE: diagnoseOpNoLable2(opPos, "FUNC_SUBSTRING_BEFORE"); break;
+ case XPath.FUNC_SUBSTRING_AFTER: diagnoseOpNoLable2(opPos, "FUNC_SUBSTRING_AFTER"); break;
+ case XPath.FUNC_NORMALIZE_SPACE: diagnoseOpNoLable2(opPos, "FUNC_NORMALIZE_SPACE"); break;
+ case XPath.FUNC_TRANSLATE: diagnoseOpNoLable2(opPos, "FUNC_TRANSLATE"); break;
+ case XPath.FUNC_CONCAT: diagnoseOpNoLable2(opPos, "FUNC_CONCAT"); break;
+ //case XPath.FUNC_FORMAT_NUMBER: diagnoseOpNoLable2(opPos, "FUNC_FORMAT_NUMBER"); break;
+ case XPath.FUNC_SYSTEM_PROPERTY: diagnoseOpNoLable2(opPos, "FUNC_SYSTEM_PROPERTY"); break;
+ case XPath.FUNC_EXT_FUNCTION_AVAILABLE: diagnoseOpNoLable2(opPos, "FUNC_EXT_FUNCTION_AVAILABLE"); break;
+ case XPath.FUNC_EXT_ELEM_AVAILABLE: diagnoseOpNoLable2(opPos, "FUNC_EXT_ELEM_AVAILABLE"); break;
+ case XPath.FUNC_SUBSTRING: diagnoseOpNoLable2(opPos, "FUNC_SUBSTRING"); break;
+ case XPath.FUNC_STRING_LENGTH: diagnoseOpNoLable2(opPos, "FUNC_STRING_LENGTH"); break;
+ case XPath.FUNC_DOCLOCATION: diagnoseOpNoLable2(opPos, "FUNC_DOCLOCATION"); break;
}
opPos++;
while(opPos < endFunc)
@@ -3204,7 +3204,7 @@
opPos++;
}
break;
- case xpath.OP_LOCATIONPATH:
+ case XPath.OP_LOCATIONPATH:
diagnoseOp2("OP_LOCATIONPATH", xpath, opPos);
int endPath = opPos+xpath.m_opMap[opPos+1]-1;
opPos+=2;
@@ -3220,7 +3220,7 @@
diagnoseOpOnly2(opPos, "ENDOP");
opPos++;
break;
- case xpath.OP_PREDICATE:
+ case XPath.OP_PREDICATE:
indent(1);
opPos = diagnoseXPathUnaryOperation2("OP_PREDICATE", xpath, opPos, indent+1);
if(xpath.m_opMap[opPos] != xpath.ENDOP)
1.9 +5 -5 xml-xalan/src/org/apache/xalan/xpath/dtm/DTMNodeLocator.java
Index: DTMNodeLocator.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/dtm/DTMNodeLocator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DTMNodeLocator.java 2000/01/26 05:00:26 1.8
+++ DTMNodeLocator.java 2000/02/08 14:29:54 1.9
@@ -363,7 +363,7 @@
switch(stepType)
{
- case xpath.OP_FUNCTION:
+ case XPath.OP_FUNCTION:
{
argLen = xpath.m_opMap[opPos+xpath.MAPINDEX_LENGTH];
Node contextNode = dtm.getNode( context );
@@ -383,7 +383,7 @@
}
}
break;
- case xpath.FROM_ROOT:
+ case XPath.FROM_ROOT:
{
argLen = xpath.m_opMap[opPos+xpath.MAPINDEX_LENGTH+1]-3;
opPos += 3;
@@ -394,14 +394,14 @@
}
}
break;
- case xpath.MATCH_ATTRIBUTE:
+ case XPath.MATCH_ATTRIBUTE:
{
argLen = xpath.m_opMap[opPos+xpath.MAPINDEX_LENGTH+1]-3;
opPos += 3;
score = nodeTest(xpath, execContext, dtm, context, opPos, argLen, xpath.FROM_ATTRIBUTES);
break;
}
- case xpath.MATCH_ANY_ANCESTOR:
+ case XPath.MATCH_ANY_ANCESTOR:
{
argLen = xpath.m_opMap[opPos+xpath.MAPINDEX_LENGTH+1]-3;
opPos += 3;
@@ -415,7 +415,7 @@
}
}
break;
- case xpath.MATCH_IMMEDIATE_ANCESTOR:
+ case XPath.MATCH_IMMEDIATE_ANCESTOR:
argLen = xpath.m_opMap[opPos+xpath.MAPINDEX_LENGTH+1]-3;
opPos += 3;
score = nodeTest(xpath, execContext, dtm, context, opPos, argLen, stepType);