[Exist-commits] eXist-1.0/src/org/exist/xupdate Modification.java,1.43,1.44 XUpdateProcessor.java,1.44,1.45

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

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

Modified Files:
	Modification.java XUpdateProcessor.java 
Log Message:
Redesign to prepare changes to predicate processing:

1) assign a unique expression id to every expression in a compiled XQuery
2) refactored Expression.analyze. The context info that has previously been passed as parameters has been moved into class AnalyzeContextInfo. The new signature for Expression.analyze is analyze(AnalyzeContextInfo).

Index: XUpdateProcessor.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xupdate/XUpdateProcessor.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** XUpdateProcessor.java	7 Jan 2006 21:47:15 -0000	1.44
--- XUpdateProcessor.java	14 Jan 2006 21:51:18 -0000	1.45
***************
*** 50,53 ****
--- 50,54 ----
  import org.exist.util.Configuration;
  import org.exist.util.FastStringBuffer;
+ import org.exist.xquery.AnalyzeContextInfo;
  import org.exist.xquery.Constants;
  import org.exist.xquery.PathExpr;
***************
*** 696,700 ****
  				throw new SAXException(treeParser.getErrorMessage());
  			}
! 			expr.analyze(null, 0);
  			Sequence seq = expr.eval(null, null);
  			return seq;
--- 697,701 ----
  				throw new SAXException(treeParser.getErrorMessage());
  			}
! 			expr.analyze(new AnalyzeContextInfo());
  			Sequence seq = expr.eval(null, null);
  			return seq;

Index: Modification.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xupdate/Modification.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Modification.java	7 Jan 2006 21:47:15 -0000	1.43
--- Modification.java	14 Jan 2006 21:51:18 -0000	1.44
***************
*** 123,127 ****
  		    context = compiled.getContext();
  
- 		context.setExclusiveMode(true);
  		context.setStaticallyKnownDocuments(docs);
  		declareNamespaces(context);
--- 123,126 ----