0
@@ -37,11 +37,7 @@
0
 
0
 (global atom?
0
         (do (x)
0
-            (or (null? x)
0
-                (number? x)
0
-                (symbol? x)
0
-                (string? x)
0
-                (char? x))))
0
+            (x atom)))
0
 
0
 (global number?
0
         (do (x)
0
@@ -64,7 +60,7 @@
0
 
0
 (global string?
0
         (do (x)
0
-            (eq (x class) NSCFString)))
0
+            (eq (x class) ("" class))))
0
 
0
 (global symbol?
0
         (do (x)
0
@@ -91,21 +87,21 @@
0
 ;; For example (apply + '(1 2)) returns 3.
0
 (global apply
0
         (macro _
0
-          (set __f (eval (car margs)))
0
-          (set __args (eval (cdr margs)))
0
-          (eval (cons __f __args))))
0
+             (set __f (eval (car margs)))
0
+             (set __args (eval (cdr margs)))
0
+             (eval (cons __f __args))))
0
 
0
 ;; Evaluates an expression and raises a NuAssertionFailure if the result is false.
0
 ;; For example (assert (eq 1 1)) does nothing but (assert (eq (+ 1 1) 1)) throws
0
 ;; an exception.
0
 (global assert
0
         (macro _
0
-          (set expression (car margs))
0
-          (if (not (eval expression))
0
-              (then (throw ((NSException alloc)
0
-                             initWithName:"NuAssertionFailure"
0
-                             reason:(expression stringValue)
0
-                             userInfo:nil))))))
0
+             (set expression (car margs))
0
+             (if (not (eval expression))
0
+                 (then (throw ((NSException alloc)
0
+                               initWithName:"NuAssertionFailure"
0
+                               reason:(expression stringValue)
0
+                               userInfo:nil))))))
0
 
0
 ;; Allows mapping a function over multiple lists.
0
 ;; For example (map + '(1 2) '(3 4)) returns '(4 6).
0
@@ -113,16 +109,16 @@
0
 ;; For example (map + '(1 2) '(3)) returns '(4).
0
 (global map
0
         (progn
0
-          (set _map
0
-            (do (f _lists)
0
-                (if (_lists select:(do (x) (not x)))
0
-                  (then '())
0
-                  (else
0
-                    (cons
0
-                      (apply f (_lists map: (do (ls) (first ls))))
0
-                      (_map f (_lists map: (do (ls) (rest ls)))))))))
0
-          (do (fun *lists)
0
-              (_map fun *lists))))
0
+              (set _map
0
+                   (do (f _lists)
0
+                       (if (_lists select:(do (x) (not x)))
0
+                           (then '())
0
+                           (else
0
+                                (cons
0
+                                     (apply f (_lists map: (do (ls) (first ls))))
0
+                                     (_map f (_lists map: (do (ls) (rest ls)))))))))
0
+              (do (fun *lists)
0
+                  (_map fun *lists))))
0
 
0
 ;; Sorts a list.
0
 (global sort
0
@@ -134,11 +130,11 @@
0
 
0
 ;; Throws an exception.
0
 ;; This function is more concise and easier to remember than throw.
0
-(global throw* 
0
+(global throw*
0
         (do (type reason)
0
             (throw ((NSException alloc) initWithName:type
0
-                                              reason:reason
0
-                                            userInfo:nil))))
0
+                    reason:reason
0
+                    userInfo:nil))))
0
 
0
 ;; Returns an array of filenames matching a given pattern.
0
 ;; the pattern is a string that is converted into a regular expression.
0
@@ -154,12 +150,12 @@
0
                  ((results allObjects) sortedArrayUsingSelector:"compare:"))))
0
 
0
 (class NSMutableArray
0
-
0
+     
0
      ;; Concisely add objects to arrays using this method, which is equivalent to a call to addObject:.
0
      (- (void) << (id) object is (self addObject:object)))
0
 
0
 (class NSMutableSet
0
-
0
+     
0
      ;; Concisely add objects to sets using this method, which is equivalent to a call to addObject:.
0
      (- (void) << (id) object is (self addObject:object)))
0
 
0
@@ -183,7 +179,7 @@
0
              (set __signatureForIdentifier (NuBridgedFunction functionWithName:"signature_for_identifier" signature:"@@@"))
0
              (function __parse_signature (typeSpecifier)
0
                   (__signatureForIdentifier typeSpecifier (NuSymbolTable sharedSymbolTable)))
0
-
0
+             
0
              (set __name ((margs car) stringValue))
0
              (unless (set __protocol (Protocol protocolNamed: __name))
0
                      (set __protocol ((Protocol alloc) initWithName: __name)))

0
@@ -34,7 +34,7 @@ extern id Nu__null;
0
 @implementation NSNull(Nu)
0
 - (bool) atom
0
 {
0
-    return false;
0
+    return true;
0
 }
0
 
0
 - (int) length