[Exist-commits] eXist-1.0/src/org/exist/xquery/parser XQuery.g,1.7,1.8

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15636/src/org/exist/xquery/parser

Modified Files:
	XQuery.g 
Log Message:
XQuery parser failed to correctly parse logical operators with complex operands.

Index: XQuery.g
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQuery.g,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** XQuery.g	14 Apr 2004 12:17:25 -0000	1.7
--- XQuery.g	16 Apr 2004 14:40:54 -0000	1.8
***************
*** 811,814 ****
--- 811,816 ----
  { name= null; }
  :
+ 	"element" { name = "element"; }
+ 	|
      "to" { name = "to"; }
      |
***************
*** 1547,1552 ****
  	{
  		OpOr or= new OpOr(context);
! 		or.add(left);
! 		or.add(right);
  		path.addPath(or);
  		step = or;
--- 1549,1554 ----
  	{
  		OpOr or= new OpOr(context);
! 		or.addPath(left);
! 		or.addPath(right);
  		path.addPath(or);
  		step = or;
***************
*** 1564,1569 ****
  	{
  		OpAnd and= new OpAnd(context);
! 		and.add(left);
! 		and.add(right);
  		path.addPath(and);
  		step = and;
--- 1566,1571 ----
  	{
  		OpAnd and= new OpAnd(context);
! 		and.addPath(left);
! 		and.addPath(right);
  		path.addPath(and);
  		step = and;