Various Bohemian changes, including another attempt at fixing the crash...

Cocoa Script.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		229C1FF61C21B38D004C5B3B /* MOBoxManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 229C1FF41C21B38D004C5B3B /* MOBoxManager.h */; };
+		229C1FF71C21B38D004C5B3B /* MOBoxManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 229C1FF51C21B38D004C5B3B /* MOBoxManager.m */; };
+		229C1FF81C21B38D004C5B3B /* MOBoxManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 229C1FF51C21B38D004C5B3B /* MOBoxManager.m */; };
 		384830E21832D48500B34168 /* COSTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = 384830E01832D48500B34168 /* COSTarget.h */; };
 		384830E31832D48500B34168 /* COSTarget.m in Sources */ = {isa = PBXBuildFile; fileRef = 384830E11832D48500B34168 /* COSTarget.m */; };
 		8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; };
@@ -29,7 +32,7 @@
 		CC4143520F25261200E46669 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCC5B8A40F1EFA6D00126722 /* JavaScriptCore.framework */; };
 		CC4143530F25261300E46669 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; };
 		CC4143620F2527CD00E46669 /* CocoaScript.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC41431A0F25254200E46669 /* CocoaScript.framework */; };
-		CC4143660F2527E400E46669 /* CocoaScript.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CC41431A0F25254200E46669 /* CocoaScript.framework */; };
+		CC4143660F2527E400E46669 /* CocoaScript.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CC41431A0F25254200E46669 /* CocoaScript.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		CC5EDD4D1237F6DF00E0D965 /* JSTalkStatusIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5EDD4C1237F6DF00E0D965 /* JSTalkStatusIcon.png */; };
 		CC5EDD531237F71300E0D965 /* JSTalkStatusIconAlt.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5EDD521237F71300E0D965 /* JSTalkStatusIconAlt.png */; };
 		CC5FB7DF0F1FDE3800F4ECC2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; };
@@ -397,6 +400,9 @@
 /* Begin PBXFileReference section */
 		1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		13E42FBA07B3F13500E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+		229C1FF41C21B38D004C5B3B /* MOBoxManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MOBoxManager.h; path = src/framework/mocha/Objects/MOBoxManager.h; sourceTree = SOURCE_ROOT; };
+		229C1FF51C21B38D004C5B3B /* MOBoxManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MOBoxManager.m; path = src/framework/mocha/Objects/MOBoxManager.m; sourceTree = SOURCE_ROOT; };
+		22E281E41A8BB99D006650D2 /* test.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = test.js; sourceTree = "<group>"; };
 		2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		384830E01832D48500B34168 /* COSTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = COSTarget.h; path = src/framework/COSTarget.h; sourceTree = "<group>"; };
@@ -768,6 +774,7 @@
 			children = (
 				CC66D826181A2A810039A0A5 /* CocoaScript_Prefix.pch */,
 				CC66D8D7181A2FC10039A0A5 /* cocoascript_tool.m */,
+				22E281E41A8BB99D006650D2 /* test.js */,
 			);
 			name = "Other Sources";
 			sourceTree = "<group>";
@@ -1130,6 +1137,8 @@
 				CC66D879181A2B0A0039A0A5 /* MOAllocator.m */,
 				CC66D87A181A2B0A0039A0A5 /* MOBox.h */,
 				CC66D87B181A2B0A0039A0A5 /* MOBox.m */,
+				229C1FF41C21B38D004C5B3B /* MOBoxManager.h */,
+				229C1FF51C21B38D004C5B3B /* MOBoxManager.m */,
 				CC66D87C181A2B0A0039A0A5 /* MOClassDescription.h */,
 				CC66D87D181A2B0A0039A0A5 /* MOClassDescription.m */,
 				CC66D87E181A2B0A0039A0A5 /* MOClosure_Private.h */,
@@ -1272,6 +1281,7 @@
 				CC66D7CD181A2A470039A0A5 /* TDEmpty.h in Headers */,
 				CC66D8A3181A2B0A0039A0A5 /* MOClosure.h in Headers */,
 				CC66D7CF181A2A470039A0A5 /* TDLetter.h in Headers */,
+				229C1FF61C21B38D004C5B3B /* MOBoxManager.h in Headers */,
 				CC66D7E6181A2A470039A0A5 /* TDRepetition.h in Headers */,
 				CC66D834181A2A9B0039A0A5 /* COSCIImageAdditions.h in Headers */,
 				CC66D83E181A2A9B0039A0A5 /* COSQuickCIFilter.h in Headers */,
@@ -1392,7 +1402,7 @@
 		2A37F4A9FDCFA73011CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0700;
 				TargetAttributes = {
 					9FC343C61AF7D2FE00B53759 = {
 						CreatedOnToolsVersion = 6.3.1;
@@ -1506,6 +1516,7 @@
 				CC66D7DF181A2A470039A0A5 /* TDParser.m in Sources */,
 				384830E31832D48500B34168 /* COSTarget.m in Sources */,
 				CC66D86B181A2AE10039A0A5 /* MochaRuntime.m in Sources */,
+				229C1FF81C21B38D004C5B3B /* MOBoxManager.m in Sources */,
 				CC66D821181A2A710039A0A5 /* COSExtras.m in Sources */,
 				CC66D83F181A2A9B0039A0A5 /* COSQuickCIFilter.m in Sources */,
 				CC66D81F181A2A710039A0A5 /* COScript.m in Sources */,
@@ -1672,6 +1683,7 @@
 				CC9FF01118296A2B009DB0F9 /* TDToken.m in Sources */,
 				CC9FF01318296A2B009DB0F9 /* TDTokenArraySource.m in Sources */,
 				CC9FF01518296A2B009DB0F9 /* TDTokenAssembly.m in Sources */,
+				229C1FF71C21B38D004C5B3B /* MOBoxManager.m in Sources */,
 				CC9FF01718296A2B009DB0F9 /* TDTokenizer.m in Sources */,
 				CCD3834A195A454F00C436B9 /* COSDatabaseQueue.m in Sources */,
 				CC9FF01918296A2B009DB0F9 /* TDTokenizerState.m in Sources */,
@@ -1812,6 +1824,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DDEBUG";
 				OTHER_LDFLAGS = "-lffi";
+				PRODUCT_BUNDLE_IDENTIFIER = com.cocoascript.CocoaScript;
 				PRODUCT_NAME = "Cocoa Script Editor";
 			};
 			name = Debug;
@@ -1827,6 +1840,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-lffi";
+				PRODUCT_BUNDLE_IDENTIFIER = com.cocoascript.CocoaScript;
 				PRODUCT_NAME = "Cocoa Script Editor";
 			};
 			name = Release;
@@ -1840,9 +1854,13 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1866,9 +1884,12 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1912,7 +1933,9 @@
 					AppKit,
 					"-lexpat",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.cocoascript.${PRODUCT_NAME:identifier}";
 				PRODUCT_NAME = CocoaScript;
+				SKIP_INSTALL = YES;
 			};
 			name = Debug;
 		};
@@ -1945,7 +1968,9 @@
 					"-lexpat",
 					"-lffi",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.cocoascript.${PRODUCT_NAME:identifier}";
 				PRODUCT_NAME = CocoaScript;
+				SKIP_INSTALL = YES;
 			};
 			name = Release;
 		};

res/Info.plist

@@ -51,25 +51,12 @@
 			<string>JSTPluginMover</string>
 		</dict>
 	</array>
-
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>Cocoa Script Whatever</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>x-coscript</string>
-			</array>
-		</dict>
-	</array>
-
 	<key>CFBundleExecutable</key>
 	<string>Cocoa Script Editor</string>
 	<key>CFBundleIconFile</key>
 	<string>JSTalk.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.cocoascript.CocoaScript</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -80,6 +67,17 @@
 	<string>3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>Cocoa Script Whatever</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>x-coscript</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSApplicationCategoryType</key>

res/JSTalkFramework-Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.cocoascript.${PRODUCT_NAME:identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

src/cocoascript_tool.m

@@ -4,6 +4,19 @@
 
 BOOL JSCErrorHandlerExitOnError = YES;
 
+@interface NullDebugController : NSObject<CODebugController>
+
+@end
+
+@implementation NullDebugController
+
+- (void)output:(NSString*)format args:(va_list)args
+{
+
+}
+
+@end
+
 @interface JSCErrorHandler : NSObject {
 
 }
@@ -92,11 +105,15 @@ int main(int argc, char *argv[]) {
         }
     }
 
+    [COScript setDebugController:[NullDebugController new]];
+
     id o = [t executeString:source];
 
     if (o) {
         printf("%s\n", [[o description] UTF8String]);
     }
 
+    [t cleanup];
+
     return 0;
 }

src/framework/COSExtras.m

@@ -102,12 +102,16 @@ - (void)system:(NSString*)s {
 
 @implementation NSApplication (COSExtras)
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
 - (id)open:(NSString*)pathToFile {
 
     NSError *err = nil;
 
     NSURL *url = [NSURL fileURLWithPath:pathToFile];
 
+    // TODO - this call needs replacing as it is deprecated, but the new API is async so it requires a little bit of work
     id doc = [[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:url
                                                                                     display:YES
                                                                                       error:&err];
@@ -120,6 +124,8 @@ - (id)open:(NSString*)pathToFile {
     return doc;
 }
 
+#pragma clang diagnostic pop
+
 - (void)activate {
     ProcessSerialNumber xpsn = { 0, kCurrentProcess };
     SetFrontProcess( &xpsn );

src/framework/COSR.m

@@ -96,7 +96,7 @@ - (instancetype)makeTable:(NSString*)tableName {
 
     COSR *sub = [self subTableWithName:tableName];
 
-    #pragma message "FIXME: make sure to return an existing one if it's already around"
+    // FIXME: make sure to return an existing one if it's already around
 
     [sub setTableID:[NSString stringWithUUID]];
     [self setObject:sub forKeyedSubscript:tableName];

src/framework/COScript.m

@@ -102,7 +102,7 @@ - (void)cleanup {
     [self deleteObjectWithName:@"log"];
 
     [_mochaRuntime shutdown];
-
+    _mochaRuntime = nil;
 }
 
 - (void)garbageCollect {
@@ -111,7 +111,7 @@ - (void)garbageCollect {
 
     [_mochaRuntime garbageCollect];
 
-    debug(@"gc took %f seconds", [NSDate timeIntervalSinceReferenceDate] - start);
+    debug(@"gc took %f seconds", [NSDate timeIntervalSinceReferenceDate] - start); (void)start;
 }
 
 
@@ -268,7 +268,7 @@ + (void)loadBridgeSupportFileAtURL:(NSURL*)url {
 
 NSString *currentCOScriptThreadIdentifier = @"org.jstalk.currentCOScriptHack";
 
-#pragma message "FIXME: Change currentCOScript and friends to use a stack in the thread dictionary, instead of just overwriting what might already be there."
+// FIXME: Change currentCOScript and friends to use a stack in the thread dictionary, instead of just overwriting what might already be there."
 
 + (NSMutableArray*)currentCOSThreadStack {
 

src/framework/TETextUtils.m

@@ -45,7 +45,7 @@ unsigned TE_numberOfLeadingSpacesFromRangeInString(NSString *string, NSRange *ra
     unsigned tabW = tabWidth;
     NSUInteger endOfWhiteSpaceIndex = NSNotFound;
 
-    if (range->length == 0) {
+    if (range && range->length == 0) {
         return 0;
     }
 
@@ -521,7 +521,7 @@ unsigned TE_expandVariablesInString(NSMutableString *input, NSString *variableSt
         replacement = nil;
         [invocation getReturnValue:&replacement];
 #else
-        replacement = objc_msgSend(modalDelegate, callbackSelector, varName, input, varRange, replacementRange, context);
+        replacement = ((NSString* (*)(id, SEL, id, id, NSRange, NSRange, void*))objc_msgSend)(modalDelegate, callbackSelector, varName, input, varRange, replacementRange, context);
 #endif
 
         if (replacement) {

src/framework/imagetools/COSCodeSketcher.m

@@ -195,7 +195,7 @@ - (void)setupWindow {
 
         NSPoint p = [NSEvent mouseLocation];
 
-        p = [_mwindow convertScreenToBase:p];
+        p = [_mwindow convertRectFromScreen:NSMakeRect(p.x, p.y, 0, 0)].origin;
         _mouseLocation = [self convertPoint:p fromView:nil];
     }
 }

src/framework/imagetools/COSQuickCIFilter.m

@@ -8,7 +8,7 @@
 
 #import "COSQuickCIFilter.h"
 
-#pragma message "FIXME: Gus- you can get CI kernel errors like so: http://stackoverflow.com/questions/13754997/how-do-you-debug-syntax-errors-in-a-core-image-kernel"
+// FIXME: Gus- you can get CI kernel errors like so: http://stackoverflow.com/questions/13754997/how-do-you-debug-syntax-errors-in-a-core-image-kernel"
 /*
  If you use introspection on the CIKernel class, you will find a kernelsWithString:messageLog: method. There is no public interface to it, but don't let that stop you…