0
@@ -8,11 +8,9 @@
0
 
0
 (case platform
0
       ("iPhone"
0
-               (set PLATFORM "-isysroot /Developer/Platforms/Aspen.platform/Developer/SDKs/Aspen1.2.sdk")
0
+               (set PLATFORM "-isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.0.sdk")
0
                (set @arch '("armv6"))
0
-               (@c_files unionSet:(filelist "^libffi/.*\.c$"))
0
-               (@c_files unionSet:(filelist "^libffi/.*\.S$"))
0
-               (set @cc "/Developer/Platforms/Aspen.platform/Developer/usr/bin/gcc-4.0"))
0
+               (set @cc "/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.0"))
0
       ("simulator"
0
                   (set PLATFORM "-isysroot /Developer/Platforms/AspenSimulator.platform/Developer/SDKs/AspenSimulator1.2.sdk")
0
                   (set @arch '("i386")))

0
@@ -258,9 +258,11 @@ void NuInit()
0
         [NSView exchangeInstanceMethod:@selector(retain) withMethod:@selector(nuRetain)];
0
         #endif
0
 
0
+        #ifndef IPHONE
0
         // Enable support for protocols in Nu.  Apple doesn't have an API for this, so we use our own.
0
         extern void nu_initProtocols();
0
         nu_initProtocols();
0
+        #endif
0
 
0
         // if you don't like making Protocol a subclass of NSObject (see nu_initProtocols), you can do this instead.
0
         // transplant_nu_methods([Protocol class], [NSObject class]);

0
@@ -176,9 +176,16 @@ SEL sel_getUid(const char *str)
0
 }
0
 #endif
0
 
0
+#ifdef IPHONE
0
+#import "objc/runtime.h"
0
+IMP nu_class_replaceMethod(Class cls, SEL name, IMP imp, const char *types) {
0
+	return class_replaceMethod(cls, name, imp, types);	
0
+}
0
+#endif
0
+
0
 #ifndef LEOPARD_OBJC2
0
 #include "objc_runtime.h"
0
-
0
+#ifndef IPHONE
0
 BOOL class_hasMethod(Class cls, SEL name)
0
 {
0
     // Method (Method_t on Linux) existing_method = class_getInstanceMethod(cls, name);
0
@@ -250,6 +257,7 @@ Ivar *class_copyIvarList(Class cls, unsigned int *outCount)
0
     return list;
0
 }
0
 
0
+
0
 #ifdef DARWIN
0
 Method *class_copyMethodList(Class cls, unsigned int *outCount)
0
 #else
0
@@ -280,11 +288,13 @@ Method_t *class_copyMethodList(Class cls, unsigned int *outCount)
0
     return list;
0
 }
0
 
0
+
0
 Class class_getSuperclass(Class cls)
0
 {
0
     return cls->super_class;
0
 }
0
 
0
+
0
 #ifdef DARWIN
0
 const char *ivar_getName(Ivar v)
0
 #else
0
@@ -311,6 +321,7 @@ const char *ivar_getTypeEncoding(Ivar_t v)
0
 {
0
     return v->ivar_type;
0
 }
0
+#endif
0
 
0
 #ifdef DARWIN
0
 char *method_copyArgumentType(Method m, unsigned int index)
0
@@ -404,7 +415,7 @@ static struct objc_method_list** method_list_alloc(int cnt)
0
     mlp[cnt-1] = (struct objc_method_list*)-1;    // END_OF_METHODS_LIST
0
     return mlp;
0
 }
0
-
0
+#ifndef IPHONE
0
 // this function was taken from RubyCocoa
0
 #ifdef DARWIN
0
 Class objc_allocateClassPair(Class super_class, const char *name, size_t extraBytes)
0
@@ -476,12 +487,13 @@ Class objc_allocateClassPair(Class super_class, const char *name, size_t extraBy
0
     return c;
0
 }
0
 #endif
0
-
0
+#endif
0
+#ifndef IPHONE
0
 void objc_registerClassPair(Class cls)
0
 {
0
     objc_addClass(cls);
0
 }
0
-
0
+#endif
0
 Class object_getClass(id obj)
0
 {
0
 #ifdef DARWIN
0
@@ -543,7 +555,7 @@ IMP nu_class_replaceMethod(Class cls, SEL name, IMP imp, const char *types)
0
 
0
 void class_addInstanceVariable_withSignature(Class thisClass, const char *variableName, const char *signature)
0
 {
0
-    #ifdef __x86_64__
0
+    #if defined(__x86_64__) || defined(IPHONE)
0
     extern size_t size_of_objc_type(const char *typeString);
0
     size_t size = size_of_objc_type(signature);
0
     uint8_t alignment = log2(size);

0
@@ -709,7 +709,8 @@ static bool valueIsTrue(id value)
0
     id args = [[cdr cdr] car];
0
     id body = [[cdr cdr] cdr];
0
     NuBlock *block = [[NuBlock alloc] initWithParameters:args body:body context:context];
0
-    [context setPossiblyNullObject:block forKey:symbol];      // this defines the function in the calling context
0
+                                                  // this defines the function in the calling context
0
+    [context setPossiblyNullObject:block forKey:symbol];
0
                                                   // this defines the function in the block context, which allows recursion
0
     [[block context] setPossiblyNullObject:block forKey:symbol];
0
     return block;
0
@@ -745,7 +746,8 @@ static bool valueIsTrue(id value)
0
     id body = [cdr cdr];
0
 
0
     NuMacro *macro = [[NuMacro alloc] initWithName:name body:body];
0
-    [context setPossiblyNullObject:macro forKey:name];        // this defines the function in the calling context
0
+                                                  // this defines the function in the calling context
0
+    [context setPossiblyNullObject:macro forKey:name];
0
     return macro;
0
 }
0
 
0
@@ -1144,6 +1146,7 @@ static bool valueIsTrue(id value)
0
 
0
 @end
0
 
0
+#ifndef IPHONE
0
 @interface Nu_gets_operator : NuOperator {}
0
 @end
0
 
0
@@ -1156,6 +1159,7 @@ static bool valueIsTrue(id value)
0
 }
0
 
0
 @end
0
+#endif
0
 
0
 @interface Nu_print_operator : NuOperator {}
0
 @end
0
@@ -1395,7 +1399,7 @@ id loadNuLibraryFile(NSString *nuFileName, id parser, id context, id symbolTable
0
     NuSymbolTable *symbolTable = [context objectForKey:SYMBOLS_KEY];
0
     id className = [cdr car];
0
     id body = Nu__null;
0
-    #ifdef __x86_64__
0
+    #if defined(__x86_64__) || defined(IPHONE)
0
     Class newClass = nil;
0
     #endif
0
     NuClass *childClass;
0
@@ -1410,7 +1414,7 @@ id loadNuLibraryFile(NSString *nuFileName, id parser, id context, id symbolTable
0
         if (!parentClass)
0
             [NSException raise:@"NuUndefinedSuperclass" format:@"undefined superclass %@", [parentName stringValue]];
0
 
0
-        #ifdef __x86_64__
0
+        #if defined(__x86_64__) || defined(IPHONE)
0
         newClass = objc_allocateClassPair(parentClass, [[className stringValue] cStringUsingEncoding:NSUTF8StringEncoding], 0);
0
         childClass = [NuClass classWithClass:newClass];
0
         [childClass setRegistered:NO];
0
@@ -1440,7 +1444,7 @@ id loadNuLibraryFile(NSString *nuFileName, id parser, id context, id symbolTable
0
         result = [block evalWithArguments:Nu__null context:Nu__null];
0
         [block release];
0
     }
0
-    #ifdef __x86_64__
0
+    #if defined(__x86_64__) || defined(IPHONE)
0
     if (newClass && ([childClass isRegistered] == NO)) {
0
         [childClass registerClass];
0
     }
0
@@ -1492,7 +1496,7 @@ id loadNuLibraryFile(NSString *nuFileName, id parser, id context, id symbolTable
0
 {
0
     NuSymbolTable *symbolTable = [context objectForKey:SYMBOLS_KEY];
0
     NuClass *classWrapper = [context objectForKey:[symbolTable symbolWithCString:"_class"]];
0
-    #ifdef __x86_64__
0
+    #if defined(__x86_64__) || defined(IPHONE)
0
     // this will only work if the class is unregistered...
0
     if ([classWrapper isRegistered]) {
0
         [NSException raise:@"NuIvarAddedTooLate" format:@"instance variables must be added when a class is created and before any method declarations"];
0
@@ -1527,7 +1531,7 @@ id loadNuLibraryFile(NSString *nuFileName, id parser, id context, id symbolTable
0
     NuSymbolTable *symbolTable = [context objectForKey:SYMBOLS_KEY];
0
 
0
     NuClass *classWrapper = [context objectForKey:[symbolTable symbolWithCString:"_class"]];
0
-    #ifdef __x86_64__
0
+    #if defined(__x86_64__) || defined(IPHONE)
0
     // this will only work if the class is unregistered...
0
     if ([classWrapper isRegistered]) {
0
         [NSException raise:@"NuIvarAddedTooLate" format:@"instance variables must be added when a class is created and before any method declarations"];
0
@@ -1756,8 +1760,8 @@ void load_builtins(NuSymbolTable *symbolTable)
0
 
0
     install("car",      Nu_car_operator);
0
     install("cdr",      Nu_cdr_operator);
0
-	install("first",    Nu_car_operator);
0
-	install("rest",     Nu_cdr_operator);
0
+    install("first",    Nu_car_operator);
0
+    install("rest",     Nu_cdr_operator);
0
     install("head",     Nu_car_operator);
0
     install("tail",     Nu_cdr_operator);
0
     install("atom",     Nu_atom_operator);
0
@@ -1825,7 +1829,9 @@ void load_builtins(NuSymbolTable *symbolTable)
0
 
0
     install("do",       Nu_do_operator);
0
 
0
+    #ifndef IPHONE
0
     install("gets",     Nu_gets_operator);
0
+    #endif
0
     install("puts",     Nu_puts_operator);
0
     install("print",    Nu_print_operator);
0
 

0
@@ -15,6 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
0
 See the License for the specific language governing permissions and
0
 limitations under the License.
0
 */
0
+
0
 #ifdef LINUX
0
 #define true 1
0
 #define false 0
0
@@ -39,6 +40,7 @@ struct objc_method_description_list
0
 };
0
 #endif
0
 
0
+#ifndef IPHONE
0
 #ifndef __x86_64__
0
 
0
 @interface Protocol : NSObject
0
@@ -342,3 +344,4 @@ void nu_initProtocols()
0
 
0
 @end
0
 #endif
0
+#endif