Merge pull request #82 from ksjogo/three

update libffi to current submodule and more 64-bit fixes

.gitignore

@@ -6,3 +6,4 @@ Nu.framework
 libNu.a
 examples/*/*.app
 xcuserdata
+*.xcscmblueprint

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "libffi"]
+	path = libffi
+	url = https://github.com/ksjogo/libffi.git
+	branch = master

Xcode/Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>nu.programming.framework</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Xcode/NuApp/NuApp-Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.radtastical.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -26,6 +26,8 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIRequiresFullScreen</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

Xcode/NuApp/NuAppDelegate.m

@@ -9,17 +9,29 @@
 #import "NuAppDelegate.h"
 
 #import "Nu.h"
+#import "NuBlock.h"
+#import "NuBridgedBlock.h"
+
+#import <UIKit/UIKit.h>
+
+@class ViewController;
 
 @implementation NuAppDelegate
 @synthesize window;
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
-    self.window.backgroundColor = [UIColor greenColor];
-    self.window.rootViewController = [[UIViewController alloc] init];
+	CGRect frame = [[UIScreen mainScreen] bounds];
+    self.window = [[[UIWindow alloc] initWithFrame:frame] autorelease];
     [self.window makeKeyAndVisible];
-
+	UIViewController *viewController = [[UIViewController alloc] init];
+	self.window.rootViewController = viewController;
+	UIView *view = [[UIView alloc] initWithFrame:frame];
+	viewController.view = view;
+	UILabel *label = [[UILabel alloc] initWithFrame:frame];
+	label.textAlignment = NSTextAlignmentCenter;
+	[view addSubview:label];
+
     NuInit();
 
     [[Nu sharedParser] parseEval:@"(load \"nu\")"];
@@ -45,7 +57,21 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     }
     [regex release];
     NSLog(@"running tests");
-    [[Nu sharedParser] parseEval:@"(NuTestCase runAllTests)"];
+	int failures = [[[Nu sharedParser] parseEval:@"(NuTestCase runAllTests)"] intValue];
+
+	NSString* script = @"(do () (puts \"cBlock Work!\"))";
+	id parsed = [[Nu sharedParser] parse:script];
+	NuBlock* block = [[Nu sharedParser] eval:parsed];
+	void (^cblock)() = [NuBridgedBlock cBlockWithNuBlock:block	signature:@"v"];
+	cblock();
+
+	if (failures == 0) {
+		view.backgroundColor = [UIColor greenColor];
+		label.text = @"Everything Nu!";
+	} else {
+		view.backgroundColor = [UIColor redColor];
+		label.text = [NSString stringWithFormat:@"%d failures!",failures];
+	}
     NSLog(@"ok");    
     return YES;
 }