Repository: incubator-systemml Updated Branches: refs/heads/master 4e5ef6161 -> 107230055
[SYSTEMML-1174] Improve OutputStatement toString Fix case, spacing, and parameter issues. Closes #345. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/10723005 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/10723005 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/10723005 Branch: refs/heads/master Commit: 10723005596d0f6c87994674da4aef5a66803d96 Parents: 4e5ef61 Author: Deron Eriksson <de...@us.ibm.com> Authored: Mon Jan 23 11:39:58 2017 -0800 Committer: Deron Eriksson <de...@us.ibm.com> Committed: Mon Jan 23 11:39:58 2017 -0800 ---------------------------------------------------------------------- .../apache/sysml/parser/OutputStatement.java | 31 +++++++++++++------- .../java/org/apache/sysml/parser/Statement.java | 2 +- 2 files changed, 21 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10723005/src/main/java/org/apache/sysml/parser/OutputStatement.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/parser/OutputStatement.java b/src/main/java/org/apache/sysml/parser/OutputStatement.java index ec58d57..d42432c 100644 --- a/src/main/java/org/apache/sysml/parser/OutputStatement.java +++ b/src/main/java/org/apache/sysml/parser/OutputStatement.java @@ -108,19 +108,28 @@ public class OutputStatement extends Statement public VariableSet initializebackwardLV(VariableSet lo){ return lo; } - - public String toString(){ + + public String toString() { StringBuilder sb = new StringBuilder(); - sb.append(Statement.OUTPUTSTATEMENT + " ( " ); - sb.append( _id.toString() + ", " + _paramsExpr.getVarParam(DataExpression.IO_FILENAME).toString()); - for (String key : _paramsExpr.getVarParams().keySet()){ - if (!key.equals(DataExpression.IO_FILENAME)) - sb.append(", " + key + "=" + _paramsExpr.getVarParam(key)); - } - sb.append(" );"); - return sb.toString(); + sb.append(Statement.OUTPUTSTATEMENT + "("); + sb.append("id=" + _id.toString()); + for (String key : _paramsExpr.getVarParams().keySet()) { + sb.append(", "); + sb.append(key); + sb.append("="); + Expression exp = _paramsExpr.getVarParam(key); + if (exp instanceof StringIdentifier) { + sb.append("\""); + sb.append(exp.toString()); + sb.append("\""); + } else { + sb.append(exp.toString()); + } + } + sb.append(");"); + return sb.toString(); } - + @Override public VariableSet variablesRead() { VariableSet result = new VariableSet(); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/10723005/src/main/java/org/apache/sysml/parser/Statement.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/parser/Statement.java b/src/main/java/org/apache/sysml/parser/Statement.java index c2e00ea..744117d 100644 --- a/src/main/java/org/apache/sysml/parser/Statement.java +++ b/src/main/java/org/apache/sysml/parser/Statement.java @@ -28,7 +28,7 @@ public abstract class Statement protected static final Log LOG = LogFactory.getLog(Statement.class.getName()); - public static final String OUTPUTSTATEMENT = "write"; + public static final String OUTPUTSTATEMENT = "WRITE"; // parameter names for seq() public static final String SEQ_FROM = "from";
