[Exist-commits] eXist-1.0/src/org/exist/xquery/parser XQueryParser.java,1.7,1.8 XQueryTreeParser.java,1.5,1.6

[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-serv16385/src/org/exist/xquery/parser

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

Index: XQueryTreeParser.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQueryTreeParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** XQueryTreeParser.java	25 Feb 2004 15:31:57 -0000	1.5
--- XQueryTreeParser.java	16 Apr 2004 14:44:24 -0000	1.6
***************
*** 1523,1528 ****
  			
  					OpOr or= new OpOr(context);
! 					or.add(left);
! 					or.add(right);
  					path.addPath(or);
  					step = or;
--- 1523,1528 ----
  			
  					OpOr or= new OpOr(context);
! 					or.addPath(left);
! 					or.addPath(right);
  					path.addPath(or);
  					step = or;
***************
*** 1548,1553 ****
  			
  					OpAnd and= new OpAnd(context);
! 					and.add(left);
! 					and.add(right);
  					path.addPath(and);
  					step = and;
--- 1548,1553 ----
  			
  					OpAnd and= new OpAnd(context);
! 					and.addPath(left);
! 					and.addPath(right);
  					path.addPath(and);
  					step = and;
***************
*** 3715,3719 ****
  							String namespaceURI= context.getURIForPrefix(nc3.getText());
  							if (namespaceURI == null)
! 								throw new EXistException("No namespace defined for prefix " + nc.getText());
  							qname= new QName(null, namespaceURI, null);
  						
--- 3715,3719 ----
  							String namespaceURI= context.getURIForPrefix(nc3.getText());
  							if (namespaceURI == null)
! 								throw new EXistException("No namespace defined for prefix " + nc3.getText());
  							qname= new QName(null, namespaceURI, null);
  						

Index: XQueryParser.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQueryParser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** XQueryParser.java	8 Mar 2004 11:21:22 -0000	1.7
--- XQueryParser.java	16 Apr 2004 14:44:22 -0000	1.8
***************
*** 3358,3361 ****
--- 3358,3362 ----
  					case LITERAL_function:
  					case LITERAL_variable:
+ 					case LITERAL_element:
  					case LITERAL_import:
  					case LITERAL_at:
***************
*** 4176,4179 ****
--- 4177,4181 ----
  		case LITERAL_function:
[...1237 lines suppressed...]
  	private static final long[] mk_tokenSet_9() {
! 		long[] data = { -8388117446015320064L, -33887691393268129L, 237631L, 0L, 0L, 0L};
  		return data;
  	}
  	public static final BitSet _tokenSet_9 = new BitSet(mk_tokenSet_9());
  	private static final long[] mk_tokenSet_10() {
! 		long[] data = { -6086786969960972288L, -35576541255629217L, 229411L, 0L, 0L, 0L};
  		return data;
  	}
--- 6197,6206 ----
  	public static final BitSet _tokenSet_8 = new BitSet(mk_tokenSet_8());
  	private static final long[] mk_tokenSet_9() {
! 		long[] data = { -8385865646201634816L, -33887691393268129L, 237631L, 0L, 0L, 0L};
  		return data;
  	}
  	public static final BitSet _tokenSet_9 = new BitSet(mk_tokenSet_9());
  	private static final long[] mk_tokenSet_10() {
! 		long[] data = { -6084535170147287040L, -35576541255629217L, 229411L, 0L, 0L, 0L};
  		return data;
  	}