You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sa...@apache.org on 2002/05/10 19:38:32 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/compiler xpath.cup
santiagopg 02/05/10 10:38:32
Modified: java/src/org/apache/xalan/xsltc/compiler xpath.cup
Log:
Fixed StepPattern production to include named PIs.
Revision Changes Path
1.37 +20 -8 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xpath.cup 10 May 2002 15:40:03 -0000 1.36
+++ xpath.cup 10 May 2002 17:38:32 -0000 1.37
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: xpath.cup,v 1.36 2002/05/10 15:40:03 santiagopg Exp $
+ * @(#)$Id: xpath.cup,v 1.37 2002/05/10 17:38:32 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -306,12 +306,6 @@
| SLASH RelativePathPattern:rpp
{: RESULT = new AbsolutePathPattern(rpp); :}
- | ProcessingInstructionPattern:pip
- {: RESULT = pip; :}
-
- | ProcessingInstructionPattern:pip Predicates:pp
- {: RESULT = (ProcessingInstructionPattern)pip.setPredicates(pp); :}
-
| IdKeyPattern:ikp
{: RESULT = ikp; :}
@@ -357,6 +351,12 @@
pp);
:}
+ | ProcessingInstructionPattern:pip
+ {: RESULT = pip; :}
+
+ | ProcessingInstructionPattern:pip Predicates:pp
+ {: RESULT = (ProcessingInstructionPattern)pip.setPredicates(pp); :}
+
| ChildOrAttributeAxisSpecifier:axis NodeTestPattern:nt
{: RESULT=new StepPattern(axis.intValue(),
parser.findNodeType(axis.intValue(), nt),
@@ -368,7 +368,19 @@
{: RESULT = new StepPattern(axis.intValue(),
parser.findNodeType(axis.intValue(),nt),
pp);
- :};
+ :}
+
+ | ChildOrAttributeAxisSpecifier:axis ProcessingInstructionPattern:pip
+ {:
+ RESULT = pip; // TODO: report error if axis is attribute
+ :}
+
+ | ChildOrAttributeAxisSpecifier:axis ProcessingInstructionPattern:pip
+ Predicates:pp
+ {:
+ // TODO: report error if axis is attribute
+ RESULT = (ProcessingInstructionPattern)pip.setPredicates(pp);
+ :};
NodeTestPattern ::= NameTestPattern:nt
{: RESULT = nt; :}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org