'no context' in finalize is no problem as the context is only used to…

… remove the box from the box hash. Context is null because we're being deleted
parmanoir · Aug 3, 2011 · 0c45a77 · 0c45a77
1 parent ebee9c2
commit 0c45a77
Show file tree

Hide file tree

Showing 57 changed files with 11,322 additions and 38,247 deletions.
diff --git a/JSCocoa/JSCocoaController.m b/JSCocoa/JSCocoaController.m
@@ -345,12 +345,10 @@ - (void)cleanUp
 		[self unlinkAllReferences];
 		JSGarbageCollect(ctx);
 	}
-	[self logBoxedObjects];
 
 	controllerCount--;
 	if (controllerCount == 0)
 	{
-		NSLog(@"OUT");
 		if (OSXObjectClass) {
 			JSClassRelease(OSXObjectClass);
 			JSClassRelease(jsCocoaObjectClass);
@@ -390,25 +388,14 @@ - (void)cleanUp
 		// Remove classes : go backwards to remove child classes first
 		for (id class in [jsClasses reverseObjectEnumerator])
 			objc_disposeClassPair([class pointerValue]);
-/*
+
-		NSInteger c = [jsClasses count]-1;
-		NSLog(@"CLASSCOUNT %d", c);
-		while (c >= 0)
-		{
-			id class = [[jsClasses objectAtIndex:c] pointerValue];
-			NSLog(@"DEALLOC CLASS %@", class);
-			objc_disposeClassPair(class);
-			c--;
-		}
-*/
 		[jsClasses release];
 		jsClasses = nil;
 	}
-NSLog(@"DESTROY context");	
+
 	if (ownsContext)
 		JSGlobalContextRelease(ctx);	
 
-NSLog(@"DESTROY boxedObjects");	
 	[boxedObjects release];
 }
 
@@ -951,7 +938,11 @@ - (BOOL)removeObjectWithName:(id)name
 	return	YES;
 }
 
+//
+//
 #pragma mark Loading Frameworks
+//
+//
 - (BOOL)loadFrameworkWithName:(NSString*)name
 {
 	// Only check /System/Library/Frameworks for now
@@ -1156,10 +1147,12 @@ + (id)parentObjCClassOfClassName:(NSString*)className
 	return	[jsClassParents objectForKey:className];
 }
 
+//
+//
 #pragma mark Common encoding parsing
 //
-// This is parsed from method_getTypeEncoding
 //
+// This is parsed from method_getTypeEncoding
 //	Later : Use method_copyArgumentType ?
 + (NSMutableArray*)parseObjCMethodEncoding:(const char*)typeEncoding
 {
@@ -1315,9 +1308,11 @@ + (NSMutableArray*)parseCFunctionEncoding:(NSString*)xml functionName:(NSString*
 
 
 
-
+//
+//
 #pragma mark Class Creation
-
+//
+//
 + (Class)createClass:(char*)className parentClass:(char*)parentClass
 {
 	Class class = objc_getClass(className);
@@ -1804,6 +1799,8 @@ - (BOOL)isFunctionVariadic:(id)functionName
 	return	isVariadic;
 }
 
+
+
 #pragma mark Boxed object hash
 
 //+ (JSObjectRef)boxedJSObject:(id)o inContext:(JSContextRef)ctx
@@ -2002,18 +1999,14 @@ - (int)runTests:(NSString*)path withSelector:(SEL)sel {
 	id files	= [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil];
 	id predicate= [NSPredicate predicateWithFormat:@"SELF ENDSWITH[c] '.js'"];
 	files		= [files filteredArrayUsingPredicate:predicate]; 
-
-	// Execute in test order, not finder order
-	files		= [files sortedArrayUsingSelector:@selector(localizedStandardCompare:)];
-//	NSLog(@"files=%@", files);
-
 	if ([files count] == 0)
 		return	[JSCocoaController log:@"no test files found"], 0;
 
+	// Execute in test order, not finder order
+	files		= [files sortedArrayUsingSelector:@selector(localizedStandardCompare:)];
 	for (id file in files) {
 		id filePath	= [NSString stringWithFormat:@"%@/%@", path, file];
-		NSLog(@">>>evaling %@", filePath);
+//		NSLog(@">>>evaling %@", filePath);
-//		BOOL evaled = [self evalJSFile:filePath];
 
 		id evaled	= nil;
 		@try {
@@ -3281,14 +3274,12 @@ static void jsCocoaObject_finalize(JSObjectRef object)
 	id jsc = nil;
 	JSContextRef ctx = [private ctx];
 
-	if (!ctx) {
+	if (ctx)
-		NSLog(@"+++++++NO CONTEXT, NO DELETE");
-	} else {
 		jsc = [JSCocoa controllerFromContext:ctx];
-	}
+	// We will be called during garbage collection before dealloc occurs. 
-	if (!jsc) {
+	// The __jsc__ variable will be gone, therefore controllerFromContext will yield 0.
-		NSLog(@"*******NO CONTEXT+++++++++++");
+	// Not a problem since it's only used to remove the object from the boxedObjects hash,
-	}
+	// and dealloc will occur soon after.
 
 	//
 	// If a boxed object is being destroyed, remove it from the cache
@@ -4996,8 +4987,11 @@ static void jsCocoaInfo_getPropertyNames(JSContextRef ctx, JSObjectRef object, J
 }
 
 
-
+//
-#pragma mark Helpers
+//
+#pragma mark Global helpers
+//
+//
 
 id	NSStringFromJSValue(JSContextRef ctx, JSValueRef value)
 {

diff --git a/Tests/! stock/1 C and ObjC calls.js → Tests/1 C and ObjC calls.js b/Tests/! stock/1 C and ObjC calls.js → Tests/1 C and ObjC calls.js
diff --git a/Tests/! stock/10 shorthand overload.js → Tests/10 shorthand overload.js b/Tests/! stock/10 shorthand overload.js → Tests/10 shorthand overload.js
diff --git a/Tests/! stock/11 retain test 2.js → Tests/11 retain test 2.js b/Tests/! stock/11 retain test 2.js → Tests/11 retain test 2.js
diff --git a/Tests/! stock/12 instance variables.js → Tests/12 instance variables.js b/Tests/! stock/12 instance variables.js → Tests/12 instance variables.js
diff --git a/Tests/! stock/13 instance.js → Tests/13 instance.js b/Tests/! stock/13 instance.js → Tests/13 instance.js
diff --git a/Tests/! stock/14 class.js → Tests/14 class.js b/Tests/! stock/14 class.js → Tests/14 class.js
diff --git a/...ck/16 NSArray NSDictionary easy access.js → Tests/16 NSArray NSDictionary easy access.js b/...ck/16 NSArray NSDictionary easy access.js → Tests/16 NSArray NSDictionary easy access.js
diff --git a/Tests/! stock/17 struct instance.js → Tests/17 struct instance.js b/Tests/! stock/17 struct instance.js → Tests/17 struct instance.js
diff --git a/Tests/! stock/18 structure args.js → Tests/18 structure args.js b/Tests/! stock/18 structure args.js → Tests/18 structure args.js
diff --git a/Tests/! stock/19 pure js methods.js → Tests/19 pure js methods.js b/Tests/! stock/19 pure js methods.js → Tests/19 pure js methods.js
diff --git a/Tests/! stock/2 structure arguments.js → Tests/2 structure arguments.js b/Tests/! stock/2 structure arguments.js → Tests/2 structure arguments.js
diff --git a/Tests/! stock/20 pointer to function.js → Tests/20 pointer to function.js b/Tests/! stock/20 pointer to function.js → Tests/20 pointer to function.js
diff --git a/Tests/! stock/21 new class definition.js → Tests/21 new class definition.js b/Tests/! stock/21 new class definition.js → Tests/21 new class definition.js
diff --git a/Tests/! stock/22 instance valueOf.js → Tests/22 instance valueOf.js b/Tests/! stock/22 instance valueOf.js → Tests/22 instance valueOf.js
diff --git a/Tests/! stock/23 NSString bridging.js → Tests/23 NSString bridging.js b/Tests/! stock/23 NSString bridging.js → Tests/23 NSString bridging.js
diff --git a/Tests/! stock/24 structure set.js → Tests/24 structure set.js b/Tests/! stock/24 structure set.js → Tests/24 structure set.js
diff --git a/Tests/! stock/25 variadic.js → Tests/25 variadic.js b/Tests/! stock/25 variadic.js → Tests/25 variadic.js
diff --git a/Tests/! stock/26 full NSArray bridge.js → Tests/26 full NSArray bridge.js b/Tests/! stock/26 full NSArray bridge.js → Tests/26 full NSArray bridge.js
diff --git a/Tests/! stock/27 type modifier o.js → Tests/27 type modifier o.js b/Tests/! stock/27 type modifier o.js → Tests/27 type modifier o.js
diff --git a/Tests/! stock/28 struct description.js → Tests/28 struct description.js b/Tests/! stock/28 struct description.js → Tests/28 struct description.js
diff --git a/Tests/! stock/29 pointer handling.js → Tests/29 pointer handling.js b/Tests/! stock/29 pointer handling.js → Tests/29 pointer handling.js
diff --git a/Tests/! stock/3 derivation.js → Tests/3 derivation.js b/Tests/! stock/3 derivation.js → Tests/3 derivation.js
diff --git a/Tests/! stock/30 obj1 == obj2.js → Tests/30 obj1 == obj2.js b/Tests/! stock/30 obj1 == obj2.js → Tests/30 obj1 == obj2.js
diff --git a/Tests/! stock/31 bridgeSupport bench.js → Tests/31 bridgeSupport bench.js b/Tests/! stock/31 bridgeSupport bench.js → Tests/31 bridgeSupport bench.js
diff --git a/Tests/! stock/32 new class syntax.js → Tests/32 new class syntax.js b/Tests/! stock/32 new class syntax.js → Tests/32 new class syntax.js
diff --git a/Tests/! stock/33 class syntax swizzle.js → Tests/33 class syntax swizzle.js b/Tests/! stock/33 class syntax swizzle.js → Tests/33 class syntax swizzle.js
diff --git a/Tests/! stock/34 object keys.js → Tests/34 object keys.js b/Tests/! stock/34 object keys.js → Tests/34 object keys.js
diff --git a/Tests/! stock/35 webview.js → Tests/35 webview.js b/Tests/! stock/35 webview.js → Tests/35 webview.js
diff --git a/Tests/! stock/36 safe dealloc.js → Tests/36 safe dealloc.js b/Tests/! stock/36 safe dealloc.js → Tests/36 safe dealloc.js
diff --git a/Tests/! stock/37 init from webview.js → Tests/37 init from webview.js b/Tests/! stock/37 init from webview.js → Tests/37 init from webview.js
diff --git a/Tests/! stock/38 class walker.js → Tests/38 class walker.js b/Tests/! stock/38 class walker.js → Tests/38 class walker.js
diff --git a/Tests/! stock/39 NSArray js functions.js → Tests/39 NSArray js functions.js b/Tests/! stock/39 NSArray js functions.js → Tests/39 NSArray js functions.js
diff --git a/Tests/! stock/4 js load.js → Tests/4 js load.js b/Tests/! stock/4 js load.js → Tests/4 js load.js
diff --git a/Tests/! stock/40 ObjJ syntax.js → Tests/40 ObjJ syntax.js b/Tests/! stock/40 ObjJ syntax.js → Tests/40 ObjJ syntax.js
diff --git a/Tests/! stock/41 class inner js functions.js → Tests/41 class inner js functions.js b/Tests/! stock/41 class inner js functions.js → Tests/41 class inner js functions.js
diff --git a/Tests/! stock/42 return if.js → Tests/42 return if.js b/Tests/! stock/42 return if.js → Tests/42 return if.js
diff --git a/Tests/! stock/43 @ string and selector.js → Tests/43 @ string and selector.js b/Tests/! stock/43 @ string and selector.js → Tests/43 @ string and selector.js
diff --git a/Tests/! stock/44 instanceWith.js → Tests/44 instanceWith.js b/Tests/! stock/44 instanceWith.js → Tests/44 instanceWith.js
diff --git a/Tests/! stock/45 ƒ function shortcut.js → Tests/45 ƒ function shortcut.js b/Tests/! stock/45 ƒ function shortcut.js → Tests/45 ƒ function shortcut.js
diff --git a/Tests/! stock/46 exceptions.js → Tests/46 exceptions.js b/Tests/! stock/46 exceptions.js → Tests/46 exceptions.js
diff --git a/Tests/! stock/47 ObjJ syntax super.js → Tests/47 ObjJ syntax super.js b/Tests/! stock/47 ObjJ syntax super.js → Tests/47 ObjJ syntax super.js
diff --git a/...s/! stock/48 ObjJ syntax compatibility.js → Tests/48 ObjJ syntax compatibility.js b/...s/! stock/48 ObjJ syntax compatibility.js → Tests/48 ObjJ syntax compatibility.js
diff --git a/Tests/! stock/49 out pointer.js → Tests/49 out pointer.js b/Tests/! stock/49 out pointer.js → Tests/49 out pointer.js
diff --git a/Tests/! stock/50 setValueForKey op.js → Tests/50 setValueForKey op.js b/Tests/! stock/50 setValueForKey op.js → Tests/50 setValueForKey op.js
diff --git a/Tests/! stock/51 ObjC blocks.js → Tests/51 ObjC blocks.js b/Tests/! stock/51 ObjC blocks.js → Tests/51 ObjC blocks.js
diff --git a/Tests/! stock/52 line and sourceURL.js → Tests/52 line and sourceURL.js b/Tests/! stock/52 line and sourceURL.js → Tests/52 line and sourceURL.js
diff --git a/Tests/! stock/53 Unicode ObjC classes.js → Tests/53 Unicode ObjC classes.js b/Tests/! stock/53 Unicode ObjC classes.js → Tests/53 Unicode ObjC classes.js
diff --git a/Tests/! stock/54 custom indexed access.js → Tests/54 custom indexed access.js b/Tests/! stock/54 custom indexed access.js → Tests/54 custom indexed access.js
diff --git a/.../! stock/55 javascript method override.js → Tests/55 javascript method override.js b/.../! stock/55 javascript method override.js → Tests/55 javascript method override.js
diff --git a/Tests/! stock/56 whitespace.js → Tests/56 whitespace.js b/Tests/! stock/56 whitespace.js → Tests/56 whitespace.js
diff --git a/Tests/! stock/6 basic arguments.js → Tests/6 basic arguments.js b/Tests/! stock/6 basic arguments.js → Tests/6 basic arguments.js
diff --git a/Tests/! stock/7 split call.js → Tests/7 split call.js b/Tests/! stock/7 split call.js → Tests/7 split call.js
diff --git a/Tests/! stock/8 zero arg autocall.js → Tests/8 zero arg autocall.js b/Tests/! stock/8 zero arg autocall.js → Tests/8 zero arg autocall.js
diff --git a/Tests/! stock/9 auto setter.js → Tests/9 auto setter.js b/Tests/! stock/9 auto setter.js → Tests/9 auto setter.js
diff --git a/TestsRunner/ApplicationController.m b/TestsRunner/ApplicationController.m
@@ -22,7 +22,6 @@ - (id)init {
 		return nil;
 
 	test_unit = test_delegate = test_webview = test_autocall = YES;
-	test_webview = NO;
 
 	return self;
 }
@@ -149,7 +148,7 @@ - (IBAction)runJSTests:(id)sender
 		[jsc loadFrameworkWithName:@"WebKit"];
 		webViewClass = objc_getClass("WebView");
 	}
-	if (webViewClass && test_webview)
+	if (webViewClass)
 	{
 //		NSLog(@"Testing initing from a WebView");
 		// Load nib
@@ -188,7 +187,8 @@ - (IBAction)runJSTests:(id)sender
 	}
 	else
 	{
-		NSLog(@"WebKit not loaded - cannot test JSCocoa inited from a WebView");
+		if (test_webview)
+			NSLog(@"WebKit not loaded - cannot test JSCocoa inited from a WebView");
 	}
 
 
@@ -240,8 +240,6 @@ - (IBAction)runJSTests:(id)sender
 	id r = [o performSelector:[@"だけを追加する:" UTF8String] withObject:[NSNumber numberWithInt:7]];
 	NSLog(@"r=%@", r);
 */
-	NSLog(@"DOUBLE CYCLE");
-//	[self cycleContext];
 }
 
 
@@ -956,9 +954,11 @@ - (void)finishTest37:(BOOL)b
 
 
 	NSLog(@"JSC2 not deallocated");
-
+	NSLog(@"unlinking...");
 	[jsc2 unlinkAllReferences];
+	NSLog(@"collecting...");
 	[jsc2 garbageCollect];
+	NSLog(@"releasing...");
 	[jsc2 release];
 	jsc2 = nil;