Repository: systemml Updated Branches: refs/heads/master 0ee8800b8 -> e52c8713d
[MINOR] Use default namespace constant rather than String literal Make DMLProgram's DEFAULT_NAMESPACE and INTERNAL_NAMESPACE final. Use DEFAULT_NAMESPACE rather than String literal in FunctionCallIdentifier. Closes #636. Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/e52c8713 Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/e52c8713 Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/e52c8713 Branch: refs/heads/master Commit: e52c8713de4f99114202208ed06ee21106261f69 Parents: 0ee8800 Author: Deron Eriksson <[email protected]> Authored: Thu Aug 24 10:52:57 2017 -0700 Committer: Deron Eriksson <[email protected]> Committed: Thu Aug 24 10:52:57 2017 -0700 ---------------------------------------------------------------------- src/main/java/org/apache/sysml/parser/DMLProgram.java | 4 ++-- .../java/org/apache/sysml/parser/FunctionCallIdentifier.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/e52c8713/src/main/java/org/apache/sysml/parser/DMLProgram.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/parser/DMLProgram.java b/src/main/java/org/apache/sysml/parser/DMLProgram.java index 82ca7a6..716da40 100644 --- a/src/main/java/org/apache/sysml/parser/DMLProgram.java +++ b/src/main/java/org/apache/sysml/parser/DMLProgram.java @@ -33,8 +33,8 @@ public class DMLProgram private ArrayList<StatementBlock> _blocks; private HashMap<String, FunctionStatementBlock> _functionBlocks; private HashMap<String,DMLProgram> _namespaces; - public static String DEFAULT_NAMESPACE = ".defaultNS"; - public static String INTERNAL_NAMESPACE = "_internal"; // used for multi-return builtin functions + public static final String DEFAULT_NAMESPACE = ".defaultNS"; + public static final String INTERNAL_NAMESPACE = "_internal"; // used for multi-return builtin functions private static final Log LOG = LogFactory.getLog(DMLProgram.class.getName()); public DMLProgram(){ http://git-wip-us.apache.org/repos/asf/systemml/blob/e52c8713/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java b/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java index 14880ce..f720840 100644 --- a/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java +++ b/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java @@ -168,8 +168,8 @@ public class FunctionCallIdentifier extends DataIdentifier @Override public String toString() { StringBuilder sb = new StringBuilder(); - if (_namespace != null && _namespace.length() > 0 && !_namespace.equals(".defaultNS")) - sb.append(_namespace + "::"); + if (_namespace != null && _namespace.length() > 0 && !_namespace.equals(DMLProgram.DEFAULT_NAMESPACE)) + sb.append(_namespace + "::"); sb.append(_name); sb.append(" ( ");
