Update of /cvsroot/doxquery/doxquery/src/com/doxological/doxquery/grammar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19281/com/doxological/doxquery/grammar
Modified Files:
XQElementContentChar.java XQueryGrammar.jjt
Log Message:
1. avoid building UnionOp nodes
2. avoid building empty DirAttributeList nodes
3. added toQuery() to XQElementContentChar.java
Index: XQElementContentChar.java
===================================================================
RCS file: /cvsroot/doxquery/doxquery/src/com/doxological/doxquery/grammar/XQElementContentChar.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XQElementContentChar.java 12 Apr 2005 02:15:26 -0000 1.4
--- XQElementContentChar.java 3 Jun 2005 06:35:14 -0000 1.5
***************
*** 33,35 ****
--- 33,39 ----
return visitor.visit(this, data);
}
+ public String toQuery() {
+ return value;
+ }
+
}
Index: XQueryGrammar.jjt
===================================================================
RCS file: /cvsroot/doxquery/doxquery/src/com/doxological/doxquery/grammar/XQueryGrammar.jjt,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** XQueryGrammar.jjt 6 May 2005 01:18:52 -0000 1.23
--- XQueryGrammar.jjt 3 Jun 2005 06:35:14 -0000 1.24
***************
*** 1006,1010 ****
(IntersectExceptExpr() (UnionOp() IntersectExceptExpr())*) #UnionExpr(>1)
}
! void UnionOp() : {}
{
<UNION> | <BAR>
--- 1006,1010 ----
(IntersectExceptExpr() (UnionOp() IntersectExceptExpr())*) #UnionExpr(>1)
}
! void UnionOp() #void: {}
{
<UNION> | <BAR>
***************
*** 1432,1438 ****
* [95] DirAttributeList ::= (S (QName S? "=" S? DirAttributeValue)?)* [ws:explicit]
*/
! void DirAttributeList() : {}
{
! (<S> (QName() (<S>)? <EQUALS> (<S>)? DirAttributeValue())? )*
}
--- 1432,1440 ----
* [95] DirAttributeList ::= (S (QName S? "=" S? DirAttributeValue)?)* [ws:explicit]
*/
! void DirAttributeList() #void : {}
{
! (<S> (QName() (<S>)? <EQUALS> (<S>)? DirAttributeValue())? )*
! #DirAttributeList(jjtree.nodeArity() > 0)
!
}
|
