markup enhancements

- accept numbers (NSNumbers) as well as strings (actually anything that responds to stringValue). - accept arrays of strings and automatically expand them.
timburks · Jan 24, 2010 · 897b4e3 · 897b4e3
1 parent 2d85f3e
commit 897b4e3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/Nukefile b/Nukefile
@@ -6,7 +6,7 @@
 (case SYSTEM
       ("Darwin"
                (set @arch (list "i386"))
-               (set @cflags "-g -fobjc-gc -DDARWIN")
+               (set @cflags "-g -std=gnu99 -fobjc-gc -DDARWIN")
                (set @ldflags  "-framework Foundation -framework Nu -levent -lcrypto"))
       ("Linux"
               (set @arch (list "i386"))

diff --git a/objc/markup.m b/objc/markup.m
@@ -1,6 +1,5 @@
 #import <Foundation/Foundation.h>
 
-
 @interface NuOperator : NSObject
 {
 }
@@ -65,7 +64,18 @@ - (id) callWithArguments:(id)cdr context:(NSMutableDictionary *)context
             }
         }
         else {
-            [body appendString:[item evalWithContext:context]];
+            id evaluatedItem = [item evalWithContext:context];
+            if ([evaluatedItem isKindOfClass:[NSString class]]) {
+                [body appendString:evaluatedItem];
+            }
+            else if ([evaluatedItem isKindOfClass:[NSArray class]]) {
+                int max = [evaluatedItem count];
+                for (int i = 0; i < max; i++) {
+                   [body appendString:[evaluatedItem objectAtIndex:i]];
+                }
+            } else {
+               [body appendString:[evaluatedItem stringValue]];
+            }
         }
         if (cursor && (cursor != [NSNull null]))
             cursor = [cursor cdr];

diff --git a/test/test_markup.nu b/test/test_markup.nu
@@ -14,5 +14,5 @@
         (assert_equal "<body/>" (&body))
         (assert_equal "<body/>" (&body incomplete:))
         (assert_equal "<body attr=\"val\"/>" (&body attr:"val"))
-        (assert_equal "<!DOCTYPE html>\n<html><body this=\"is\" a=\"test\">hello, world</body></html>" (&html (&body this:"is" a:"test" "hello," " world")))))
-
+        (assert_equal "<!DOCTYPE html>\n<html><body this=\"is\" a=\"test\">hello, world</body></html>" (&html (&body this:"is" a:"test" "hello," " world")))
+        (assert_equal "<body>abc123</body>" (&body (array "a" "b" "c") 123))))