You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by ti...@apache.org on 2009/12/16 00:01:50 UTC
svn commit: r891060 - in
/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime:
CallStackFrame.java GlobalRegisterAccessor.java LocalRegisterAccessor.java
RegisterSet.java base/AbstractRuntimeIterator.java
Author: tillw
Date: Tue Dec 15 23:01:49 2009
New Revision: 891060
URL: http://svn.apache.org/viewvc?rev=891060&view=rev
Log:
- added some toString() methods for debugging
- used XStream with the JsonHierarchicalStreamDriver for runtime iterators
Modified:
incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/CallStackFrame.java
incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/GlobalRegisterAccessor.java
incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/LocalRegisterAccessor.java
incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/RegisterSet.java
incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/base/AbstractRuntimeIterator.java
Modified: incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/CallStackFrame.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/CallStackFrame.java?rev=891060&r1=891059&r2=891060&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/CallStackFrame.java (original)
+++ incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/CallStackFrame.java Tue Dec 15 23:01:49 2009
@@ -49,4 +49,8 @@
public void setLocalRegisters(RegisterSet localRegisters) {
this.localRegisters = localRegisters;
}
+
+ public String toString() {
+ return "G: " + globalRegisters + " L: " + localRegisters;
+ }
}
\ No newline at end of file
Modified: incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/GlobalRegisterAccessor.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/GlobalRegisterAccessor.java?rev=891060&r1=891059&r2=891060&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/GlobalRegisterAccessor.java (original)
+++ incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/GlobalRegisterAccessor.java Tue Dec 15 23:01:49 2009
@@ -40,4 +40,8 @@
public void set(RegisterSet regs, T value) {
regs.setValue(register, value);
}
+
+ public String toString() {
+ return "G@" + register;
+ }
}
\ No newline at end of file
Modified: incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/LocalRegisterAccessor.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/LocalRegisterAccessor.java?rev=891060&r1=891059&r2=891060&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/LocalRegisterAccessor.java (original)
+++ incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/LocalRegisterAccessor.java Tue Dec 15 23:01:49 2009
@@ -40,4 +40,8 @@
public void set(RegisterSet regs, T value) {
regs.setValue(register, value);
}
+
+ public String toString() {
+ return "L@" + register;
+ }
}
\ No newline at end of file
Modified: incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/RegisterSet.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/RegisterSet.java?rev=891060&r1=891059&r2=891060&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/RegisterSet.java (original)
+++ incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/RegisterSet.java Tue Dec 15 23:01:49 2009
@@ -16,6 +16,8 @@
*/
package org.apache.vxquery.runtime;
+import java.util.Arrays;
+
public final class RegisterSet {
private final Object[] regs;
@@ -30,4 +32,8 @@
public void setValue(int reg, Object value) {
regs[reg] = value;
}
+
+ public String toString() {
+ return Arrays.toString(regs);
+ }
}
\ No newline at end of file
Modified: incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/base/AbstractRuntimeIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/base/AbstractRuntimeIterator.java?rev=891060&r1=891059&r2=891060&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/base/AbstractRuntimeIterator.java (original)
+++ incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/base/AbstractRuntimeIterator.java Tue Dec 15 23:01:49 2009
@@ -18,7 +18,15 @@
import org.apache.vxquery.runtime.RegisterAllocator;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
+
public abstract class AbstractRuntimeIterator implements RuntimeIterator {
public AbstractRuntimeIterator(RegisterAllocator rAllocator) {
}
+
+ public String toString() {
+ XStream xstream = new XStream(new JsonHierarchicalStreamDriver());
+ return xstream.toXML(this);
+ }
}
\ No newline at end of file