Fixed incorrect formatting of results from string concatenation.

orc-lang · Apr 27, 2011 · 768e231 · 768e231
1 parent a050654
commit 768e231
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/OrcScala/src/orc/lib/math/Add.java b/OrcScala/src/orc/lib/math/Add.java
@@ -91,11 +91,11 @@ public Object evaluate(final Args args) throws TokenException {
 				try {
 					// the first argument is a string
 					final String a = args.stringArg(0);
-					return a + String.valueOf(args.getArg(1));
+					return a + orc.values.Format.formatValueR(args.getArg(1), false);
 				} catch (final TokenException _3) {
 					// the second argument is a string
 					final String b = args.stringArg(1);
-					return String.valueOf(args.getArg(0)) + b;
+					return orc.values.Format.formatValueR(args.getArg(0), false) + b;
 				}
 			}
 		}

diff --git a/OrcScala/src/orc/values/Format.scala b/OrcScala/src/orc/values/Format.scala
@@ -28,17 +28,24 @@ package orc.values
  */
 object Format {
 
-  def formatValue(v: Any): String =
+
+  def formatValue(v: Any): String = {
+    // Escape strings by default
+    formatValue(v, true)
+  }
+
+  def formatValue(v: Any, escapeStrings: Boolean): String =
     v match {
       case null => "null"
       case l: List[_] => "[" + formatSequence(l) + "]"
-      case s: String => unparseString(s)
+      case s: String => if (escapeStrings) { unparseString(s) } else s
       case orcv: OrcValue => orcv.toOrcSyntax()
       case other => other.toString()
     }
 
   // For Java callers:
   def formatValueR(v: AnyRef): String = formatValue(v)
+  def formatValueR(v: AnyRef, escapeStrings: Boolean): String = formatValue(v, escapeStrings)
 
   def formatSequence(vs : List[_]) = 
     vs match {