diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/Expression.java b/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/Expression.java index 1758ca5e1..5b2e5a86c 100644 --- a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/Expression.java +++ b/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/Expression.java @@ -5,7 +5,8 @@ public class Expression { private Assignment assignment; private FunctionCall call; - public Expression() {} + public Expression() { + } public Expression(Assignment assignment, FunctionCall call) { this.assignment = assignment; @@ -27,4 +28,9 @@ public class Expression { public void setCall(FunctionCall call) { this.call = call; } + + @Override + public String toString() { + return (assignment != null ? assignment + "=" : "") + call.toString(); + } } diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/LongArg.java b/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/LongArg.java index 13c29b2b0..53feff376 100644 --- a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/LongArg.java +++ b/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/LongArg.java @@ -13,6 +13,6 @@ public class LongArg implements ArgType { @Override public String toString() { - return String.valueOf(longValue); + return longValue +"L"; } } diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VirtDataFlow.java b/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VirtDataFlow.java index 74ef53709..472d21b27 100644 --- a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VirtDataFlow.java +++ b/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VirtDataFlow.java @@ -27,4 +27,16 @@ public class VirtDataFlow { } return expressions.get(0); } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + for (Expression expression : expressions) { + sb.append(expression).append("; "); + } + if (sb.length()>0) { + sb.setLength(sb.length()-"; ".length()); + } + return sb.toString(); + } }