iOS Compilation Changes

FScript.xcodeproj/project.pbxproj

@@ -2791,7 +2791,14 @@
 			isa = PBXProject;
 			buildConfigurationList = 8F2881FC08F9C040005B3C5A /* Build configuration list for PBXProject "FScript" */;
 			compatibilityVersion = "Xcode 3.0";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 0CD4E2FB00D7DD4D7BE9C1BD;
 			productRefGroup = 0CD4E2FC00D7DDB47BE9C1BD /* Products */;
 			projectDirPath = "";

FScriptFramework/Array.m

@@ -23,7 +23,6 @@
 #import "FSNSArrayPrivate.h"
 #import "FSArrayEnumerator.h"
 #import "FSNSMutableArray.h"
-#import "FSCollectionInspector.h"
 #import "FSReplacementForCoderForNilInArray.h"
 
 @interface Array(ArrayPrivateInternal)
@@ -331,13 +330,15 @@ - (id)replacementObjectForCoder:(NSCoder *)aCoder
   assert(0);
 }
 
+#if !TARGET_OS_IPHONE
 - (id)replacementObjectForPortCoder:(NSPortCoder *)encoder 
 // Overhide the NSArray behavior (which is to pass arrays by copy by default), with a by reference behavior by default. 
 // This is because passing an object by copy only works if the receiving process is linked with the class of the object.
 // In our case, we want to support passing Arrays to applications that are not linked with the F-Script framework. 
 {
   assert(0);
 }
+#endif
 
 - (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject
 {

FScriptFramework/ArrayRepBoolean.m

@@ -6,7 +6,6 @@
 #import "ArrayRepBoolean.h" 
 #import "BlockPrivate.h" 
 #import "BlockRep.h"
-#import "BlockInspector.h"
 #import "string.h"          // memcpy() 
 #import "ArrayPrivate.h"
 #import "FSNumber.h" 

FScriptFramework/ArrayRepDouble.m

@@ -5,7 +5,6 @@
 
 #import "BlockPrivate.h"
 #import "BlockRep.h"
-#import "BlockInspector.h"
 #import "ArrayRepDouble.h"
 #import <string.h>          // memcpy() 
 #import "ArrayPrivate.h"  

FScriptFramework/ArrayRepId.m

@@ -15,7 +15,6 @@
 #import "FSBlock.h"
 #import "BlockRep.h" 
 #import "BlockPrivate.h"
-#import "BlockInspector.h" 
 #import "FSExecEngine.h"
 #import "FSPattern.h"
 #import "FSExecEngine.h" // sendMsg

FScriptFramework/Block.m

@@ -13,7 +13,6 @@
 #import "ArrayPrivate.h"
 #import <Foundation/Foundation.h>
 #import "FSBooleanPrivate.h"
-#import "BlockInspector.h"
 #import "FScriptFunctions.h"
 #import "Number.h"
 #import "FSVoid.h"
@@ -26,7 +25,9 @@
 void __attribute__ ((constructor)) initializeBlock(void) 
 {
   [NSKeyedUnarchiver setClass:[Block class] forClassName:@"Block"];
+#if !TARGET_OS_IPHONE
   [NSUnarchiver decodeClassName:@"Block" asClassName:@"Block"];  
+#endif
 }
 
 

FScriptFramework/BlockRep.m

@@ -9,7 +9,6 @@
 #import "FSArray.h"
 #import <Foundation/Foundation.h> 
 #import "FSBoolean.h"
-#import "BlockInspector.h"
 #import "FScriptFunctions.h"
 #import "FSUnarchiver.h" 
 #import "FSKeyedUnarchiver.h"

FScriptFramework/FSArchiver.h

@@ -3,8 +3,11 @@
 
 #import <Foundation/Foundation.h>
 
-
+#if TARGET_OS_IPHONE
+@interface FSArchiver : NSKeyedArchiver 
+#else
 @interface FSArchiver : NSArchiver 
+#endif
 {}
 
 - (void)encodeValueOfObjCType:(const char *)valueType at:(const void *)address;

FScriptFramework/FSArray.m

@@ -23,7 +23,6 @@
 #import "FSNSArrayPrivate.h"
 #import "FSArrayEnumerator.h"
 #import "FSNSMutableArray.h"
-#import "FSCollectionInspector.h"
 #import "FSReplacementForCoderForNilInArray.h"
 
 @interface FSArray(ArrayPrivateInternal)
@@ -35,7 +34,9 @@ - (enum ArrayRepType)type;
 void __attribute__ ((constructor)) initializeFSArray(void) 
 {
   [NSKeyedUnarchiver setClass:[FSArray class] forClassName:@"Array"];
+#if !TARGET_OS_IPHONE
   [NSUnarchiver decodeClassName:@"Array" asClassName:@"FSArray"];  
+#endif
 }
 
 /*static int comp_unsigned_int(const void *a,const void *b)
@@ -611,6 +612,7 @@ - (id)replacementObjectForCoder:(NSCoder *)aCoder
   return self;
 }
 
+#if !TARGET_OS_IPHONE
 - (id)replacementObjectForPortCoder:(NSPortCoder *)encoder 
 // Overhide the NSArray behavior (which is to pass arrays by copy by default), with a by reference behavior by default. 
 // This is because passing an object by copy only works if the receiving process is linked with the class of the object.
@@ -619,6 +621,7 @@ - (id)replacementObjectForPortCoder:(NSPortCoder *)encoder
   if ([encoder isBycopy]) return self;
   else  return [NSDistantObject proxyWithLocal:self connection:[encoder connection]];
 }
+#endif
 
 - (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject
 {

FScriptFramework/FSAssociation.h

@@ -1,7 +1,7 @@
 /*   FSAssociation.h Copyright (c) 2009 Philippe Mougin.   */
 /*   This software is open source. See the license.        */  
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 @class FSBoolean;
 

FScriptFramework/FSBlock.m

@@ -13,7 +13,6 @@
 #import "ArrayPrivate.h"
 #import <Foundation/Foundation.h>
 #import "FSBooleanPrivate.h"
-#import "BlockInspector.h"
 #import "FScriptFunctions.h"
 #import "FSNumber.h"
 #import "FSVoid.h"
@@ -23,10 +22,16 @@
 #import "FSReturnSignal.h"
 #import "Block.h"
 
+#if !TARGET_OS_IPHONE
+# import "BlockInspector.h"
+#endif
+
 void __attribute__ ((constructor)) initializeFSBlock(void) 
 {
   [NSKeyedUnarchiver setClass:[FSBlock class] forClassName:@"Block"];
+#if !TARGET_OS_IPHONE
   [NSUnarchiver decodeClassName:@"Block" asClassName:@"FSBlock"];  
+#endif
 }
 
 
@@ -397,7 +402,9 @@ - (id) guardedValue:(id)arg1
 
 - (void) inspect
 {
+#if !TARGET_OS_IPHONE
   [[self inspector] activate]; 
+#endif
 }
 
 - (id)onException:(FSBlock *)handler
@@ -807,11 +814,17 @@ - (void)evaluateWithDoubleFrom:(double)start to:(double)stop by:(double)step
   }          
 }
 
+#if TARGET_OS_IPHONE
+- (id) inspector {
+  return nil;
+}
+#else
 - (BlockInspector *)inspector 
 { 
   if (!inspector) inspector = [[BlockInspector alloc] initWithBlock:self];
   return inspector;
 }
+#endif
 
 - (SEL)messageToArgumentSelector
 {
@@ -849,6 +862,7 @@ - (void) setNewRepAfterCompilation:(BlockRep*)newRep
 
 - sync
 {
+#if !TARGET_OS_IPHONE
   if ([inspector edited])
   {
     BlockRep * new = [blockRep copy];
@@ -859,6 +873,7 @@ - (void) setNewRepAfterCompilation:(BlockRep*)newRep
     [blockRep useRetain];
     [inspector setEdited:NO]; 
   }    
+#endif
   return self;
 }       
 

FScriptFramework/FSBlockCompilationResult.h

@@ -2,7 +2,7 @@
 /*   This software is open source. See the license.  */  
 
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 enum FSBlockCompilationResultType {FSOKBlockCompilationResultType, FSErrorBlockCompilationResultType};
 

FScriptFramework/FSBoolean.m

@@ -51,11 +51,13 @@ -(id)initWithCoder:(NSCoder *)coder  {self = [super init]; return self;}
 
 -(NSUInteger)hash {return self == fsTrue;}
 
+#if !TARGET_OS_IPHONE
 - (id)replacementObjectForPortCoder:(NSPortCoder *)encoder
 {
   if ([encoder isBycopy]) return self;
   return [super replacementObjectForPortCoder:encoder];
 }
+#endif
 
 -(void)release                       {}
 

FScriptFramework/FSCNBase.h

@@ -1,7 +1,7 @@
 /*   FSCNBase.h Copyright (c) 2007-2009 Philippe Mougin. */
 /*   This software is open source. See the license.   */
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 #import "FSArray.h"
 #import "FSMsgContext.h"
 

FScriptFramework/FSClassDefinition.h

@@ -1,7 +1,7 @@
 /*   FSClassDefinition.h Copyright (c) 2008-2009 Philippe Mougin. */
 /*   This software is open source. See the license.   */
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 @interface FSClassDefinition : NSObject 
 {

FScriptFramework/FSCompiler.m

@@ -8,7 +8,7 @@
 #import "FSArray.h" 
 #import "FSBlock.h"
 #import "MessagePatternCodeNode.h"
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 #import "FSSymbolTable.h"
 #import <objc/objc.h> // sel_getName()
 #import <objc/runtime.h>
@@ -1623,12 +1623,14 @@ - (NSString *)typeWithCompilationContext:(struct compilationContext)compilationC
   else if ([typeBeforePointerMarks isEqualToString:@"double"])                    encoded = @encode(double);
   else if ([typeBeforePointerMarks isEqualToString:@"CGFloat"])                   encoded = @encode(CGFloat);
   else if ([typeBeforePointerMarks isEqualToString:@"NSRange"])                   encoded = @encode(NSRange);
-  else if ([typeBeforePointerMarks isEqualToString:@"NSPoint"])                   encoded = @encode(NSPoint);
   else if ([typeBeforePointerMarks isEqualToString:@"CGPoint"])                   encoded = @encode(CGPoint);
-  else if ([typeBeforePointerMarks isEqualToString:@"NSRect"])                    encoded = @encode(NSRect);
   else if ([typeBeforePointerMarks isEqualToString:@"CGRect"])                    encoded = @encode(CGRect);
-  else if ([typeBeforePointerMarks isEqualToString:@"NSSize"])                    encoded = @encode(NSSize);
   else if ([typeBeforePointerMarks isEqualToString:@"CGSize"])                    encoded = @encode(CGSize);
+#if !TARGET_OS_IPHONE
+  else if ([typeBeforePointerMarks isEqualToString:@"NSPoint"])                   encoded = @encode(NSPoint);
+  else if ([typeBeforePointerMarks isEqualToString:@"NSRect"])                    encoded = @encode(NSRect);
+  else if ([typeBeforePointerMarks isEqualToString:@"NSSize"])                    encoded = @encode(NSSize);
+#endif
   else if ([typeBeforePointerMarks isEqualToString:@"CGAffineTransform"])         encoded = @encode(CGAffineTransform);
   else if (NSClassFromString(typeBeforePointerMarks) != nil || [typeBeforePointerMarks isEqualToString:compilationContext.className])
   {  

FScriptFramework/FSConstantsInitialization.m

@@ -4,10 +4,15 @@
 #import "FSConstantsInitialization.h"
 #import "FSInterpreter.h"
 #import "FSGenericPointerPrivate.h"
-#import <CoreAudio/AudioHardware.h>
-#import <IOBluetooth/OBEX.h>
 
-#import <Cocoa/Cocoa.h>
+#if !TARGET_OS_IPHONE
+# import <AppKit/AppKit.h>
+# import <CoreAudio/AudioHardware.h>
+# import <IOBluetooth/OBEX.h>
+#endif
+
+#import <CoreData/CoreData.h>
+#import <Foundation/Foundation.h>
 
 void FSConstantsInitialization(NSMutableDictionary *d)
 {
@@ -20,10 +25,6 @@ void FSConstantsInitialization(NSMutableDictionary *d)
     [d addEntriesFromDictionary:[NSKeyedUnarchiver unarchiveObjectWithFile:path]]; 
   } 
 
-  if (NSMultipleValuesMarker) [d setObject:NSMultipleValuesMarker forKey:@"NSMultipleValuesMarker"]; 
-  if (NSNoSelectionMarker)    [d setObject:NSNoSelectionMarker    forKey:@"NSNoSelectionMarker"]; 
-  if (NSNotApplicableMarker)  [d setObject:NSNotApplicableMarker  forKey:@"NSNotApplicableMarker"];
-
   if (NSErrorMergePolicy)                      [d setObject:NSErrorMergePolicy                      forKey:@"NSErrorMergePolicy"]; 
   if (NSMergeByPropertyStoreTrumpMergePolicy)  [d setObject:NSMergeByPropertyStoreTrumpMergePolicy  forKey:@"NSMergeByPropertyStoreTrumpMergePolicy"]; 
   if (NSMergeByPropertyObjectTrumpMergePolicy) [d setObject:NSMergeByPropertyObjectTrumpMergePolicy forKey:@"NSMergeByPropertyObjectTrumpMergePolicy"]; 
@@ -36,6 +37,11 @@ void FSConstantsInitialization(NSMutableDictionary *d)
   [d setObject:[NSNumber numberWithUnsignedLong:NSUIntegerMax]    forKey:@"NSUIntegerMax"];
   [d setObject:[NSNumber numberWithLong:NSUndefinedDateComponent] forKey:@"NSUndefinedDateComponent"];
 
+#if !TARGET_OS_IPHONE
+  if (NSMultipleValuesMarker) [d setObject:NSMultipleValuesMarker forKey:@"NSMultipleValuesMarker"]; 
+  if (NSNoSelectionMarker)    [d setObject:NSNoSelectionMarker    forKey:@"NSNoSelectionMarker"]; 
+  if (NSNotApplicableMarker)  [d setObject:NSNotApplicableMarker  forKey:@"NSNotApplicableMarker"];
+
 #ifdef __LP64__
   // 64-bit code
   [d setObject:[[[FSGenericPointer alloc] initWithCPointer:(CGFloat *)NSFontIdentityMatrix freeWhenDone:NO type:"d"] autorelease] forKey:@"NSFontIdentityMatrix"];
@@ -74,6 +80,10 @@ void FSConstantsInitialization(NSMutableDictionary *d)
   [d setObject:[NSValue valueWithPoint:NSZeroPoint] forKey:@"NSZeroPoint"];
   [d setObject:[NSValue valueWithRect:NSZeroRect]   forKey:@"NSZeroRect"];
   [d setObject:[NSValue valueWithSize:NSZeroSize]   forKey:@"NSZeroSize"];
-
+#else
+  [d setObject:[NSValue valueWithCGPoint:CGPointZero] forKey:@"CGPointZero"];
+  [d setObject:[NSValue valueWithCGRect:CGRectZero]   forKey:@"CGRectZero"];
+  [d setObject:[NSValue valueWithCGSize:CGSizeZero]   forKey:@"CGSizeZero"];
+#endif  
   // NSLog(@"constantsDictionary count = %lu", (unsigned long)[d count]);
 }

FScriptFramework/FSExecEngine.h

@@ -39,12 +39,14 @@ union ObjCValue
   float              floatValue;
   double             doubleValue;
   NSRange            NSRangeValue;
-  NSSize             NSSizeValue;
   CGSize             CGSizeValue;
-  NSPoint            NSPointValue;
   CGPoint            CGPointValue;
-  NSRect             NSRectValue;
   CGRect             CGRectValue;
+#if !TARGET_OS_IPHONE
+  NSSize             NSSizeValue;
+  NSPoint            NSPointValue;
+  NSRect             NSRectValue;
+#endif
   CGAffineTransform  CGAffineTransformValue;
   void *             voidPtrValue;  
 };