tmiller 01/08/15 12:25:43
Modified: java/src/org/apache/xalan/xsltc/compiler xpath.cup
Constants.java
Log:
bug fix 2553, updated Constants for dup processing
and updated CUP rule for AbbreviatedAbsoluteLocationPaths
Revision Changes Path
1.7 +19 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xpath.cup 2001/08/13 17:35:48 1.6
+++ xpath.cup 2001/08/15 19:25:43 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: xpath.cup,v 1.6 2001/08/13 17:35:48 tmiller Exp $
+ * @(#)$Id: xpath.cup,v 1.7 2001/08/15 19:25:43 tmiller Exp $
*
* Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
*
@@ -488,8 +488,24 @@
// create the new abs location path
Step nodeStep1 = new Step(Axis.DESCENDANTORSELF, -1, null);
Step nodeStep2 = new Step(axis, nodeType, null);
- RESULT = new AbsoluteLocationPath(new ParentLocationPath(
- nodeStep1, nodeStep2));
+ AbsoluteLocationPath path = new AbsoluteLocationPath(
+ new ParentLocationPath(nodeStep1, nodeStep2));
+
+ // CASE I: no filtering, nodes OK but have dups,
+ // results of test suite in file: 'REP_UNFILT'
+ RESULT = path;
+
+ // CASE II: Filtered Abs Loc Path -
+ // all tests fail except desOrSelf test,
+ // results of test suite in file: 'REP-FILT'
+ //RESULT = new FilteredAbsoluteLocationPath(path);
+
+
+ // CASE III: Filtered Parent Loc Path -
+ // ancestor and desOrSelf works, all others fail
+ // results of test suite in file: 'REP-FAL-PLP'
+ //RESULT = new FilteredAbsoluteLocationPath(
+ // new ParentLocationPath(nodeStep1, nodeStep2));
:};
Step ::= NodeTest:ntest
1.11 +3 -1
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Constants.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Constants.java 2001/08/03 11:55:25 1.10
+++ Constants.java 2001/08/15 19:25:43 1.11
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Constants.java,v 1.10 2001/08/03 11:55:25 morten Exp $
+ * @(#)$Id: Constants.java,v 1.11 2001/08/15 19:25:43 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -181,6 +181,8 @@
= "org.apache.xalan.xsltc.dom.NthIterator";
public static final String ABSOLUTE_ITERATOR
= "org.apache.xalan.xsltc.dom.AbsoluteIterator";
+ public static final String DUP_FILTERED_ITERATOR
+ = "org.apache.xalan.xsltc.dom.DupFilterIterator";
public static final String CURRENT_NODE_LIST_ITERATOR
= "org.apache.xalan.xsltc.dom.CurrentNodeListIterator";
public static final String CURRENT_NODE_LIST_FILTER
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
