Removed split call check

cobook · Jul 26, 2010 · 44551d5 · 44551d5
1 parent 99135c8
commit 44551d5
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 36 deletions.
diff --git a/JSCocoa/JSCocoaController.m b/JSCocoa/JSCocoaController.m
@@ -1624,7 +1624,6 @@ + (BOOL)trySplitCall:(id*)_methodName class:(Class)class argumentCount:(size_t*)
 + (BOOL)isMaybeSplitCall:(NSString*)_start forClass:(id)class
 {
 	int i;
-
 	id start = [_start lowercaseString];
 	// Search through every class level
 	while (class)
@@ -3568,7 +3567,9 @@ static JSValueRef jsCocoaObject_getProperty(JSContextRef ctx, JSObjectRef object
 				if (callee == class)
 					class = objc_getMetaClass(object_getClassName(class));
 				// Try split start
-				BOOL isMaybeSplit = [JSCocoaController isMaybeSplitCall:methodName forClass:class];
+				BOOL isMaybeSplit = NO;
+				if ([jsc useSplitCall])
+					isMaybeSplit = [JSCocoaController isMaybeSplitCall:methodName forClass:class];
 				// If not split and not NSString, return (if NSString, try to convert to JS string in callAsFunction and use native JS methods)
 				if (!isMaybeSplit && ![callee isKindOfClass:[NSString class]])	
 				{

diff --git a/TestsRunner/TestsRunner.xcodeproj/mini.mode2v3 b/TestsRunner/TestsRunner.xcodeproj/mini.mode2v3
@@ -216,10 +216,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>3D98A4DB11FD8FFC00111BFE</string>
+						<string>3DD83E6411FDD3A9001BE923</string>
 						<key>history</key>
 						<array>
-							<string>3D98A34311FC794C00111BFE</string>
+							<string>3D98A4DB11FD8FFC00111BFE</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -256,10 +256,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>3D98A4DD11FD8FFC00111BFE</string>
+						<string>3DD83E6611FDD3A9001BE923</string>
 						<key>history</key>
 						<array>
-							<string>3D98A34511FC794C00111BFE</string>
+							<string>3D98A4DD11FD8FFC00111BFE</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -524,8 +524,8 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>3D98A4C011FD8FA100111BFE</string>
-				<string>3D98A4C111FD8FA100111BFE</string>
+				<string>3DD83E5E11FDD39A001BE923</string>
+				<string>3DD83E5F11FDD39A001BE923</string>
 				<string>1C9437FD063B20B00039CFAC</string>
 				<string>1C9437FE063B20B00039CFAC</string>
 				<string>1C9437FF063B20B00039CFAC</string>
@@ -562,8 +562,8 @@
 	<integer>0</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>3D98A4CD11FD8FA100111BFE</string>
-		<string>3D98A4CE11FD8FA100111BFE</string>
+		<string>3DD83E6D11FDD3A9001BE923</string>
+		<string>3DD83E6E11FDD3A9001BE923</string>
 		<string>1C530D54069F1CE1000CFCEE</string>
 		<string>1C530D52069F1CE1000CFCEE</string>
 		<string>3DB850A711E59E1500D03E1F</string>
@@ -784,7 +784,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C530D52069F1CE1000CFCEE</string>
-				<string>3D98A4C411FD8FA100111BFE</string>
+				<string>3DD83E6211FDD39A001BE923</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -906,13 +906,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C530D54069F1CE1000CFCEE</string>
-				<string>3D98A4C511FD8FA100111BFE</string>
+				<string>3DD83E6711FDD3A9001BE923</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>3D98A4C611FD8FA100111BFE</string>
-				<string>3D98A4C711FD8FA100111BFE</string>
-				<string>3D98A4C811FD8FA100111BFE</string>
-				<string>3D98A4C911FD8FA100111BFE</string>
-				<string>3D98A4CA11FD8FA100111BFE</string>
+				<string>3DD83E6811FDD3A9001BE923</string>
+				<string>3DD83E6911FDD3A9001BE923</string>
+				<string>3DD83E6A11FDD3A9001BE923</string>
+				<string>3DD83E6B11FDD3A9001BE923</string>
+				<string>3DD83E6C11FDD3A9001BE923</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -1068,7 +1068,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C530D5B069F1CE1000CFCEE</string>
-				<string>3D98A4CB11FD8FA100111BFE</string>
+				<string>3DD83E6311FDD39A001BE923</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>

diff --git a/TestsRunner/TestsRunner.xcodeproj/mini.pbxuser b/TestsRunner/TestsRunner.xcodeproj/mini.pbxuser
@@ -62,14 +62,14 @@
 					PBXFileDataSource_Target_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 301830039;
-			PBXWorkspaceStateSaveDate = 301830039;
+			PBXPerProjectTemplateStateSaveDate = 301847447;
+			PBXWorkspaceStateSaveDate = 301847447;
 		};
 		perUserProjectItems = {
-			3D98A34311FC794C00111BFE /* PBXTextBookmark */ = 3D98A34311FC794C00111BFE /* PBXTextBookmark */;
-			3D98A34511FC794C00111BFE /* PBXTextBookmark */ = 3D98A34511FC794C00111BFE /* PBXTextBookmark */;
 			3D98A4DB11FD8FFC00111BFE /* PBXTextBookmark */ = 3D98A4DB11FD8FFC00111BFE /* PBXTextBookmark */;
 			3D98A4DD11FD8FFC00111BFE /* PBXTextBookmark */ = 3D98A4DD11FD8FFC00111BFE /* PBXTextBookmark */;
+			3DD83E6411FDD3A9001BE923 /* PBXTextBookmark */ = 3DD83E6411FDD3A9001BE923 /* PBXTextBookmark */;
+			3DD83E6611FDD3A9001BE923 /* PBXTextBookmark */ = 3DD83E6611FDD3A9001BE923 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 3D36E256105229C200132E23 /* Source Control */;
 		userBuildSettings = {
@@ -293,24 +293,30 @@
 			sepNavWindowFrame = "{{718, 4}, {1047, 1174}}";
 		};
 	};
-	3D98A34311FC794C00111BFE /* PBXTextBookmark */ = {
+	3D98A4DB11FD8FFC00111BFE /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 3D98A34411FC794C00111BFE /* 16 NSArray NSDictionary easy access.js */;
+		fRef = 3D98A4DC11FD8FFC00111BFE /* 16 NSArray NSDictionary easy access.js */;
 		name = "16 NSArray NSDictionary easy access.js: 106";
 		rLen = 0;
 		rLoc = 2072;
 		rType = 0;
 		vrLen = 2150;
 		vrLoc = 774;
 	};
-	3D98A34411FC794C00111BFE /* 16 NSArray NSDictionary easy access.js */ = {
+	3D98A4DC11FD8FFC00111BFE /* 16 NSArray NSDictionary easy access.js */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.javascript;
 		name = "16 NSArray NSDictionary easy access.js";
 		path = "/Users/mini/Software Inexdo/JSCocoa/Tests/16 NSArray NSDictionary easy access.js";
 		sourceTree = "<absolute>";
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1038, 1474}}";
+			sepNavSelRange = "{2072, 0}";
+			sepNavVisRange = "{774, 2150}";
+			sepNavWindowFrame = "{{130, 27}, {1097, 1041}}";
+		};
 	};
-	3D98A34511FC794C00111BFE /* PBXTextBookmark */ = {
+	3D98A4DD11FD8FFC00111BFE /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 3D36E2B910522A2600132E23 /* ApplicationController.m */;
 		name = "ApplicationController.m: 150";
@@ -320,29 +326,23 @@
 		vrLen = 2237;
 		vrLoc = 3004;
 	};
-	3D98A4DB11FD8FFC00111BFE /* PBXTextBookmark */ = {
+	3DD83E6411FDD3A9001BE923 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 3D98A4DC11FD8FFC00111BFE /* 16 NSArray NSDictionary easy access.js */;
+		fRef = 3DD83E6511FDD3A9001BE923 /* 16 NSArray NSDictionary easy access.js */;
 		name = "16 NSArray NSDictionary easy access.js: 106";
 		rLen = 0;
 		rLoc = 2072;
 		rType = 0;
 		vrLen = 2150;
 		vrLoc = 774;
 	};
-	3D98A4DC11FD8FFC00111BFE /* 16 NSArray NSDictionary easy access.js */ = {
+	3DD83E6511FDD3A9001BE923 /* 16 NSArray NSDictionary easy access.js */ = {
 		isa = PBXFileReference;
 		name = "16 NSArray NSDictionary easy access.js";
 		path = "/Users/mini/Software Inexdo/JSCocoa/Tests/16 NSArray NSDictionary easy access.js";
 		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1038, 1474}}";
-			sepNavSelRange = "{2072, 0}";
-			sepNavVisRange = "{774, 2150}";
-			sepNavWindowFrame = "{{130, 27}, {1097, 1041}}";
-		};
 	};
-	3D98A4DD11FD8FFC00111BFE /* PBXTextBookmark */ = {
+	3DD83E6611FDD3A9001BE923 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 3D36E2B910522A2600132E23 /* ApplicationController.m */;
 		name = "ApplicationController.m: 150";