adding nil to strings (with the + operator) adds an empty string.

previously "()" was added.
programming-nu · Nov 18, 2010 · 3c27800 · 3c27800
1 parent 89ad15d
commit 3c27800
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/objc/operator.m b/objc/operator.m
@@ -1060,7 +1060,10 @@ - (id) callWithArguments:(id)cdr context:(NSMutableDictionary *)context
         NSMutableString *result = [NSMutableString stringWithString:[firstArgument stringValue]];
         id cursor = [cdr cdr];
         while (cursor && (cursor != Nu__null)) {
-            [result appendString:[[[cursor car] evalWithContext:context] stringValue]];
+            id carValue = [[cursor car] evalWithContext:context];
+            if (carValue && (carValue != Nu__null)) {
+                [result appendString:[carValue stringValue]];
+            }
             cursor = [cursor cdr];
         }
         return result;
@@ -1914,7 +1917,7 @@ @interface Nu_sleep_operator : NuOperator {}
 @implementation Nu_sleep_operator
 - (id) callWithArguments:(id)cdr context:(NSMutableDictionary *)context
 {
-	int result = -1;
+    int result = -1;
     if (cdr && (cdr != Nu__null)) {
         int seconds = [[[cdr car] evalWithContext:context] intValue];
         result = sleep(seconds);

diff --git a/test/test_strings.nu b/test/test_strings.nu
@@ -150,4 +150,7 @@ END)
                                                               (then (- c (- 'a' 'A')))
                                                               (else c))))))
         (set finish (mapped componentsJoinedByString:""))
-        (assert_equal "HELLO, WORLD" finish)))
+        (assert_equal "HELLO, WORLD" finish))
+
+     (- (id) testAddingNilToStrings is
+        (assert_equal "hello world" (+ "hello" nil " " nil "world"))))