Menu
▾
▴
[Exist-commits] eXist-1.0/src/org/exist/xquery Union.java,1.8,1.9 DynamicAttributeConstructor.java,1.4,1.5 Except.java,1.6,1.7 GeneralComparison.java,1.43,1.44 ForExpr.java,1.24,1.25 AttributeConstructor.java,1.5,1.6 OpOr.java,1.5,1.6 DynamicCardinalityCheck.java,1.7,1.8 PathExpr.java,1.21,1.22 RootNode.java,1.10,1.11 CommentConstructor.java,1.4,1.5 LetExpr.java,1.16,1.17 VariableReference.java,1.8,1.9 OpAnd.java,1.6,1.7 NamespaceConstructor.java,1.3,1.4 ElementConstructor.java,1.13,1.14 LiteralValue.java,1.4,1.5 ConditionalExpression.java,1.5,1.6 CastableExpression.java,1.2,1.3 EnclosedExpr.java,1.8,1.9 CDATAConstructor.java,1.1,1.2 Intersection.java,1.6,1.7 DynamicTextConstructor.java,1.2,1.3 AtomicToString.java,1.3,1.4 Step.java,1.4,1.5 DocumentConstructor.java,1.3,1.4 InstanceOfExpression.java,1.3,1.4 VariableDeclaration.java,1.8,1.9 FilteredExpression.java,1.4,1.5 QuantifiedExpression.java,1.13,1.14 DynamicPIConstructor.java,1.2,1.3 Atomize.java,1.6,1.7 Function.java,1.17,1.18 OpNumeric.java,1.4,1.5 DynamicCommentConstructor.java,1.2,1.3 CastExpression.java,1.6,1.7 UntypedValueCheck.java,1.7,1.8 DynamicNameCheck.java,1.1,1.2 SequenceConstructor.java,1.6,1.7 TextConstructor.java,1.5,1.6 DynamicTypeCheck.java,1.7,1.8 PIConstructor.java,1.3,1.4 NodeComparison.java,1.4,1.5
Update of /cvsroot/exist/eXist-1.0/src/org/exist/xquery In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20795/src/org/exist/xquery Modified Files: Union.java DynamicAttributeConstructor.java Except.java GeneralComparison.java ForExpr.java AttributeConstructor.java OpOr.java DynamicCardinalityCheck.java PathExpr.java RootNode.java CommentConstructor.java LetExpr.java VariableReference.java OpAnd.java NamespaceConstructor.java ElementConstructor.java LiteralValue.java ConditionalExpression.java CastableExpression.java EnclosedExpr.java CDATAConstructor.java Intersection.java DynamicTextConstructor.java AtomicToString.java Step.java DocumentConstructor.java InstanceOfExpression.java VariableDeclaration.java FilteredExpression.java QuantifiedExpression.java DynamicPIConstructor.java Atomize.java Function.java OpNumeric.java DynamicCommentConstructor.java CastExpression.java UntypedValueCheck.java DynamicNameCheck.java SequenceConstructor.java TextConstructor.java DynamicTypeCheck.java PIConstructor.java NodeComparison.java Log Message: Added toString() methods to XPath exressions in order to simplify debugging (at least for me). Index: DynamicNameCheck.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/DynamicNameCheck.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DynamicNameCheck.java 6 Jan 2005 17:53:38 -0000 1.1 --- DynamicNameCheck.java 29 Oct 2005 10:51:12 -0000 1.2 *************** *** 103,106 **** --- 103,115 ---- dumper.display(')'); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(Type.getTypeName(test.nodeType)); + result.append('('); + result.append(expression.toString()); + result.append(')'); + return result.toString(); + } } Index: Union.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/Union.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Union.java 26 Oct 2005 17:48:13 -0000 1.8 --- Union.java 29 Oct 2005 10:51:11 -0000 1.9 *************** *** 69,71 **** --- 69,79 ---- right.dump(dumper); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(left.toString()); + result.append(" union "); + result.append(right.toString()); + return result.toString(); + } } Index: DocumentConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/DocumentConstructor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DocumentConstructor.java 14 Nov 2004 22:15:11 -0000 1.3 --- DocumentConstructor.java 29 Oct 2005 10:51:12 -0000 1.4 *************** *** 124,127 **** --- 124,135 ---- dumper.nl().display('}'); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("document { "); + result.append(content.toString()); + result.append(" }"); + return result.toString(); + } } Index: Step.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/Step.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Step.java 16 Nov 2004 15:47:04 -0000 1.4 --- Step.java 29 Oct 2005 10:51:12 -0000 1.5 *************** *** 85,88 **** --- 85,89 ---- dumper.display( "::" ); if ( test != null ) + //TODO : toString() or... dump ? dumper.display( test.toString() ); else *************** *** 96,99 **** --- 97,118 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + if ( axis > -1 ) + result.append( Constants.AXISSPECIFIERS[axis] ); + result.append( "::" ); + if ( test != null ) + result.append( test.toString() ); + else + result.append( "node()" ); + if ( predicates.size() > 0 ) + for ( Iterator i = predicates.iterator(); i.hasNext(); ) { + result.append( '[' ); + result.append(( (Predicate) i.next() ).toString()); + result.append( ']' ); + } + return result.toString(); + } + public int returnsType() { return Type.NODE; Index: DynamicTypeCheck.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/DynamicTypeCheck.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DynamicTypeCheck.java 6 Jan 2005 17:53:38 -0000 1.7 --- DynamicTypeCheck.java 29 Oct 2005 10:51:12 -0000 1.8 *************** *** 86,89 **** --- 86,98 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(Type.getTypeName(requiredType)); + result.append('('); + result.append(expression.toString()); + result.append(')'); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: GeneralComparison.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/GeneralComparison.java,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** GeneralComparison.java 15 Oct 2005 16:59:32 -0000 1.43 --- GeneralComparison.java 29 Oct 2005 10:51:11 -0000 1.44 *************** *** 562,565 **** --- 562,573 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(getLeft().toString()); + result.append(' ').append(Constants.OPS[relation]).append(' '); + result.append(getRight().toString()); + return result.toString(); + } + protected void switchOperands() { switch (relation) { Index: Except.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/Except.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Except.java 26 Oct 2005 17:48:13 -0000 1.6 --- Except.java 29 Oct 2005 10:51:11 -0000 1.7 *************** *** 80,82 **** --- 80,90 ---- right.dump(dumper); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(left.toString()); + result.append(" except "); + result.append(right.toString()); + return result.toString(); + } } Index: DynamicTextConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/DynamicTextConstructor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DynamicTextConstructor.java 14 Nov 2004 22:15:11 -0000 1.2 --- DynamicTextConstructor.java 29 Oct 2005 10:51:12 -0000 1.3 *************** *** 88,91 **** --- 88,99 ---- dumper.nl().display("}"); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("text { "); + result.append(content.toString()); + result.append(" }"); + return result.toString(); + } } Index: Function.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/Function.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Function.java 20 Jun 2005 10:44:28 -0000 1.17 --- Function.java 29 Oct 2005 10:51:12 -0000 1.18 *************** *** 403,406 **** --- 403,420 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(getName()); + result.append('('); + for (Iterator i = steps.iterator(); i.hasNext();) { + Expression e = (Expression) i.next(); + result.append(e.toString()); + if(i.hasNext()) + result.append(", "); + } + result.append(')'); + return result.toString(); + } + public void setASTNode(XQueryAST ast) { this.astNode = ast; Index: CastableExpression.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/CastableExpression.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CastableExpression.java 14 Nov 2004 22:15:11 -0000 1.2 --- CastableExpression.java 29 Oct 2005 10:51:12 -0000 1.3 *************** *** 110,113 **** --- 110,121 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(expression.toString()); + result.append(" castable as "); + result.append(Type.getTypeName(requiredType)); + return result.toString(); + } + public void resetState() { expression.resetState(); Index: CommentConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/CommentConstructor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CommentConstructor.java 28 Oct 2005 16:53:42 -0000 1.4 --- CommentConstructor.java 29 Oct 2005 10:51:11 -0000 1.5 *************** *** 64,66 **** --- 64,71 ---- dumper.nl().display("comment { ").display(data).display(" }"); } + + public String toString() { + return "comment { " + data.toString() + " }"; + } + } Index: LiteralValue.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/LiteralValue.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LiteralValue.java 14 Nov 2004 22:15:11 -0000 1.4 --- LiteralValue.java 29 Oct 2005 10:51:11 -0000 1.5 *************** *** 81,84 **** --- 81,95 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + if(Type.subTypeOf(value.getType(), Type.STRING)) { + result.append("\""); + result.append(value.toString()); + result.append("\""); + } else + result.append(value.toString()); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: NodeComparison.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/NodeComparison.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NodeComparison.java 20 Feb 2005 12:27:55 -0000 1.4 --- NodeComparison.java 29 Oct 2005 10:51:12 -0000 1.5 *************** *** 124,126 **** --- 124,134 ---- getRight().dump(dumper); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(getLeft().toString()); + result.append(' ').append(Constants.OPS[relation]).append(' '); + result.append(getRight().toString()); + return result.toString(); + } } Index: OpOr.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/OpOr.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OpOr.java 29 Oct 2005 07:40:48 -0000 1.5 --- OpOr.java 29 Oct 2005 10:51:11 -0000 1.6 *************** *** 74,76 **** --- 74,88 ---- } } + + public String toString() { + if (getLength() == 0) + return ""; + StringBuffer result = new StringBuffer(); + result.append(getExpression(0).toString()); + for (int i = 1; i < getLength(); i++) { + result.append(") or ("); + result.append(getExpression(i).toString()); + } + return result.toString(); + } } Index: AtomicToString.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/AtomicToString.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AtomicToString.java 14 Nov 2004 22:15:11 -0000 1.3 --- AtomicToString.java 29 Oct 2005 10:51:12 -0000 1.4 *************** *** 82,85 **** --- 82,93 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("xs:string("); + result.append(expression.toString()); + result.append(")"); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: DynamicCommentConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/DynamicCommentConstructor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DynamicCommentConstructor.java 14 Nov 2004 22:15:11 -0000 1.2 --- DynamicCommentConstructor.java 29 Oct 2005 10:51:12 -0000 1.3 *************** *** 88,90 **** --- 88,99 ---- dumper.nl().display("}"); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("comment { "); + result.append(content.toString()); + result.append(" }"); + return result.toString(); + } + } Index: DynamicCardinalityCheck.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/DynamicCardinalityCheck.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DynamicCardinalityCheck.java 20 Feb 2005 12:27:55 -0000 1.7 --- DynamicCardinalityCheck.java 29 Oct 2005 10:51:11 -0000 1.8 *************** *** 89,92 **** --- 89,100 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("#cardinality( "); + result.append(expression.toString()); + result.append(" )"); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: OpNumeric.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/OpNumeric.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** OpNumeric.java 22 Jul 2005 19:10:39 -0000 1.4 --- OpNumeric.java 29 Oct 2005 10:51:12 -0000 1.5 *************** *** 151,154 **** --- 151,162 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(getLeft().toString()); + result.append(' ').append(Constants.OPS[operator]).append(' '); + result.append(getRight()); + return result.toString(); + } + // excerpt from operator mapping table in XQuery 1.0 section B.2 // http://www.w3.org/TR/xquery/#mapping Index: ForExpr.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/ForExpr.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ForExpr.java 26 Oct 2005 16:41:04 -0000 1.24 --- ForExpr.java 29 Oct 2005 10:51:11 -0000 1.25 *************** *** 27,30 **** --- 27,31 ---- import org.exist.dom.NodeSet; import org.exist.dom.QName; + import org.exist.xquery.parser.XQueryAST; import org.exist.xquery.util.ExpressionDumper; import org.exist.xquery.value.IntegerValue; *************** *** 285,288 **** --- 286,321 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("for "); + result.append("$").append(varName); + if(positionalVariable != null) + result.append(" at ").append(positionalVariable); + if(sequenceType != null) + result.append(" as ").append(sequenceType); + result.append(" in "); + result.append(inputSequence.toString()); + result.append(" "); + if(whereExpr != null) { + result.append("where"); + result.append(" "); + result.append(whereExpr.toString()); + result.append(" "); + } + if(orderSpecs != null) { + result.append("order by "); + for(int i = 0; i < orderSpecs.length; i++) { + if(i > 0) + result.append(", "); + result.append(orderSpecs[i].toString()); + } + result.append(" "); + } + result.append("return"); + result.append(" "); + result.append(returnExpr.toString()); + result.append(""); + return result.toString(); + } /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: VariableDeclaration.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/VariableDeclaration.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** VariableDeclaration.java 16 Oct 2005 09:43:12 -0000 1.8 --- VariableDeclaration.java 29 Oct 2005 10:51:12 -0000 1.9 *************** *** 129,132 **** --- 129,144 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("declare variable $").append(qname); + if(sequenceType != null) { + result.append(" as ").append(sequenceType.toString()); + } + result.append("{ "); + result.append(expression.toString()); + result.append(" }"); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: ConditionalExpression.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/ConditionalExpression.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ConditionalExpression.java 27 Sep 2005 15:31:28 -0000 1.5 --- ConditionalExpression.java 29 Oct 2005 10:51:11 -0000 1.6 *************** *** 118,121 **** --- 118,132 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("if ( "); + result.append(testExpr.toString()); + result.append(" ) then "); + result.append(thenExpr.toString()); + result.append(" else "); + result.append(elseExpr.toString()); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: PathExpr.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/PathExpr.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** PathExpr.java 29 Oct 2005 07:40:48 -0000 1.21 --- PathExpr.java 29 Oct 2005 10:51:11 -0000 1.22 *************** *** 214,217 **** --- 214,240 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + Expression next = null; + int count = 0; + for (Iterator iter = steps.iterator(); iter.hasNext(); count++) { + next = (Expression) iter.next(); + // Open a first parenthesis + if (next instanceof LogicalOp) + result.append('('); + if(count > 0) { + if(next instanceof Step) + result.append('/'); + else + result.append(' '); + } + result.append(next.toString()); + } + // Close the last parenthesis + if (next instanceof LogicalOp) + result.append(')'); + return result.toString(); + } + public int returnsType() { if (steps.size() == 0) return Type.NODE; Index: CDATAConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/CDATAConstructor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CDATAConstructor.java 26 Dec 2004 16:40:29 -0000 1.1 --- CDATAConstructor.java 29 Oct 2005 10:51:12 -0000 1.2 *************** *** 69,71 **** --- 69,76 ---- dumper.display("<![CDATA[").display(cdata).display("]]>"); } + + public String toString() { + return "<![CDATA[" + cdata.toString() + "]]>"; + } + } Index: InstanceOfExpression.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/InstanceOfExpression.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InstanceOfExpression.java 6 Jan 2005 17:53:38 -0000 1.3 --- InstanceOfExpression.java 29 Oct 2005 10:51:12 -0000 1.4 *************** *** 89,92 **** --- 89,100 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(expression); + result.append(" instance of "); + result.append(type.toString()); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: QuantifiedExpression.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/QuantifiedExpression.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** QuantifiedExpression.java 29 Oct 2005 07:40:48 -0000 1.13 --- QuantifiedExpression.java 29 Oct 2005 10:51:12 -0000 1.14 *************** *** 104,107 **** --- 104,121 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(mode == SOME ? "some" : "every"); + result.append(" $").append(varName).append(" in"); + result.append(" "); + result.append(inputSequence.toString()); + result.append(" "); + result.append("satisfies"); + result.append(" "); + result.append(returnExpr.toString()); + result.append(" "); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: CastExpression.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/CastExpression.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CastExpression.java 2 Jan 2005 12:51:57 -0000 1.6 --- CastExpression.java 29 Oct 2005 10:51:12 -0000 1.7 *************** *** 106,109 **** --- 106,117 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(expression.toString()); + result.append(" cast as "); + result.append(Type.getTypeName(requiredType)); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: AttributeConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/AttributeConstructor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AttributeConstructor.java 14 Nov 2004 22:15:11 -0000 1.5 --- AttributeConstructor.java 29 Oct 2005 10:51:11 -0000 1.6 *************** *** 143,146 **** --- 143,162 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("attribute { ").append(qname); + result.append(" } {"); + Object next; + for(Iterator i = contents.iterator(); i.hasNext(); ) { + next = i.next(); + if(next instanceof Expression) + result.append(((Expression)next).toString()); + else + result.append(next.toString()); + } + result.append(" }"); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.NodeConstructor#resetState() Index: LetExpr.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/LetExpr.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** LetExpr.java 26 Oct 2005 16:41:04 -0000 1.16 --- LetExpr.java 29 Oct 2005 10:51:11 -0000 1.17 *************** *** 163,166 **** --- 163,167 ---- if(i > 0) dumper.display(", "); + //TODO : toString() or... dump ? dumper.display(orderSpecs[i].toString()); } *************** *** 171,173 **** --- 172,197 ---- dumper.endIndent(); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("let "); + result.append("$").append(varName); + result.append(" := "); + result.append(inputSequence.toString()); + if(whereExpr != null) { + result.append(" where "); + result.append(whereExpr.toString()); + } + if(orderSpecs != null) { + result.append(" order by "); + for(int i = 0; i < orderSpecs.length; i++) { + if(i > 0) + result.append(", "); + result.append(orderSpecs[i].toString()); + } + } + result.append("return "); + result.append(returnExpr.toString()); + return result.toString(); + } } Index: VariableReference.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/VariableReference.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** VariableReference.java 28 Jan 2005 20:19:45 -0000 1.8 --- VariableReference.java 29 Oct 2005 10:51:11 -0000 1.9 *************** *** 83,86 **** --- 83,90 ---- } + public String toString() { + return "$" + qname; + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: Intersection.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/Intersection.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Intersection.java 26 Oct 2005 17:48:13 -0000 1.6 --- Intersection.java 29 Oct 2005 10:51:12 -0000 1.7 *************** *** 84,86 **** --- 84,94 ---- right.dump(dumper); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(left.toString()); + result.append(" intersect "); + result.append(right.toString()); + return result.toString(); + } } Index: Atomize.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/Atomize.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Atomize.java 2 Jan 2005 18:17:07 -0000 1.6 --- Atomize.java 29 Oct 2005 10:51:12 -0000 1.7 *************** *** 82,85 **** --- 82,93 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("#atomize("); + result.append(expression.toString()); + result.append(")"); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: OpAnd.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/OpAnd.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** OpAnd.java 29 Oct 2005 07:40:48 -0000 1.6 --- OpAnd.java 29 Oct 2005 10:51:11 -0000 1.7 *************** *** 80,82 **** --- 80,94 ---- } } + + public String toString() { + if (getLength() == 0) + return ""; + StringBuffer result = new StringBuffer(); + result.append(getExpression(0).toString()); + for (int i = 1; i < getLength(); i++) { + result.append(") and ("); + result.append(getExpression(i).toString()); + } + return result.toString(); + } } Index: DynamicPIConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/DynamicPIConstructor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DynamicPIConstructor.java 14 Nov 2004 22:15:11 -0000 1.2 --- DynamicPIConstructor.java 29 Oct 2005 10:51:12 -0000 1.3 *************** *** 112,114 **** --- 112,124 ---- dumper.endIndent().nl().display("}"); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("processing-instruction { "); + result.append(name.toString()); + result.append(" } { "); + result.append(content.toString()); + result.append(" }"); + return result.toString(); + } } Index: NamespaceConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/NamespaceConstructor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** NamespaceConstructor.java 14 Nov 2004 22:15:11 -0000 1.3 --- NamespaceConstructor.java 29 Oct 2005 10:51:11 -0000 1.4 *************** *** 96,98 **** --- 96,107 ---- dumper.display(" }"); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("namespace ").append(prefix); + result.append("{ "); + result.append(uri.toString()); + result.append(" }"); + return result.toString(); + } } Index: EnclosedExpr.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/EnclosedExpr.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EnclosedExpr.java 14 Nov 2004 22:15:11 -0000 1.8 --- EnclosedExpr.java 29 Oct 2005 10:51:12 -0000 1.9 *************** *** 111,113 **** --- 111,121 ---- dumper.nl().display("}"); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("{ "); + result.append(super.toString()); + result.append(" }"); + return result.toString(); + } } Index: DynamicAttributeConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/DynamicAttributeConstructor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DynamicAttributeConstructor.java 14 Nov 2004 22:15:11 -0000 1.4 --- DynamicAttributeConstructor.java 29 Oct 2005 10:51:11 -0000 1.5 *************** *** 111,113 **** --- 111,123 ---- dumper.nl().display("}"); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("attribute { "); + result.append(qnameExpr.toString()); + result.append(" } { "); + result.append(valueExpr.toString()); + result.append(" }"); + return result.toString(); + } } Index: UntypedValueCheck.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/UntypedValueCheck.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** UntypedValueCheck.java 20 Feb 2005 12:27:55 -0000 1.7 --- UntypedValueCheck.java 29 Oct 2005 10:51:12 -0000 1.8 *************** *** 107,110 **** --- 107,119 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("#type:").append(Type.getTypeName(requiredType)); + result.append('('); + result.append(expression.toString()); + result.append(')'); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: TextConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/TextConstructor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TextConstructor.java 14 Nov 2004 22:15:11 -0000 1.5 --- TextConstructor.java 29 Oct 2005 10:51:12 -0000 1.6 *************** *** 84,87 **** --- 84,95 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("text { "); + result.append(text.toString()); + result.append(" }"); + return result.toString(); + } + protected final static boolean isWhiteSpace(char ch) { return (ch == 0x20) || (ch == 0x09) || (ch == 0xD) || (ch == 0xA); Index: FilteredExpression.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/FilteredExpression.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FilteredExpression.java 14 Nov 2004 22:15:11 -0000 1.4 --- FilteredExpression.java 29 Oct 2005 10:51:12 -0000 1.5 *************** *** 98,101 **** --- 98,112 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append(expression.toString()); + for (Iterator i = predicates.iterator(); i.hasNext();) { + result.append('['); + result.append(((Expression)i.next()).toString()); + result.append(']'); + } + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: PIConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/PIConstructor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PIConstructor.java 14 Nov 2004 22:15:11 -0000 1.3 --- PIConstructor.java 29 Oct 2005 10:51:12 -0000 1.4 *************** *** 80,82 **** --- 80,92 ---- dumper.endIndent().nl().display("}"); } + + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("processing-instruction { "); + result.append(target.toString()); + result.append(" } { "); + result.append(data.toString()); + result.append(" }"); + return result.toString(); + } } Index: SequenceConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/SequenceConstructor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SequenceConstructor.java 14 Nov 2004 22:15:11 -0000 1.6 --- SequenceConstructor.java 29 Oct 2005 10:51:12 -0000 1.7 *************** *** 77,80 **** --- 77,91 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("( "); + for(Iterator i = steps.iterator(); i.hasNext(); ) { + result.append(((Expression) i.next()).toString()); + result.append(", "); + } + result.append(" )"); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.Expression#returnsType() Index: ElementConstructor.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/ElementConstructor.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ElementConstructor.java 24 Sep 2005 20:41:39 -0000 1.13 --- ElementConstructor.java 29 Oct 2005 10:51:11 -0000 1.14 *************** *** 207,210 **** --- 207,236 ---- } + public String toString() { + StringBuffer result = new StringBuffer(); + result.append("element { "); + result.append(qnameExpr.toString()); + result.append(" } { "); + if(attributes != null) { + AttributeConstructor attr; + for(int i = 0; i < attributes.length; i++) { + if(i > 0) + result.append(" "); + attr = (AttributeConstructor)attributes[i]; + result.append(attr.toString()); + } + } + if(content != null) { + for(Iterator i = content.steps.iterator(); i.hasNext(); ) { + Expression expr = (Expression) i.next(); + result.append(expr.toString()); + if(i.hasNext()) + result.append(" "); + } + } + result.append(" }"); + return result.toString(); + } + /* (non-Javadoc) * @see org.exist.xquery.AbstractExpression#setPrimaryAxis(int) Index: RootNode.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/RootNode.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RootNode.java 27 May 2005 20:56:06 -0000 1.10 --- RootNode.java 29 Oct 2005 10:51:11 -0000 1.11 *************** *** 97,100 **** --- 97,104 ---- } + public String toString() { + return "/ROOT"; + } + /* * (non-Javadoc) |