[Exist-commits] eXist-1.0/src/org/exist/xquery/parser XQueryTreeParser.java,1.20,1.21 XQuery.g,1.25,1.26

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

Modified Files:
	XQueryTreeParser.java XQuery.g 
Log Message:
Fix for bug 1015954: Computed Node Constructors.

Index: XQueryTreeParser.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQueryTreeParser.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** XQueryTreeParser.java	12 Sep 2004 09:25:18 -0000	1.20
--- XQueryTreeParser.java	13 Sep 2004 14:06:36 -0000	1.21
***************
*** 248,254 ****
  			
  						SequenceConstructor sc= new SequenceConstructor(context);
! 						sc.addExpression(left);
! 						sc.addExpression(right);
! 						path.add(sc);
  						step = sc;
  					
--- 248,254 ----
  			
  						SequenceConstructor sc= new SequenceConstructor(context);
! 						sc.addPath(left);
! 						sc.addPath(right);
! 						path.addPath(sc);
  						step = sc;
  					
***************
*** 4540,4545 ****
  						c.setASTNode(qn);
  						step= c;
! 						elementContent = new EnclosedExpr(context);
! 						c.setContent(elementContent);
  						PathExpr qnamePathExpr = new PathExpr(context);
  						c.setNameExpr(qnamePathExpr);
--- 4540,4547 ----
  						c.setASTNode(qn);
  						step= c;
! 						elementContent = new SequenceConstructor(context);
! 						EnclosedExpr enclosed = new EnclosedExpr(context);
! 						enclosed.addPath(elementContent);
! 						c.setContent(enclosed);
  						PathExpr qnamePathExpr = new PathExpr(context);
  						c.setNameExpr(qnamePathExpr);

Index: XQuery.g
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/parser/XQuery.g,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** XQuery.g	12 Sep 2004 09:25:18 -0000	1.25
--- XQuery.g	13 Sep 2004 14:06:36 -0000	1.26
***************
*** 1416,1422 ****
  		{
  			SequenceConstructor sc= new SequenceConstructor(context);
! 			sc.addExpression(left);
! 			sc.addExpression(right);
! 			path.add(sc);
  			step = sc;
  		}
--- 1416,1422 ----
  		{
  			SequenceConstructor sc= new SequenceConstructor(context);
! 			sc.addPath(left);
! 			sc.addPath(right);
! 			path.addPath(sc);
  			step = sc;
  		}
***************
*** 2434,2439 ****
  			c.setASTNode(qn);
  			step= c;
! 			elementContent = new EnclosedExpr(context);
! 			c.setContent(elementContent);
  			PathExpr qnamePathExpr = new PathExpr(context);
  			c.setNameExpr(qnamePathExpr);
--- 2434,2441 ----
  			c.setASTNode(qn);
  			step= c;
! 			elementContent = new SequenceConstructor(context);
! 			EnclosedExpr enclosed = new EnclosedExpr(context);
! 			enclosed.addPath(elementContent);
! 			c.setContent(enclosed);
  			PathExpr qnamePathExpr = new PathExpr(context);
  			c.setNameExpr(qnamePathExpr);