morten 01/12/10 04:53:07
Modified: java/src/org/apache/xalan/xsltc/compiler xpath.cup
Log:
A fix for a bug in the XPath parser. The parser would choke on some XPath
expressions that contained references to element names that were identical
to axis names.
PR: bugzilla 3502
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.33 +27 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/xpath.cup
Index: xpath.cup
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/xpath.cup,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xpath.cup 2001/11/30 08:52:10 1.32
+++ xpath.cup 2001/12/10 12:53:07 1.33
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: xpath.cup,v 1.32 2001/11/30 08:52:10 morten Exp $
+ * @(#)$Id: xpath.cup,v 1.33 2001/12/10 12:53:07 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -970,17 +970,41 @@
| KEY
{: RESULT = parser.getQName("key"); :}
+ | ANCESTOR
+ {: RESULT = parser.getQName("child"); :}
+
+ | ANCESTORORSELF
+ {: RESULT = parser.getQName("ancestor-or-self"); :}
+
+ | ATTRIBUTE
+ {: RESULT = parser.getQName("attribute"); :}
+
| CHILD
{: RESULT = parser.getQName("child"); :}
+ | DESCENDANT
+ {: RESULT = parser.getQName("decendant"); :}
+
+ | DESCENDANTORSELF
+ {: RESULT = parser.getQName("decendant-or-self"); :}
+
+ | FOLLOWING
+ {: RESULT = parser.getQName("following"); :}
+
+ | FOLLOWINGSIBLING
+ {: RESULT = parser.getQName("following-sibling"); :}
+
+ | NAMESPACE
+ {: RESULT = parser.getQName("namespace"); :}
+
| PARENT
{: RESULT = parser.getQName("parent"); :}
| PRECEDING
{: RESULT = parser.getQName("preceding"); :}
- | ATTRIBUTE
- {: RESULT = parser.getQName("attribute"); :}
+ | PRECEDINGSIBLING
+ {: RESULT = parser.getQName("preceding-sibling"); :}
| SELF
{: RESULT = parser.getQName("self"); :}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
