Fixed valueOfCallback comment

parmanoir · Aug 18, 2010 · 9045a17 · 9045a17
1 parent df04bae
commit 9045a17
Show file tree

Hide file tree

Showing 58 changed files with 366 additions and 55 deletions.
diff --git a/JSCocoa/JSCocoaController.m b/JSCocoa/JSCocoaController.m
@@ -3034,7 +3034,10 @@ JSValueRef boxedValueFromExternalContext(JSContextRef externalCtx, JSValueRef va
 
 
 //
-// Autocall : return value
+// valueOf : from a boxed ObjC object, returns a primitive javascript value (number or string) 
+//  that JavascriptCore can use in expressions (eg boxedObject + 'this', boxedObject < 4)
+//
+//  The converted object is temporary and does not affect the boxed object
 //
 JSValueRef valueOfCallback(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception)
 {

diff --git a/Tests/1 C and ObjC calls.js → Tests/! stock/1 C and ObjC calls.js b/Tests/1 C and ObjC calls.js → Tests/! stock/1 C and ObjC calls.js
diff --git a/Tests/10 shorthand overload.js → Tests/! stock/10 shorthand overload.js b/Tests/10 shorthand overload.js → Tests/! stock/10 shorthand overload.js
diff --git a/Tests/11 retain test 2.js → Tests/! stock/11 retain test 2.js b/Tests/11 retain test 2.js → Tests/! stock/11 retain test 2.js
diff --git a/Tests/12 instance variables.js → Tests/! stock/12 instance variables.js b/Tests/12 instance variables.js → Tests/! stock/12 instance variables.js
diff --git a/Tests/13 instance.js → Tests/! stock/13 instance.js b/Tests/13 instance.js → Tests/! stock/13 instance.js
diff --git a/Tests/14 class.js → Tests/! stock/14 class.js b/Tests/14 class.js → Tests/! stock/14 class.js
diff --git a/Tests/15 IBOutlet IBAction.js → Tests/! stock/15 IBOutlet IBAction.js b/Tests/15 IBOutlet IBAction.js → Tests/! stock/15 IBOutlet IBAction.js
diff --git a/Tests/16 NSArray NSDictionary easy access.js → ...ck/16 NSArray NSDictionary easy access.js b/Tests/16 NSArray NSDictionary easy access.js → ...ck/16 NSArray NSDictionary easy access.js
diff --git a/Tests/17 struct instance.js → Tests/! stock/17 struct instance.js b/Tests/17 struct instance.js → Tests/! stock/17 struct instance.js
diff --git a/Tests/18 structure args.js → Tests/! stock/18 structure args.js b/Tests/18 structure args.js → Tests/! stock/18 structure args.js
diff --git a/Tests/19 pure js methods.js → Tests/! stock/19 pure js methods.js b/Tests/19 pure js methods.js → Tests/! stock/19 pure js methods.js
diff --git a/Tests/2 structure arguments.js → Tests/! stock/2 structure arguments.js b/Tests/2 structure arguments.js → Tests/! stock/2 structure arguments.js
diff --git a/Tests/20 pointer to function.js → Tests/! stock/20 pointer to function.js b/Tests/20 pointer to function.js → Tests/! stock/20 pointer to function.js
diff --git a/Tests/21 new class definition.js → Tests/! stock/21 new class definition.js b/Tests/21 new class definition.js → Tests/! stock/21 new class definition.js
diff --git a/Tests/22 instance valueOf.js → Tests/! stock/22 instance valueOf.js b/Tests/22 instance valueOf.js → Tests/! stock/22 instance valueOf.js
diff --git a/Tests/23 NSString bridging.js → Tests/! stock/23 NSString bridging.js b/Tests/23 NSString bridging.js → Tests/! stock/23 NSString bridging.js
diff --git a/Tests/24 structure set.js → Tests/! stock/24 structure set.js b/Tests/24 structure set.js → Tests/! stock/24 structure set.js
diff --git a/Tests/25 variadic.js → Tests/! stock/25 variadic.js b/Tests/25 variadic.js → Tests/! stock/25 variadic.js
diff --git a/Tests/26 full NSArray bridge.js → Tests/! stock/26 full NSArray bridge.js b/Tests/26 full NSArray bridge.js → Tests/! stock/26 full NSArray bridge.js
diff --git a/Tests/27 type modifier o.js → Tests/! stock/27 type modifier o.js b/Tests/27 type modifier o.js → Tests/! stock/27 type modifier o.js
diff --git a/Tests/28 struct description.js → Tests/! stock/28 struct description.js b/Tests/28 struct description.js → Tests/! stock/28 struct description.js
diff --git a/Tests/29 pointer handling.js → Tests/! stock/29 pointer handling.js b/Tests/29 pointer handling.js → Tests/! stock/29 pointer handling.js
diff --git a/Tests/3 derivation.js → Tests/! stock/3 derivation.js b/Tests/3 derivation.js → Tests/! stock/3 derivation.js
diff --git a/Tests/30 obj1 == obj2.js → Tests/! stock/30 obj1 == obj2.js b/Tests/30 obj1 == obj2.js → Tests/! stock/30 obj1 == obj2.js
diff --git a/Tests/31 bridgeSupport bench.js → Tests/! stock/31 bridgeSupport bench.js b/Tests/31 bridgeSupport bench.js → Tests/! stock/31 bridgeSupport bench.js
diff --git a/Tests/32 new class syntax.js → Tests/! stock/32 new class syntax.js b/Tests/32 new class syntax.js → Tests/! stock/32 new class syntax.js
diff --git a/Tests/33 class syntax swizzle.js → Tests/! stock/33 class syntax swizzle.js b/Tests/33 class syntax swizzle.js → Tests/! stock/33 class syntax swizzle.js
diff --git a/Tests/34 object keys.js → Tests/! stock/34 object keys.js b/Tests/34 object keys.js → Tests/! stock/34 object keys.js
diff --git a/Tests/35 webview.js → Tests/! stock/35 webview.js b/Tests/35 webview.js → Tests/! stock/35 webview.js
diff --git a/Tests/36 safe dealloc.js → Tests/! stock/36 safe dealloc.js b/Tests/36 safe dealloc.js → Tests/! stock/36 safe dealloc.js
diff --git a/Tests/37 init from webview.js → Tests/! stock/37 init from webview.js b/Tests/37 init from webview.js → Tests/! stock/37 init from webview.js
diff --git a/Tests/38 class walker.js → Tests/! stock/38 class walker.js b/Tests/38 class walker.js → Tests/! stock/38 class walker.js
diff --git a/Tests/39 NSArray js functions.js → Tests/! stock/39 NSArray js functions.js b/Tests/39 NSArray js functions.js → Tests/! stock/39 NSArray js functions.js
diff --git a/Tests/4 js load.js → Tests/! stock/4 js load.js b/Tests/4 js load.js → Tests/! stock/4 js load.js
diff --git a/Tests/40 ObjJ syntax.js → Tests/! stock/40 ObjJ syntax.js b/Tests/40 ObjJ syntax.js → Tests/! stock/40 ObjJ syntax.js
diff --git a/Tests/41 class inner js functions.js → Tests/! stock/41 class inner js functions.js b/Tests/41 class inner js functions.js → Tests/! stock/41 class inner js functions.js
diff --git a/Tests/42 return if.js → Tests/! stock/42 return if.js b/Tests/42 return if.js → Tests/! stock/42 return if.js
diff --git a/Tests/43 @ string and selector.js → Tests/! stock/43 @ string and selector.js b/Tests/43 @ string and selector.js → Tests/! stock/43 @ string and selector.js
diff --git a/Tests/44 instanceWith.js → Tests/! stock/44 instanceWith.js b/Tests/44 instanceWith.js → Tests/! stock/44 instanceWith.js
diff --git a/Tests/45 ƒ function shortcut.js → Tests/! stock/45 ƒ function shortcut.js b/Tests/45 ƒ function shortcut.js → Tests/! stock/45 ƒ function shortcut.js
diff --git a/Tests/46 exceptions.js → Tests/! stock/46 exceptions.js b/Tests/46 exceptions.js → Tests/! stock/46 exceptions.js
diff --git a/Tests/47 ObjJ syntax super.js → Tests/! stock/47 ObjJ syntax super.js b/Tests/47 ObjJ syntax super.js → Tests/! stock/47 ObjJ syntax super.js
diff --git a/Tests/48 ObjJ syntax compatibility.js → ...s/! stock/48 ObjJ syntax compatibility.js b/Tests/48 ObjJ syntax compatibility.js → ...s/! stock/48 ObjJ syntax compatibility.js
diff --git a/Tests/49 out pointer.js → Tests/! stock/49 out pointer.js b/Tests/49 out pointer.js → Tests/! stock/49 out pointer.js
diff --git a/Tests/50 setValueForKey op.js → Tests/! stock/50 setValueForKey op.js b/Tests/50 setValueForKey op.js → Tests/! stock/50 setValueForKey op.js
diff --git a/Tests/51 ObjC blocks.js → Tests/! stock/51 ObjC blocks.js b/Tests/51 ObjC blocks.js → Tests/! stock/51 ObjC blocks.js
diff --git a/Tests/52 line and sourceURL.js → Tests/! stock/52 line and sourceURL.js b/Tests/52 line and sourceURL.js → Tests/! stock/52 line and sourceURL.js
diff --git a/Tests/53 Unicode ObjC classes.js → Tests/! stock/53 Unicode ObjC classes.js b/Tests/53 Unicode ObjC classes.js → Tests/! stock/53 Unicode ObjC classes.js
diff --git a/Tests/54 custom indexed access.js → Tests/! stock/54 custom indexed access.js b/Tests/54 custom indexed access.js → Tests/! stock/54 custom indexed access.js
diff --git a/Tests/55 javascript method override.js → .../! stock/55 javascript method override.js b/Tests/55 javascript method override.js → .../! stock/55 javascript method override.js
diff --git a/Tests/6 basic arguments.js → Tests/! stock/6 basic arguments.js b/Tests/6 basic arguments.js → Tests/! stock/6 basic arguments.js
diff --git a/Tests/7 split call.js → Tests/! stock/7 split call.js b/Tests/7 split call.js → Tests/! stock/7 split call.js
diff --git a/Tests/8 zero arg autocall.js → Tests/! stock/8 zero arg autocall.js b/Tests/8 zero arg autocall.js → Tests/! stock/8 zero arg autocall.js
diff --git a/Tests/9 auto setter.js → Tests/! stock/9 auto setter.js b/Tests/9 auto setter.js → Tests/! stock/9 auto setter.js
diff --git a/Tests/56 whitespace.js b/Tests/56 whitespace.js
@@ -22,4 +22,16 @@
 	if (object.fetchTab != '	')			throw 'Whitespace failed (2)'
 	if (object.fetchSpaces != '    ')		throw 'Whitespace failed (3)'
 
-
+
+	log('a')
+	var o = NSString.stringWithString('hello')
+	log('b')
+	var p = NSString.stringWithString(o)
+	log('c')
+	var n = NSNumber.numberWithInt(123)
+	log('d')
+	NSApplication.sharedApplication.delegate.add1(n)
+	log('e')
+	log('r=' + r)
+	log(o + '*')
+	log(p + '*')	
diff --git a/TestsRunner/TestsRunner.xcodeproj/mini.mode2v3 b/TestsRunner/TestsRunner.xcodeproj/mini.mode2v3
@@ -202,24 +202,24 @@
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>3DA8C8CE121C5AD100500160</string>
+				<string>3DA8C8F3121C5F0400500160</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>56 whitespace.js</string>
+				<string>JSCocoaController.m</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>3DA8C8CF121C5AD100500160</string>
+						<string>3DA8C8F4121C5F0400500160</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>56 whitespace.js</string>
+						<string>JSCocoaController.m</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>3DA8C94C121C5FD100500160</string>
+						<string>3DA8C977121C653E00500160</string>
 						<key>history</key>
 						<array>
-							<string>3DA8C8F1121C5F0400500160</string>
+							<string>3DA8C95A121C62D100500160</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -231,35 +231,35 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {1097, 944}}</string>
+				<string>{{0, 20}, {968, 907}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>390 193 1097 985 0 0 1920 1178 </string>
+				<string>338 147 968 948 0 0 1920 1178 </string>
 			</dict>
 		</dict>
 		<dict>
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>3DA8C8D2121C5AD100500160</string>
+				<string>3DA8C8CE121C5AD100500160</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>ApplicationController.m</string>
+				<string>56 whitespace.js</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>3DA8C8D3121C5AD100500160</string>
+						<string>3DA8C8CF121C5AD100500160</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>ApplicationController.m</string>
+						<string>56 whitespace.js</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>3DA8C94D121C5FD100500160</string>
+						<string>3DA8C978121C653E00500160</string>
 						<key>history</key>
 						<array>
-							<string>3DA8C931121C5F7400500160</string>
+							<string>3DA8C958121C62D100500160</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -271,35 +271,35 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {968, 907}}</string>
+				<string>{{0, 20}, {1097, 944}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>152 194 968 948 0 0 1920 1178 </string>
+				<string>538 187 1097 985 0 0 1920 1178 </string>
 			</dict>
 		</dict>
 		<dict>
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>3DA8C8F3121C5F0400500160</string>
+				<string>3DA8C8D2121C5AD100500160</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>JSCocoaController.m</string>
+				<string>ApplicationController.m</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>3DA8C8F4121C5F0400500160</string>
+						<string>3DA8C8D3121C5AD100500160</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>JSCocoaController.m</string>
+						<string>ApplicationController.m</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>3DA8C94E121C5FD100500160</string>
+						<string>3DA8C979121C653E00500160</string>
 						<key>history</key>
 						<array>
-							<string>3DA8C8EA121C5EA700500160</string>
+							<string>3DA8C968121C637A00500160</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -315,7 +315,7 @@
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>264 150 968 948 0 0 1920 1178 </string>
+				<string>152 194 968 948 0 0 1920 1178 </string>
 			</dict>
 		</dict>
 		<dict>
@@ -336,7 +336,7 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>3DA8C94F121C5FD100500160</string>
+						<string>3DA8C97A121C653E00500160</string>
 						<key>history</key>
 						<array>
 							<string>3DA8C8F8121C5F0400500160</string>
@@ -376,7 +376,7 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>3DA8C950121C5FD100500160</string>
+						<string>3DA8C97B121C653E00500160</string>
 						<key>history</key>
 						<array>
 							<string>3D53202B121C59D500B5076A</string>
@@ -416,7 +416,7 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>3DA8C951121C5FD100500160</string>
+						<string>3DA8C97C121C653E00500160</string>
 						<key>history</key>
 						<array>
 							<string>3D53202D121C59D500B5076A</string>
@@ -523,7 +523,7 @@
 										</array>
 									</array>
 									<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-									<string>{{0, 263}, {432, 356}}</string>
+									<string>{{0, 278}, {432, 356}}</string>
 								</dict>
 								<key>PBXTopSmartGroupGIDs</key>
 								<array/>
@@ -723,19 +723,18 @@
 	<integer>0</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>3DA8C952121C5FD100500160</string>
 		<string>3DA8C8DF121C5AD100500160</string>
 		<string>3DA8C8E0121C5AD100500160</string>
 		<string>1C530D54069F1CE1000CFCEE</string>
 		<string>1C530D52069F1CE1000CFCEE</string>
 		<string>3D531F27121C3B2500B5076A</string>
 		<string>3D531FA5121C420000B5076A</string>
 		<string>3DA8C8F6121C5F0400500160</string>
-		<string>3DA8C8F3121C5F0400500160</string>
 		<string>/Users/mini/Software Inexdo/JSCocoa/TestsRunner/TestsRunner.xcodeproj</string>
 		<string>3DA8C8D2121C5AD100500160</string>
-		<string>3DA8C8CE121C5AD100500160</string>
 		<string>1C530D5B069F1CE1000CFCEE</string>
+		<string>3DA8C8CE121C5AD100500160</string>
+		<string>3DA8C8F3121C5F0400500160</string>
 	</array>
 	<key>WindowString</key>
 	<string>1266 736 449 442 0 0 1920 1178 </string>