Skip to content
Browse files

CHECK - removed tests 11 12 15 30 32 - works with and without ObjC GC

  • Loading branch information...
1 parent 657bc69 commit b7c45aa65e79b59f78e0d9e491e8df64f11b2533 @parmanoir committed Mar 20, 2009
View
13 GC ObjC JSCocoa/ApplicationController.m
@@ -14,16 +14,16 @@ @implementation ApplicationController
- (void)applicationDidFinishLaunching:(id)notif
{
NSLog(@"DONE");
-
+/*
id c = [JSCocoaController sharedController];
[[JSCocoa sharedController] setUseAutoCall:NO];
id mainJSFile = [NSString stringWithFormat:@"%@/Contents/Resources/main.js", [[NSBundle mainBundle] bundlePath]];
[c evalJSFile:mainJSFile];
[[JSCocoa sharedController] setUseAutoCall:YES];
+*/
-
-// [self performSelector:@selector(runJSTests:) withObject:nil afterDelay:0];
+ [self performSelector:@selector(runJSTests:) withObject:nil afterDelay:0];
// objc_assignIvar();
}
@@ -35,13 +35,13 @@ - (void)test
int runCount;
- (IBAction)runJSTests:(id)sender
{
-
+[[NSGarbageCollector defaultCollector] disable];
NSLog(@"RUN TESTS");
id path = [[NSBundle mainBundle] bundlePath];
path = [NSString stringWithFormat:@"%@/Contents/Resources/Tests", path];
// NSLog(@"Run %d from %@", runCount, path);
BOOL b = [[JSCocoaController sharedController] runTests:path];
- [JSCocoaController garbageCollect];
+ [[JSCocoaController sharedController] garbageCollect];
if (!b) { NSLog(@"!!!!!!!!!!!FAIL %d from %@", runCount, path); return; }
runCount++;
NSLog(@">>>>Ran %d", runCount);
@@ -58,7 +58,8 @@ - (IBAction)runJSTests:(id)sender
- (IBAction)collect:(id)sender
{
- [JSCocoaController garbageCollect];
+// [JSCocoaController garbageCollect];
+ [[JSCocoaController sharedController] garbageCollect];
[[NSGarbageCollector defaultCollector] collectExhaustively];
objc_collect(OBJC_FULL_COLLECTION);
objc_collect(OBJC_EXHAUSTIVE_COLLECTION);
View
227 GC ObjC JSCocoa/GC ObjC JSCocoa.xcodeproj/mini.mode2v3
@@ -202,24 +202,24 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>3DB172EA0F29315E005DEA52</string>
+ <string>3DB35F640F72A40200289A0B</string>
<key>PBXProjectModuleLabel</key>
<string>ApplicationController.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>3DB172EB0F29315E005DEA52</string>
+ <string>3DB35F650F72A40200289A0B</string>
<key>PBXProjectModuleLabel</key>
<string>ApplicationController.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3D31751B0F367F1200F0F4BA</string>
+ <string>3DB3604A0F72AA6B00289A0B</string>
<key>history</key>
<array>
- <string>3D3175190F367E0F00F0F4BA</string>
+ <string>3DB35FB20F72A82C00289A0B</string>
</array>
</dict>
<key>SplitCount</key>
@@ -238,6 +238,166 @@
<string>878 200 1124 748 0 0 1920 1178 </string>
</dict>
</dict>
+ <dict>
+ <key>Content</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3D688F1B0F72A2910026CECE</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>14 class.js</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3D688F1C0F72A2910026CECE</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>14 class.js</string>
+ <key>_historyCapacity</key>
+ <integer>0</integer>
+ <key>bookmark</key>
+ <string>3DB3604B0F72AA6B00289A0B</string>
+ <key>history</key>
+ <array>
+ <string>3D688F420F72A31C0026CECE</string>
+ </array>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>Geometry</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 20}, {1112, 837}}</string>
+ <key>PBXModuleWindowStatusBarHidden2</key>
+ <false/>
+ <key>RubberWindowFrame</key>
+ <string>38 277 1112 878 0 0 1920 1178 </string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Content</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3DB35F3E0F72A37D00289A0B</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>class.js</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3DB35F3F0F72A37D00289A0B</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>class.js</string>
+ <key>_historyCapacity</key>
+ <integer>0</integer>
+ <key>bookmark</key>
+ <string>3DB3604D0F72AA6B00289A0B</string>
+ <key>history</key>
+ <array>
+ <string>3DB35F3C0F72A36F00289A0B</string>
+ </array>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>Geometry</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 20}, {1107, 698}}</string>
+ <key>PBXModuleWindowStatusBarHidden2</key>
+ <false/>
+ <key>RubberWindowFrame</key>
+ <string>375 276 1107 739 0 0 1920 1178 </string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Content</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3D688EEC0F729F420026CECE</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>JSCocoaController.m</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3D688EED0F729F420026CECE</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>JSCocoaController.m</string>
+ <key>_historyCapacity</key>
+ <integer>0</integer>
+ <key>bookmark</key>
+ <string>3DB3604E0F72AA6B00289A0B</string>
+ <key>history</key>
+ <array>
+ <string>3DB35F670F72A40200289A0B</string>
+ </array>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>Geometry</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 20}, {1107, 698}}</string>
+ <key>PBXModuleWindowStatusBarHidden2</key>
+ <false/>
+ <key>RubberWindowFrame</key>
+ <string>607 374 1107 739 0 0 1920 1178 </string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Content</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3D688EE80F729F420026CECE</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>12 instance variables.js</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3D688EE90F729F420026CECE</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>12 instance variables.js</string>
+ <key>_historyCapacity</key>
+ <integer>0</integer>
+ <key>bookmark</key>
+ <string>3DB3604F0F72AA6B00289A0B</string>
+ <key>history</key>
+ <array>
+ <string>3D688F440F72A31C0026CECE</string>
+ </array>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>Geometry</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 20}, {1112, 837}}</string>
+ <key>PBXModuleWindowStatusBarHidden2</key>
+ <false/>
+ <key>RubberWindowFrame</key>
+ <string>51 246 1112 878 0 0 1920 1178 </string>
+ </dict>
+ </dict>
</array>
<key>PerspectiveWidths</key>
<array>
@@ -308,19 +468,18 @@
<string>3D788F770F01F96300175ADD</string>
<string>080E96DDFE201D6D7F000001</string>
<string>29B97317FDCFA39411CA2CEA</string>
+ <string>3D788FA90F01F97D00175ADD</string>
<string>29B97323FDCFA39411CA2CEA</string>
<string>19C28FACFE9D520D11CA2CBB</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>19</integer>
- <integer>17</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 29}, {333, 334}}</string>
+ <string>{{0, 0}, {333, 334}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -343,7 +502,7 @@
<real>43</real>
</array>
<key>RubberWindowFrame</key>
- <string>1227 758 350 420 0 0 1920 1178 </string>
+ <string>1494 758 350 420 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -483,8 +642,8 @@
</array>
<key>TableOfContents</key>
<array>
- <string>3D3175070F367DCA00F0F4BA</string>
- <string>3D3175080F367DCA00F0F4BA</string>
+ <string>3DB35F0D0F72A32600289A0B</string>
+ <string>3DB35F0E0F72A32600289A0B</string>
<string>1C9437FD063B20B00039CFAC</string>
<string>1C9437FE063B20B00039CFAC</string>
<string>1C9437FF063B20B00039CFAC</string>
@@ -517,13 +676,21 @@
<integer>0</integer>
<key>WindowOrderList</key>
<array>
- <string>1C530D54069F1CE1000CFCEE</string>
+ <string>1C530D57069F1CE1000CFCEE</string>
+ <string>3DB35F1A0F72A32D00289A0B</string>
+ <string>3DB35F1B0F72A32D00289A0B</string>
<string>1C530D52069F1CE1000CFCEE</string>
+ <string>3D688EE80F729F420026CECE</string>
+ <string>3D688EEC0F729F420026CECE</string>
+ <string>3DB35F3E0F72A37D00289A0B</string>
+ <string>3D688F1B0F72A2910026CECE</string>
+ <string>1C530D54069F1CE1000CFCEE</string>
+ <string>3DB35F640F72A40200289A0B</string>
+ <string>1C530D5B069F1CE1000CFCEE</string>
<string>/Users/mini/Software Inexdo/JSCocoa/GC ObjC JSCocoa/GC ObjC JSCocoa.xcodeproj</string>
- <string>3DB172EA0F29315E005DEA52</string>
</array>
<key>WindowString</key>
- <string>1227 758 350 420 0 0 1920 1178 </string>
+ <string>1494 758 350 420 0 0 1920 1178 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -676,14 +843,12 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string>JSCocoaController.m</string>
+ <string></string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -741,7 +906,7 @@
<key>TableOfContents</key>
<array>
<string>1C530D52069F1CE1000CFCEE</string>
- <string>3D31750A0F367DCA00F0F4BA</string>
+ <string>3DB35F130F72A32600289A0B</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -835,10 +1000,10 @@
<key>Frame</key>
<string>{{714, 0}, {530, 505}}</string>
<key>RubberWindowFrame</key>
- <string>310 103 1244 995 0 0 1920 1178 </string>
+ <string>359 111 1244 995 0 0 1920 1178 </string>
</dict>
<key>RubberWindowFrame</key>
- <string>310 103 1244 995 0 0 1920 1178 </string>
+ <string>359 111 1244 995 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXDebugSessionModule</string>
@@ -861,22 +1026,22 @@
<key>TableOfContents</key>
<array>
<string>1C530D54069F1CE1000CFCEE</string>
- <string>3D3175110F367DD600F0F4BA</string>
+ <string>3DB35F060F72A32300289A0B</string>
<string>1C162984064C10D400B95A72</string>
- <string>3D3175120F367DD600F0F4BA</string>
- <string>3D3175130F367DD600F0F4BA</string>
- <string>3D3175140F367DD600F0F4BA</string>
- <string>3D3175150F367DD600F0F4BA</string>
- <string>3D3175160F367DD600F0F4BA</string>
+ <string>3DB35F070F72A32300289A0B</string>
+ <string>3DB35F080F72A32300289A0B</string>
+ <string>3DB35F090F72A32300289A0B</string>
+ <string>3DB35F0A0F72A32300289A0B</string>
+ <string>3DB35F0B0F72A32300289A0B</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
<key>WindowString</key>
- <string>310 103 1244 995 0 0 1920 1178 </string>
+ <string>359 111 1244 995 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>1C530D54069F1CE1000CFCEE</string>
<key>WindowToolIsVisible</key>
- <false/>
+ <true/>
</dict>
<dict>
<key>FirstTimeWindowDisplayed</key>
@@ -899,7 +1064,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CDD528C0622207200134675</string>
<key>PBXProjectModuleLabel</key>
- <string>JSCocoaFFIArgument.m</string>
+ <string>class.js</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -957,8 +1122,8 @@
<key>TableOfContents</key>
<array>
<string>1C530D57069F1CE1000CFCEE</string>
- <string>3DB173160F2936CF005DEA52</string>
- <string>3DB173170F2936CF005DEA52</string>
+ <string>3DB35F600F72A3E700289A0B</string>
+ <string>3DB35F610F72A3E700289A0B</string>
<string>1CDD528C0622207200134675</string>
<string>1CD0528E0623707200166675</string>
</array>
@@ -1023,7 +1188,7 @@
<key>TableOfContents</key>
<array>
<string>1C530D5B069F1CE1000CFCEE</string>
- <string>3DB172DD0F29310A005DEA52</string>
+ <string>3DB35F140F72A32600289A0B</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
View
181 GC ObjC JSCocoa/GC ObjC JSCocoa.xcodeproj/mini.pbxuser
@@ -1,7 +1,7 @@
// !$*UTF8*$!
{
29B97313FDCFA39411CA2CEA /* Project object */ = {
- activeBuildConfigurationName = Release;
+ activeBuildConfigurationName = Debug;
activeExecutable = 3DD063F00EFF746B007655AD /* GC ObjC JSCocoa */;
activeTarget = 8D1107260486CEB800E47090 /* GC ObjC JSCocoa */;
addToTargets = (
@@ -60,12 +60,20 @@
PBXFileDataSource_Target_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 255229380;
- PBXWorkspaceStateSaveDate = 255229380;
+ PBXPerProjectTemplateStateSaveDate = 259171104;
+ PBXWorkspaceStateSaveDate = 259171104;
};
perUserProjectItems = {
- 3D3175190F367E0F00F0F4BA /* PBXTextBookmark */ = 3D3175190F367E0F00F0F4BA /* PBXTextBookmark */;
- 3D31751B0F367F1200F0F4BA /* PBXTextBookmark */ = 3D31751B0F367F1200F0F4BA /* PBXTextBookmark */;
+ 3D688F420F72A31C0026CECE /* PBXTextBookmark */ = 3D688F420F72A31C0026CECE /* PBXTextBookmark */;
+ 3D688F440F72A31C0026CECE /* PBXTextBookmark */ = 3D688F440F72A31C0026CECE /* PBXTextBookmark */;
+ 3DB35F3C0F72A36F00289A0B /* PBXBookmark */ = 3DB35F3C0F72A36F00289A0B /* PBXBookmark */;
+ 3DB35F670F72A40200289A0B /* PBXTextBookmark */ = 3DB35F670F72A40200289A0B /* PBXTextBookmark */;
+ 3DB35FB20F72A82C00289A0B /* PBXTextBookmark */ = 3DB35FB20F72A82C00289A0B /* PBXTextBookmark */;
+ 3DB3604A0F72AA6B00289A0B /* PBXTextBookmark */ = 3DB3604A0F72AA6B00289A0B /* PBXTextBookmark */;
+ 3DB3604B0F72AA6B00289A0B /* PBXTextBookmark */ = 3DB3604B0F72AA6B00289A0B /* PBXTextBookmark */;
+ 3DB3604D0F72AA6B00289A0B /* PBXTextBookmark */ = 3DB3604D0F72AA6B00289A0B /* PBXTextBookmark */;
+ 3DB3604E0F72AA6B00289A0B /* PBXTextBookmark */ = 3DB3604E0F72AA6B00289A0B /* PBXTextBookmark */;
+ 3DB3604F0F72AA6B00289A0B /* PBXTextBookmark */ = 3DB3604F0F72AA6B00289A0B /* PBXTextBookmark */;
};
sourceControlManager = 3DD063F80EFF746F007655AD /* Source Control */;
userBuildSettings = {
@@ -79,26 +87,45 @@
sepNavWindowFrame = "{{38, 357}, {1107, 795}}";
};
};
- 3D3175190F367E0F00F0F4BA /* PBXTextBookmark */ = {
+ 3D688F420F72A31C0026CECE /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 3DD0642B0EFF74D2007655AD /* ApplicationController.m */;
- name = "ApplicationController.m: 23";
+ fRef = 3D688F430F72A31C0026CECE /* 14 class.js */;
+ name = "14 class.js: 6";
rLen = 0;
- rLoc = 609;
+ rLoc = 1863;
rType = 0;
- vrLen = 1645;
- vrLoc = 0;
+ vrLen = 1723;
+ vrLoc = 1;
+ };
+ 3D688F430F72A31C0026CECE /* 14 class.js */ = {
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.javascript;
+ name = "14 class.js";
+ path = "/Users/mini/Software Inexdo/JSCocoa/Tests/14 class.js";
+ sourceTree = "<absolute>";
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {1053, 913}}";
+ sepNavSelRange = "{903, 0}";
+ sepNavVisRange = "{0, 1682}";
+ };
};
- 3D31751B0F367F1200F0F4BA /* PBXTextBookmark */ = {
+ 3D688F440F72A31C0026CECE /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 3DD0642B0EFF74D2007655AD /* ApplicationController.m */;
- name = "ApplicationController.m: 26";
+ fRef = 3D688F450F72A31C0026CECE /* 12 instance variables.js */;
+ name = "12 instance variables.js: 9";
rLen = 0;
- rLoc = 614;
+ rLoc = 146;
rType = 0;
- vrLen = 1647;
+ vrLen = 2698;
vrLoc = 0;
};
+ 3D688F450F72A31C0026CECE /* 12 instance variables.js */ = {
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.javascript;
+ name = "12 instance variables.js";
+ path = "/Users/mini/Software Inexdo/JSCocoa/Tests/12 instance variables.js";
+ sourceTree = "<absolute>";
+ };
3D788F780F01F96300175ADD /* BridgeSupportController.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1009, 777}}";
@@ -117,10 +144,10 @@
};
3D788F7A0F01F96300175ADD /* class.js */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1048, 4631}}";
- sepNavSelRange = "{12234, 0}";
- sepNavVisRange = "{10629, 1605}";
- sepNavWindowFrame = "{{77, 234}, {1107, 795}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1048, 7260}}";
+ sepNavSelRange = "{3058, 0}";
+ sepNavVisRange = "{2506, 1900}";
+ sepNavWindowFrame = "{{375, 220}, {1107, 795}}";
};
};
3D788F860F01F96300175ADD /* JSCocoaController.h */ = {
@@ -133,9 +160,9 @@
};
3D788F870F01F96300175ADD /* JSCocoaController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {909, 31356}}";
- sepNavSelRange = "{50134, 2}";
- sepNavVisRange = "{48846, 1335}";
+ sepNavIntBoundsRect = "{{0, 0}, {1048, 37191}}";
+ sepNavSelRange = "{18110, 4}";
+ sepNavVisRange = "{18899, 2075}";
sepNavWindowFrame = "{{607, 318}, {1107, 795}}";
};
};
@@ -147,6 +174,104 @@
sepNavWindowFrame = "{{621, 107}, {1107, 795}}";
};
};
+ 3DB35F3C0F72A36F00289A0B /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 3D788F7A0F01F96300175ADD /* class.js */;
+ };
+ 3DB35F670F72A40200289A0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3D788F870F01F96300175ADD /* JSCocoaController.m */;
+ name = "JSCocoaController.m: 1389";
+ rLen = 0;
+ rLoc = 46933;
+ rType = 0;
+ vrLen = 2072;
+ vrLoc = 45337;
+ };
+ 3DB35FB20F72A82C00289A0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3DD0642B0EFF74D2007655AD /* ApplicationController.m */;
+ name = "ApplicationController.m: 44";
+ rLen = 0;
+ rLoc = 1141;
+ rType = 0;
+ vrLen = 1667;
+ vrLoc = 195;
+ };
+ 3DB3604A0F72AA6B00289A0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3DD0642B0EFF74D2007655AD /* ApplicationController.m */;
+ name = "ApplicationController.m: 38";
+ rLen = 0;
+ rLoc = 802;
+ rType = 0;
+ vrLen = 1810;
+ vrLoc = 195;
+ };
+ 3DB3604B0F72AA6B00289A0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3DB3604C0F72AA6B00289A0B /* 14 class.js */;
+ name = "14 class.js: 39";
+ rLen = 0;
+ rLoc = 903;
+ rType = 0;
+ vrLen = 1682;
+ vrLoc = 0;
+ };
+ 3DB3604C0F72AA6B00289A0B /* 14 class.js */ = {
+ isa = PBXFileReference;
+ name = "14 class.js";
+ path = "/Users/mini/Software Inexdo/JSCocoa/Tests/14 class.js";
+ sourceTree = "<absolute>";
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {1053, 913}}";
+ sepNavSelRange = "{903, 0}";
+ sepNavVisRange = "{0, 1682}";
+ sepNavWindowFrame = "{{38, 221}, {1112, 934}}";
+ };
+ };
+ 3DB3604D0F72AA6B00289A0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3D788F7A0F01F96300175ADD /* class.js */;
+ name = "class.js: 127";
+ rLen = 0;
+ rLoc = 3058;
+ rType = 0;
+ vrLen = 1900;
+ vrLoc = 2506;
+ };
+ 3DB3604E0F72AA6B00289A0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3D788F870F01F96300175ADD /* JSCocoaController.m */;
+ name = "JSCocoaController.m: 575";
+ rLen = 4;
+ rLoc = 18110;
+ rType = 0;
+ vrLen = 2075;
+ vrLoc = 18899;
+ };
+ 3DB3604F0F72AA6B00289A0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3DB360500F72AA6B00289A0B /* 12 instance variables.js */;
+ name = "12 instance variables.js: 9";
+ rLen = 0;
+ rLoc = 146;
+ rType = 0;
+ vrLen = 2698;
+ vrLoc = 0;
+ };
+ 3DB360500F72AA6B00289A0B /* 12 instance variables.js */ = {
+ isa = PBXFileReference;
+ name = "12 instance variables.js";
+ path = "/Users/mini/Software Inexdo/JSCocoa/Tests/12 instance variables.js";
+ sourceTree = "<absolute>";
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {1053, 891}}";
+ sepNavSelRange = "{146, 0}";
+ sepNavVisRange = "{0, 2698}";
+ sepNavWindowFrame = "{{51, 190}, {1112, 934}}";
+ };
+ };
3DD063F00EFF746B007655AD /* GC ObjC JSCocoa */ = {
isa = PBXExecutable;
activeArgIndices = (
@@ -211,17 +336,17 @@
};
3DD0642B0EFF74D2007655AD /* ApplicationController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1065, 935}}";
- sepNavSelRange = "{614, 0}";
- sepNavVisRange = "{0, 1647}";
+ sepNavIntBoundsRect = "{{0, 0}, {1065, 957}}";
+ sepNavSelRange = "{802, 0}";
+ sepNavVisRange = "{195, 1810}";
sepNavWindowFrame = "{{878, 144}, {1124, 804}}";
};
};
3DD0644B0EFF75C7007655AD /* main.js */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1065, 691}}";
- sepNavSelRange = "{132, 0}";
- sepNavVisRange = "{0, 214}";
+ sepNavSelRange = "{61, 0}";
+ sepNavVisRange = "{0, 216}";
sepNavWindowFrame = "{{654, 70}, {1124, 804}}";
};
};
View
2 GC ObjC JSCocoa/main.js
@@ -1,6 +1,6 @@
- log('>>Collector=' + NSGarbageCollector.defaultCollector)
+ log('>>Collector=' + NSGarbageCollector.defaultCollector())
log('>>ActiveApp=' + NSWorkspace.sharedWorkspace().activeApplication())
// NSGarbageCollector.defaultCollector.collectExhaustively
View
2 JSCocoa/JSCocoaController.h
@@ -90,7 +90,7 @@ typedef struct JSValueRefAndContextRef JSValueRefAndContextRef;
+ (BOOL)addInstanceMethod:(NSString*)methodName class:(Class)class jsFunction:(JSValueRefAndContextRef)valueAndContext encoding:(char*)encoding;
// Tests
-- (BOOL)runTests:(NSString*)path;
+- (int)runTests:(NSString*)path;
//
// Autorelease pool
View
83 JSCocoa/JSCocoaController.m
@@ -25,7 +25,7 @@
static void jsCocoaObject_getPropertyNames(JSContextRef, JSObjectRef, JSPropertyNameAccumulatorRef);
static JSObjectRef jsCocoaObject_callAsConstructor(JSContextRef, JSObjectRef, size_t, const JSValueRef [], JSValueRef*);
static JSValueRef jsCocoaObject_convertToType(JSContextRef ctx, JSObjectRef object, JSType type, JSValueRef* exception);
-static JSValueRef _jsCocoaObject_callUsingNSInvocation(JSContextRef ctx, id callee, NSString *methodName, size_t argumentCount, JSValueRef arguments[]);
+//static JSValueRef _jsCocoaObject_callUsingNSInvocation(JSContextRef ctx, id callee, NSString *methodName, size_t argumentCount, JSValueRef arguments[]);
// valueOf() is called by Javascript on objects, eg someObject + ' someString'
static JSValueRef valueOfCallback(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception);
@@ -135,7 +135,6 @@ - (id)init
if (!OSXObjectClass)
OSXObjectClass = JSClassCreate(&OSXObjectDefinition);
-
//
// Private object, used for holding references to objects, classes, function names, structs
//
@@ -198,9 +197,9 @@ - (void)cleanUp
controllerCount--;
if (controllerCount == 0)
{
- JSClassRelease(OSXObjectClass);
- JSClassRelease(jsCocoaObjectClass);
- JSClassRelease(hashObjectClass);
+ if (OSXObjectClass) JSClassRelease(OSXObjectClass);
+ if (jsCocoaObjectClass) JSClassRelease(jsCocoaObjectClass);
+ if (hashObjectClass) JSClassRelease(hashObjectClass);
[sharedInstanceStats release];
[closureHash release];
@@ -1210,15 +1209,15 @@ - (BOOL)isFunctionVariadic:(id)functionName
+ (JSObjectRef)boxedJSObject:(id)o inContext:(JSContextRef)ctx
{
- id key = [NSString stringWithFormat:@"%x", o];
+/* id key = [NSString stringWithFormat:@"%x", o];
id value = [boxedObjects valueForKey:key];
// If object is boxed, up its usage count and return it
if (value)
{
// NSLog(@"upusage %@ (rc=%d) %d", o, [o retainCount], [value usageCount]);
return [value jsObject];
}
-
+*/
//
// Create a new ObjC box around the JSValueRef boxing the JSObject
// , so we need to box
@@ -1237,7 +1236,10 @@ + (JSObjectRef)boxedJSObject:(id)o inContext:(JSContextRef)ctx
JSCocoaPrivateObject* private = JSObjectGetPrivate(jsObject);
private.type = @"@";
[private setObject:o];
-
+JSValueProtect(ctx, jsObject);
+return jsObject;
+
+/*
// Box the JSObjectRef in our ObjC object
value = [[BoxedJSObject alloc] init];
[value setJSObject:jsObject];
@@ -1246,6 +1248,7 @@ + (JSObjectRef)boxedJSObject:(id)o inContext:(JSContextRef)ctx
[boxedObjects setValue:value forKey:key];
[value release];
return jsObject;
+*/
}
@@ -1263,6 +1266,7 @@ + (void)downBoxedJSObjectCount:(id)o
// if (count == 0)
{
// NSLog(@"CLEAN %@ (%@ rc=%d)", o, value, [value retainCount]);
+NSLog(@"cleaned remove");
[boxedObjects removeObjectForKey:key];
// NSLog(@"CLEANED ? %x", [boxedObjects valueForKey:key]);
}
@@ -1374,7 +1378,7 @@ - (void) callDelegateForException:(JSValueRef)exception {
#pragma mark Tests
-- (BOOL)runTests:(NSString*)path
+- (int)runTests:(NSString*)path
{
#if defined(TARGET_OS_IPHONE)
#elif defined(TARGET_IPHONE_SIMULATOR)
@@ -1384,8 +1388,9 @@ - (BOOL)runTests:(NSString*)path
files = [files filteredArrayUsingPredicate:predicate];
// NSLog(@"files=%@", files);
- if ([files count] == 0) return [JSCocoaController logAndSay:@"no test files found"], NO;
+ if ([files count] == 0) return [JSCocoaController logAndSay:@"no test files found"], 0;
+ int count = 0;
for (id file in files)
{
id filePath = [NSString stringWithFormat:@"%@/%@", path, file];
@@ -1398,10 +1403,11 @@ - (BOOL)runTests:(NSString*)path
[JSCocoaController logAndSay:error];
return NO;
}
+ count ++;
[self garbageCollect];
}
#endif
- return YES;
+ return count;
}
#pragma mark Autorelease pool
@@ -2012,13 +2018,33 @@ static void jsCocoaObject_finalize(JSObjectRef object)
// if dealloc is overloaded, releasing now will trigger JS code and fail
// As we're being called by GC, KJS might assert() in operationInProgress == NoOperation
id private = JSObjectGetPrivate(object);
+
+ //
+ // If a boxed object is being destroyed, remove it from the cache
+ //
+/*
+ id boxedObject = [private object];
+ if (boxedObject)
+ {
+// NSLog(@"++++++++++++++++++++++++++++++++++++++++++++++++++++");
+// NSLog(@"%@", boxedObjects);
+ id key = [NSString stringWithFormat:@"%x", boxedObject];
+ NSLog(@"existing boxed object=%x forKey %@", [boxedObjects objectForKey:key], key);
+// NSLog(@"----------------------------------------------------");
+ [boxedObjects removeObjectForKey:key];
+ NSLog(@"REMOVED %@", [boxedObjects objectForKey:key]);
+// NSLog(@"%@", boxedObjects);
+// NSLog(@"****************************************************");
+ }
+*/
// NSLog(@"FINALIZING JSOBJECTREF %x holding %@", object, private);
// Immediate release if dealloc is not overloaded
[private release];
#ifdef __OBJC_GC__
// Mark internal object as collectable
[[NSGarbageCollector defaultCollector] enableCollectorForPointer:private];
#endif
+
}
@@ -3197,26 +3223,31 @@ static void throwException(JSContextRef ctx, JSValueRef* exception, NSString* re
if (isSpeaking) system([[NSString stringWithFormat:@"say \"%@\" &", reason] UTF8String]);
}
+ // Convert exception to string
+ JSStringRef jsName = JSStringCreateWithUTF8CString([reason UTF8String]);
+ JSValueRef jsString = JSValueMakeString(ctx, jsName);
+ JSStringRelease(jsName);
+
+
// Gather call stack
+ JSValueRef callStackException = NULL;
JSStringRef scriptJS = JSStringCreateWithUTF8CString("return dumpCallStack()");
JSObjectRef fn = JSObjectMakeFunction(ctx, NULL, 0, NULL, scriptJS, NULL, 0, NULL);
- JSValueRef result = JSObjectCallAsFunction(ctx, fn, NULL, 0, NULL, NULL);
+ JSValueRef result = JSObjectCallAsFunction(ctx, fn, NULL, 0, NULL, &callStackException);
JSStringRelease(scriptJS);
+ if (!callStackException)
+ {
+ // Convert call stack to string
+ JSStringRef resultStringJS = JSValueToStringCopy(ctx, result, NULL);
+ NSString* callStack = (NSString*)JSStringCopyCFString(kCFAllocatorDefault, resultStringJS);
+ JSStringRelease(resultStringJS);
+ [NSMakeCollectable(callStack) autorelease];
+
+ // Append call stack to exception
+ if ([callStack length])
+ reason = [NSString stringWithFormat:@"%@\n%@", reason, callStack];
+ }
- // Convert call stack to string
- JSStringRef resultStringJS = JSValueToStringCopy(ctx, result, NULL);
- NSString* callStack = (NSString*)JSStringCopyCFString(kCFAllocatorDefault, resultStringJS);
- JSStringRelease(resultStringJS);
- [NSMakeCollectable(callStack) autorelease];
-
- // Append call stack to exception
- if ([callStack length])
- reason = [NSString stringWithFormat:@"%@\n%@", reason, callStack];
- JSStringRef jsName = JSStringCreateWithUTF8CString([reason UTF8String]);
- JSValueRef jsString = JSValueMakeString(ctx, jsName);
- JSStringRelease(jsName);
-
-// *exception = jsString;
// Convert to object to allow JavascriptCore to add line and sourceURL
*exception = JSValueToObject(ctx, jsString, NULL);
}
View
89 JSCocoa/class.js
@@ -7,12 +7,12 @@
// var jsc = JSCocoaController.hasSharedController ? JSCocoaController.sharedController : null
var jsc = __jsc__
- /*
-
- Pretty print of ObjC type encodings
- http://developer.apple.com/documentation/Cocoa/Conceptual/ObjectiveC/Articles/chapter_13_section_9.html#//apple_ref/doc/uid/TP30001163-CH9-113054
-
- */
+ //
+ //
+ // Pretty print of ObjC type encodings
+ // http://developer.apple.com/documentation/Cocoa/Conceptual/ObjectiveC/Articles/chapter_13_section_9.html#//apple_ref/doc/uid/TP30001163-CH9-113054
+ //
+ //
var encodings = {
@@ -66,10 +66,22 @@
{
// Pointer to an ObjC object ?
var match = encoding.match(/^(\w+)\s*\*$/)
+ log('encoding=' + encoding + ' match=' + match + '!')
if (match)
{
var className = match[1]
- if (className in this && this[className]['class'] == this[className]) return '@'
+ log('CLASSNAME=' + className + 'inThis=' + (className in this) + '!!className=' + this[className]['class'] + '!')
+
+ //
+ // this[className]['class'] == this[className]
+ // can only work if each object is boxed only once :
+ // both expressions will return the same object, comparing one object to itself
+ // -> true
+ //
+ // BUT if both expressions each use their own box, comparison will come negative
+ //
+ // ##########
+ if (className in this && String(this[className]['class']) == String(this[className])) return '@'
}
// Structure ?
var structureEncoding = JSCocoaFFIArgument.structureFullTypeEncodingFromStructureName(encoding)
@@ -94,33 +106,33 @@
- /*
-
- Define a class deriving from an ObjC class
-
- defineClass('ChildClass < ParentClass',
- ,'overloadedMethod:' :
- function (sel)
- {
- var r = this.Super(arguments)
- testClassOverload = true
- return r
- }
- ,'newMethod:' :
- ['id', 'id', function (o) // encoding + function
- {
- testAdd = true
- return o
- }]
- ,'myOutlet' : 'IBOutlet'
- ,'myAction' : ['IBAction',
- function (sender)
- {
- }]
-
- })
-
- */
+ //
+ //
+ // Define a class deriving from an ObjC class
+ //
+ // defineClass('ChildClass < ParentClass',
+ // ,'overloadedMethod:' :
+ // function (sel)
+ // {
+ // var r = this.Super(arguments)
+ // testClassOverload = true
+ // return r
+ // }
+ // ,'newMethod:' :
+ // ['id', 'id', function (o) // encoding + function
+ // {
+ // testAdd = true
+ // return o
+ // }]
+ // ,'myOutlet' : 'IBOutlet'
+ // ,'myAction' : ['IBAction',
+ // function (sender)
+ // {
+ // }]
+ //
+ // })
+ //
+ //
function defineClass(inherit, methods)
{
@@ -318,13 +330,6 @@
//
for (var method in h.methods)
{
-/*
- if (h.methods[method].type == 'class method')
- {
- log('skipping class method ' + method)
- continue
- }
-*/
// log('method.type=' + h.methods[method].type + ' ' + method)
var isInstanceMethod = parentClass.instancesRespondToSelector(method)
var isOverload = parentClass.respondsToSelector(method) || isInstanceMethod
@@ -651,7 +656,7 @@
if (typeof r != 'function') return r
// Arguments are function arguments minus the first one (stringName)
- var args = []; for (var i=1; i<arguments.length; i++) /*log(i + '=' + arguments[i]),*/ args.push(arguments[i])
+ var args = []; for (var i=1; i<arguments.length; i++) args.push(arguments[i])
return r.apply(null, args)
}
function registerLocalizedStrings(strings)
View
71 Multiple JSCocoa instances/Multiple JSCocoa instances.xcodeproj/mini.mode2v3
@@ -216,10 +216,10 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3DB172620F291900005DEA52</string>
+ <string>3D688E860F729DCA0026CECE</string>
<key>history</key>
<array>
- <string>3DB172440F2917DC005DEA52</string>
+ <string>3DB172620F291900005DEA52</string>
</array>
</dict>
<key>SplitCount</key>
@@ -256,10 +256,10 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3DB172630F291900005DEA52</string>
+ <string>3D688E870F729DCA0026CECE</string>
<key>history</key>
<array>
- <string>3DB172540F29187B005DEA52</string>
+ <string>3DB172630F291900005DEA52</string>
</array>
</dict>
<key>SplitCount</key>
@@ -296,10 +296,10 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3DB172640F291900005DEA52</string>
+ <string>3D688E880F729DCA0026CECE</string>
<key>history</key>
<array>
- <string>3DB172420F2917DC005DEA52</string>
+ <string>3DB172640F291900005DEA52</string>
</array>
</dict>
<key>SplitCount</key>
@@ -336,10 +336,10 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3DB172650F291900005DEA52</string>
+ <string>3D688E890F729DCA0026CECE</string>
<key>history</key>
<array>
- <string>3DB172200F2916FB005DEA52</string>
+ <string>3DB172650F291900005DEA52</string>
</array>
</dict>
<key>SplitCount</key>
@@ -376,10 +376,10 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3DB172660F291900005DEA52</string>
+ <string>3D688E8A0F729DCA0026CECE</string>
<key>history</key>
<array>
- <string>3DB171C80F291512005DEA52</string>
+ <string>3DB172660F291900005DEA52</string>
</array>
</dict>
<key>SplitCount</key>
@@ -416,10 +416,10 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3DB172670F291900005DEA52</string>
+ <string>3D688E8B0F729DCA0026CECE</string>
<key>history</key>
<array>
- <string>3DB171650F290786005DEA52</string>
+ <string>3DB172670F291900005DEA52</string>
</array>
</dict>
<key>SplitCount</key>
@@ -519,7 +519,7 @@
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 193}, {333, 334}}</string>
+ <string>{{0, 145}, {333, 334}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -542,7 +542,7 @@
<real>43</real>
</array>
<key>RubberWindowFrame</key>
- <string>1226 758 350 420 0 0 1920 1178 </string>
+ <string>1265 758 350 420 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -681,8 +681,8 @@
</array>
<key>TableOfContents</key>
<array>
- <string>3DB171550F290754005DEA52</string>
- <string>3DB171560F290754005DEA52</string>
+ <string>3D688E760F729D7B0026CECE</string>
+ <string>3D688E770F729D7B0026CECE</string>
<string>1C9437FD063B20B00039CFAC</string>
<string>1C9437FE063B20B00039CFAC</string>
<string>1C9437FF063B20B00039CFAC</string>
@@ -715,20 +715,19 @@
<integer>0</integer>
<key>WindowOrderList</key>
<array>
- <string>1C530D57069F1CE1000CFCEE</string>
+ <string>1C530D5B069F1CE1000CFCEE</string>
<string>1C530D52069F1CE1000CFCEE</string>
<string>1C530D54069F1CE1000CFCEE</string>
<string>3DB064F00F28CE4C0043C238</string>
<string>3DB171920F291212005DEA52</string>
<string>3DB172120F2916A5005DEA52</string>
<string>3D3B521A0F1BA07000D60188</string>
<string>3DB1720F0F2916A5005DEA52</string>
- <string>1C530D5B069F1CE1000CFCEE</string>
<string>3DB065170F28CEFF0043C238</string>
<string>/Users/mini/Software Inexdo/JSCocoa/Multiple JSCocoa instances/Multiple JSCocoa instances.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>1226 758 350 420 0 0 1920 1178 </string>
+ <string>1265 758 350 420 0 0 1920 1178 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -886,7 +885,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string>JSCocoaController.m</string>
+ <string></string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -903,8 +902,6 @@
<string>459pt</string>
</dict>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -944,7 +941,7 @@
<key>TableOfContents</key>
<array>
<string>1C530D52069F1CE1000CFCEE</string>
- <string>3DB1715A0F290754005DEA52</string>
+ <string>3D688E7E0F729D7B0026CECE</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -986,8 +983,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {615, 338}}</string>
- <string>{{615, 0}, {666, 338}}</string>
+ <string>{{0, 0}, {615, 355}}</string>
+ <string>{{615, 0}, {666, 355}}</string>
</array>
</dict>
<key>VerticalSplitView</key>
@@ -1002,8 +999,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {1281, 338}}</string>
- <string>{{0, 338}, {1281, 359}}</string>
+ <string>{{0, 0}, {1281, 355}}</string>
+ <string>{{0, 355}, {1281, 342}}</string>
</array>
</dict>
</dict>
@@ -1036,7 +1033,7 @@
<real>436</real>
</array>
<key>Frame</key>
- <string>{{615, 0}, {666, 338}}</string>
+ <string>{{615, 0}, {666, 355}}</string>
<key>RubberWindowFrame</key>
<string>349 279 1281 738 0 0 1920 1178 </string>
</dict>
@@ -1064,13 +1061,13 @@
<key>TableOfContents</key>
<array>
<string>1C530D54069F1CE1000CFCEE</string>
- <string>3DB1715B0F290754005DEA52</string>
+ <string>3D688E7F0F729D7B0026CECE</string>
<string>1C162984064C10D400B95A72</string>
- <string>3DB1715C0F290754005DEA52</string>
- <string>3DB1715D0F290754005DEA52</string>
- <string>3DB1715E0F290754005DEA52</string>
- <string>3DB1715F0F290754005DEA52</string>
- <string>3DB171600F290754005DEA52</string>
+ <string>3D688E800F729D7B0026CECE</string>
+ <string>3D688E810F729D7B0026CECE</string>
+ <string>3D688E820F729D7B0026CECE</string>
+ <string>3D688E830F729D7B0026CECE</string>
+ <string>3D688E840F729D7B0026CECE</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@@ -1189,8 +1186,6 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -1226,7 +1221,7 @@
<key>TableOfContents</key>
<array>
<string>1C530D5B069F1CE1000CFCEE</string>
- <string>3DB171610F290754005DEA52</string>
+ <string>3D688E850F729D7B0026CECE</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
@@ -1236,7 +1231,7 @@
<key>WindowToolGUID</key>
<string>1C530D5B069F1CE1000CFCEE</string>
<key>WindowToolIsVisible</key>
- <true/>
+ <false/>
</dict>
<dict>
<key>Identifier</key>
View
142 Multiple JSCocoa instances/Multiple JSCocoa instances.xcodeproj/mini.pbxuser
@@ -14,16 +14,16 @@
3D3B4FF80F1A2D0900D60188 /* Multiple JSCocoa instances */,
);
perUserDictionary = {
- PBXPerProjectTemplateStateSaveDate = 254347087;
- PBXWorkspaceStateSaveDate = 254347087;
+ PBXPerProjectTemplateStateSaveDate = 259169642;
+ PBXWorkspaceStateSaveDate = 259169642;
};
perUserProjectItems = {
- 3DB171650F290786005DEA52 /* PBXTextBookmark */ = 3DB171650F290786005DEA52 /* PBXTextBookmark */;
- 3DB171C80F291512005DEA52 /* PBXTextBookmark */ = 3DB171C80F291512005DEA52 /* PBXTextBookmark */;
- 3DB172200F2916FB005DEA52 /* PBXTextBookmark */ = 3DB172200F2916FB005DEA52 /* PBXTextBookmark */;
- 3DB172420F2917DC005DEA52 /* PBXTextBookmark */ = 3DB172420F2917DC005DEA52 /* PBXTextBookmark */;
- 3DB172440F2917DC005DEA52 /* PBXTextBookmark */ = 3DB172440F2917DC005DEA52 /* PBXTextBookmark */;
- 3DB172540F29187B005DEA52 /* PBXTextBookmark */ = 3DB172540F29187B005DEA52 /* PBXTextBookmark */;
+ 3D688E860F729DCA0026CECE /* PBXTextBookmark */ = 3D688E860F729DCA0026CECE /* PBXTextBookmark */;
+ 3D688E870F729DCA0026CECE /* PBXTextBookmark */ = 3D688E870F729DCA0026CECE /* PBXTextBookmark */;
+ 3D688E880F729DCA0026CECE /* PBXTextBookmark */ = 3D688E880F729DCA0026CECE /* PBXTextBookmark */;
+ 3D688E890F729DCA0026CECE /* PBXTextBookmark */ = 3D688E890F729DCA0026CECE /* PBXTextBookmark */;
+ 3D688E8A0F729DCA0026CECE /* PBXTextBookmark */ = 3D688E8A0F729DCA0026CECE /* PBXTextBookmark */;
+ 3D688E8B0F729DCA0026CECE /* PBXTextBookmark */ = 3D688E8B0F729DCA0026CECE /* PBXTextBookmark */;
3DB172620F291900005DEA52 /* PBXTextBookmark */ = 3DB172620F291900005DEA52 /* PBXTextBookmark */;
3DB172630F291900005DEA52 /* PBXTextBookmark */ = 3DB172630F291900005DEA52 /* PBXTextBookmark */;
3DB172640F291900005DEA52 /* PBXTextBookmark */ = 3DB172640F291900005DEA52 /* PBXTextBookmark */;
@@ -107,17 +107,17 @@
};
3D3B50310F1A366900D60188 /* JSCocoaController.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1048, 1562}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1048, 3003}}";
sepNavSelRange = "{2929, 0}";
- sepNavVisRange = "{1824, 1957}";
+ sepNavVisRange = "{1907, 1868}";
sepNavWindowFrame = "{{675, 276}, {1107, 795}}";
};
};
3D3B50320F1A366900D60188 /* JSCocoaController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1081, 30162}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1081, 37323}}";
sepNavSelRange = "{7089, 0}";
- sepNavVisRange = "{6068, 1457}";
+ sepNavVisRange = "{6439, 1107}";
sepNavWindowFrame = "{{466, 42}, {1140, 804}}";
};
};
@@ -158,89 +158,89 @@
sepNavWindowFrame = "{{563, 78}, {1107, 795}}";
};
};
- 3DB064E60F28CE360043C238 /* ApplicationController.h */ = {
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1009, 777}}";
- sepNavSelRange = "{225, 0}";
- sepNavVisRange = "{0, 282}";
- sepNavWindowFrame = "{{130, 178}, {1068, 890}}";
- };
- };
- 3DB064E70F28CE360043C238 /* ApplicationController.m */ = {
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1009, 777}}";
- sepNavSelRange = "{506, 0}";
- sepNavVisRange = "{0, 514}";
- sepNavWindowFrame = "{{474, 90}, {1068, 890}}";
- };
- };
- 3DB065140F28CEF10043C238 /* classCode.js */ = {
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1009, 777}}";
- sepNavSelRange = "{49, 0}";
- sepNavVisRange = "{0, 305}";
- sepNavWindowFrame = "{{146, 110}, {1068, 890}}";
- };
- };
- 3DB171650F290786005DEA52 /* PBXTextBookmark */ = {
+ 3D688E860F729DCA0026CECE /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 3DB064E70F28CE360043C238 /* ApplicationController.m */;
- name = "ApplicationController.m: 23";
+ fRef = 3DB065140F28CEF10043C238 /* classCode.js */;
+ name = "classCode.js: 8";
rLen = 0;
- rLoc = 449;
+ rLoc = 49;
rType = 0;
- vrLen = 562;
+ vrLen = 305;
vrLoc = 0;
};
- 3DB171C80F291512005DEA52 /* PBXTextBookmark */ = {
+ 3D688E870F729DCA0026CECE /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 2A37F4ACFDCFA73011CA2CEA /* MyDocument.m */;
- name = "MyDocument.m: 64";
+ fRef = 3D3B50320F1A366900D60188 /* JSCocoaController.m */;
+ name = "JSCocoaController.m: 207";
rLen = 0;
- rLoc = 1858;
+ rLoc = 7089;
rType = 0;
- vrLen = 2073;
- vrLoc = 470;
+ vrLen = 1107;
+ vrLoc = 6439;
};
- 3DB172200F2916FB005DEA52 /* PBXTextBookmark */ = {
+ 3D688E880F729DCA0026CECE /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 3D3B50310F1A366900D60188 /* JSCocoaController.h */;
- name = "JSCocoaController.h: 45";
+ fRef = 3D3B52130F1BA03400D60188 /* documentCode.js */;
+ name = "documentCode.js: 26";
rLen = 0;
- rLoc = 740;
+ rLoc = 638;
rType = 0;
- vrLen = 1654;
- vrLoc = 428;
+ vrLen = 740;
+ vrLoc = 0;
};
- 3DB172420F2917DC005DEA52 /* PBXTextBookmark */ = {
+ 3D688E890F729DCA0026CECE /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 3D3B52130F1BA03400D60188 /* documentCode.js */;
- name = "documentCode.js: 20";
+ fRef = 3D3B50310F1A366900D60188 /* JSCocoaController.h */;
+ name = "JSCocoaController.h: 99";
rLen = 0;
- rLoc = 551;
+ rLoc = 2929;
rType = 0;
- vrLen = 723;
- vrLoc = 0;
+ vrLen = 1868;
+ vrLoc = 1907;
};
- 3DB172440F2917DC005DEA52 /* PBXTextBookmark */ = {
+ 3D688E8A0F729DCA0026CECE /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 3DB065140F28CEF10043C238 /* classCode.js */;
- name = "classCode.js: 12";
+ fRef = 2A37F4ACFDCFA73011CA2CEA /* MyDocument.m */;
+ name = "MyDocument.m: 55";
rLen = 0;
- rLoc = 235;
+ rLoc = 1281;
rType = 0;
- vrLen = 283;
- vrLoc = 0;
+ vrLen = 2040;
+ vrLoc = 517;
};
- 3DB172540F29187B005DEA52 /* PBXTextBookmark */ = {
+ 3D688E8B0F729DCA0026CECE /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 3D3B50320F1A366900D60188 /* JSCocoaController.m */;
- name = "JSCocoaController.m: 88";
+ fRef = 3DB064E70F28CE360043C238 /* ApplicationController.m */;
+ name = "ApplicationController.m: 24";
rLen = 0;
- rLoc = 3391;
+ rLoc = 506;
rType = 0;
- vrLen = 1867;
- vrLoc = 1958;
+ vrLen = 514;
+ vrLoc = 0;
+ };
+ 3DB064E60F28CE360043C238 /* ApplicationController.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {1009, 777}}";
+ sepNavSelRange = "{225, 0}";
+ sepNavVisRange = "{0, 282}";
+ sepNavWindowFrame = "{{130, 178}, {1068, 890}}";
+ };
+ };
+ 3DB064E70F28CE360043C238 /* ApplicationController.m */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {1009, 777}}";
+ sepNavSelRange = "{506, 0}";
+ sepNavVisRange = "{0, 514}";
+ sepNavWindowFrame = "{{474, 90}, {1068, 890}}";
+ };
+ };
+ 3DB065140F28CEF10043C238 /* classCode.js */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {1009, 777}}";
+ sepNavSelRange = "{49, 0}";
+ sepNavVisRange = "{0, 305}";
+ sepNavWindowFrame = "{{146, 110}, {1068, 890}}";
+ };
};
3DB172620F291900005DEA52 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
View
0 Tests/11 retain test 2.js → Tests/! stock/11 retain test 2.js
File renamed without changes.
View
2 Tests/12 instance variables.js → Tests/! stock/12 instance variables.js
@@ -6,7 +6,6 @@
check get / set, hash count
*/
-
var count0 = JSCocoaController.JSCocoaHashCount
// Count of instances hosting a js hash
@@ -16,7 +15,6 @@
// Allocate a class, set instance variables on it
//
var newClass = JSCocoaController.createClass_parentClass("InstanceVariableTester", "NSObject")
-
var container = InstanceVariableTester.alloc.init
// JSCocoaController.logInstanceStats
View
0 Tests/15 IBOutlet IBAction.js → Tests/! stock/15 IBOutlet IBAction.js
File renamed without changes.
View
0 Tests/30 obj1 == obj2.js → Tests/! stock/30 obj1 == obj2.js
File renamed without changes.
View
0 Tests/32 new class syntax.js → Tests/! stock/32 new class syntax.js
File renamed without changes.
View
3 Tests/0 blank.js
@@ -1,3 +1,2 @@
- // blank
-// log('hello from blank')
+ // blank : used by TestsRunner to test the evalJSFile delegate method
View
3 Tests/14 class.js
@@ -4,9 +4,6 @@
// JSCocoaController.sharedController.evalJSFile(NSBundle.mainBundle.bundlePath + '/Contents/Resources/class.js')
-
-
-
var testInstanceOverload = false
var testClassOverload = false
var testAdd = false
View
28 TestsRunner/ApplicationController.m
@@ -22,7 +22,8 @@ - (void)applicationDidFinishLaunching:(id)notif
BOOL runningFromSystemLibrary = [[NSString stringWithUTF8String:info.dli_fname] hasPrefix:@"/System"];
if (!runningFromSystemLibrary) NSLog(@"***Running a nightly JavascriptCore***");
-
+ if ([NSGarbageCollector defaultCollector]) NSLog(@"***Running with ObjC Garbage Collection***");
+//[[NSGarbageCollector defaultCollector] disable];
// NSLog(@"DEALLOC AUTORELEASEPOOL");
// [JSCocoaController deallocAutoreleasePool];
@@ -80,8 +81,13 @@ - (void)applicationWillTerminate:(id)notif
{
[jsc unlinkAllReferences];
[jsc garbageCollect];
- NSLog(@"willTerminate %@ %d", jsc, [jsc retainCount]);
+ NSLog(@"willTerminate %@ JSCocoa retainCount=%d", jsc, [jsc retainCount]);
+ if ([jsc retainCount] != 1) NSLog(@"***Invalid JSCocoa retainCount***");
[jsc release];
+
+ id path = [NSString stringWithFormat:@"%@/Contents/Resources/Tests/! stock", [[NSBundle mainBundle] bundlePath]];
+ id files = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil];
+ if ([files count]) NSLog(@"***warning, skipping tests***"), NSLog(@"%@", files);
}
@@ -97,11 +103,23 @@ - (IBAction)runJSTests:(id)sender
id path = [[NSBundle mainBundle] bundlePath];
path = [NSString stringWithFormat:@"%@/Contents/Resources/Tests", path];
// NSLog(@"Run %d from %@", runCount, path);
- BOOL b = [jsc runTests:path];
+ int count = [jsc runTests:path];
+ BOOL b = !!count;
[self garbageCollect:nil];
// Test delegate
- id error = [self testDelegate];
+ id error = nil;
+ error = [self testDelegate];
+/*
+// [jsc evalJSString:@"var applicationController = NSApplication.sharedApplication.delegate"];
+//[[NSGarbageCollector defaultCollector] collectExhaustively];
+JSValueRef res;
+ res = [jsc evalJSString:@"NSApplication.sharedApplication"];
+ NSLog(@"res=%@", [jsc unboxJSValueRef:res]);
+ [self garbageCollect:nil];
+ res = [jsc evalJSString:@"NSApplication.sharedApplication"];
+ NSLog(@"res=%@", [jsc unboxJSValueRef:res]);
+*/
if (error)
{
b = NO;
@@ -110,7 +128,7 @@ - (IBAction)runJSTests:(id)sender
jsc.delegate = nil;
if (!b) { NSLog(@"!!!!!!!!!!!FAIL %d from %@", runCount, path); return; }
- else NSLog(@"All tests ran OK !");
+ else NSLog(@"All %d tests ran OK !", count);
}
//
View
241 TestsRunner/TestsRunner.xcodeproj/mini.mode2v3
@@ -202,24 +202,64 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>3DFB90BD0F72985500E81BBC</string>
+ <string>3D3910B20F73ADD1000EED3B</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>class.js</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3D3910B30F73ADD1000EED3B</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>class.js</string>
+ <key>_historyCapacity</key>
+ <integer>0</integer>
+ <key>bookmark</key>
+ <string>3D3910C90F73B144000EED3B</string>
+ <key>history</key>
+ <array>
+ <string>3D3910B10F73AD5D000EED3B</string>
+ </array>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>Geometry</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 20}, {1068, 793}}</string>
+ <key>PBXModuleWindowStatusBarHidden2</key>
+ <false/>
+ <key>RubberWindowFrame</key>
+ <string>286 163 1068 834 0 0 1920 1178 </string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Content</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3D19BA070F72E60A00138111</string>
<key>PBXProjectModuleLabel</key>
<string>JSCocoaController.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>3DFB90BE0F72985500E81BBC</string>
+ <string>3D19BA080F72E60A00138111</string>
<key>PBXProjectModuleLabel</key>
<string>JSCocoaController.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3DFB90C10F72985E00E81BBC</string>
+ <string>3D3910CA0F73B144000EED3B</string>
<key>history</key>
<array>
- <string>3DFB90BB0F72982500E81BBC</string>
+ <string>3D39106F0F732FAF000EED3B</string>
</array>
</dict>
<key>SplitCount</key>
@@ -235,7 +275,87 @@
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
- <string>460 312 1312 827 0 0 1920 1178 </string>
+ <string>157 192 1312 827 0 0 1920 1178 </string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Content</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3D19B8F70F72D45000138111</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>ApplicationController.m</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3D19B8F80F72D45000138111</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>ApplicationController.m</string>
+ <key>_historyCapacity</key>
+ <integer>0</integer>
+ <key>bookmark</key>
+ <string>3D3910CB0F73B144000EED3B</string>
+ <key>history</key>
+ <array>
+ <string>3D266DE40F730EA400348265</string>
+ </array>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>Geometry</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 20}, {1325, 766}}</string>
+ <key>PBXModuleWindowStatusBarHidden2</key>
+ <false/>
+ <key>RubberWindowFrame</key>
+ <string>367 188 1325 807 0 0 1920 1178 </string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Content</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3D39103E0F73221F000EED3B</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>NSApplication.h</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>3D39103F0F73221F000EED3B</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>NSApplication.h</string>
+ <key>_historyCapacity</key>
+ <integer>0</integer>
+ <key>bookmark</key>
+ <string>3D3910CC0F73B144000EED3B</string>
+ <key>history</key>
+ <array>
+ <string>3D3910400F73221F000EED3B</string>
+ </array>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>Geometry</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 20}, {1112, 837}}</string>
+ <key>PBXModuleWindowStatusBarHidden2</key>
+ <false/>
+ <key>RubberWindowFrame</key>
+ <string>15 295 1112 878 0 0 1920 1178 </string>
</dict>
</dict>
</array>
@@ -316,7 +436,7 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>8</integer>
+ <integer>4</integer>
<integer>1</integer>
<integer>0</integer>
</array>
@@ -345,7 +465,7 @@
<real>43</real>
</array>
<key>RubberWindowFrame</key>
- <string>1577 758 350 420 0 0 1920 1178 </string>
+ <string>1572 758 350 420 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -485,8 +605,8 @@
</array>
<key>TableOfContents</key>
<array>
- <string>3DFB90170F72921100E81BBC</string>
- <string>3DFB90180F72921100E81BBC</string>
+ <string>3D390FEB0F730F18000EED3B</string>
+ <string>3D390FEC0F730F18000EED3B</string>
<string>1C9437FD063B20B00039CFAC</string>
<string>1C9437FE063B20B00039CFAC</string>
<string>1C9437FF063B20B00039CFAC</string>
@@ -519,17 +639,20 @@
<integer>0</integer>
<key>WindowOrderList</key>
<array>
- <string>3DFB90A70F72969100E81BBC</string>
- <string>3DFB90650F72947600E81BBC</string>
- <string>3DFB90660F72947600E81BBC</string>
+ <string>1C530D57069F1CE1000CFCEE</string>
+ <string>3D39101F0F730FAD000EED3B</string>
+ <string>3D3910200F730FAD000EED3B</string>
<string>1C530D52069F1CE1000CFCEE</string>
<string>1C530D54069F1CE1000CFCEE</string>
+ <string>3D39103E0F73221F000EED3B</string>
+ <string>3D19B8F70F72D45000138111</string>
+ <string>3D19BA070F72E60A00138111</string>
+ <string>3D3910B20F73ADD1000EED3B</string>
<string>/Users/mini/Software Inexdo/JSCocoa/TestsRunner/TestsRunner.xcodeproj</string>
- <string>3DFB90BD0F72985500E81BBC</string>
<string>1C530D5B069F1CE1000CFCEE</string>
</array>
<key>WindowString</key>
- <string>1577 758 350 420 0 0 1920 1178 </string>
+ <string>1572 758 350 420 0 0 1920 1178 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -743,7 +866,7 @@
<key>TableOfContents</key>
<array>
<string>1C530D52069F1CE1000CFCEE</string>
- <string>3DFB902A0F72927500E81BBC</string>
+ <string>3D390FEF0F730F18000EED3B</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -785,8 +908,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {503, 394}}</string>
- <string>{{503, 0}, {641, 394}}</string>
+ <string>{{0, 0}, {542, 424}}</string>
+ <string>{{542, 0}, {690, 424}}</string>
</array>
</dict>
<key>VerticalSplitView</key>
@@ -801,8 +924,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {1144, 394}}</string>
- <string>{{0, 394}, {1144, 345}}</string>
+ <string>{{0, 0}, {1232, 424}}</string>
+ <string>{{0, 424}, {1232, 371}}</string>
</array>
</dict>
</dict>
@@ -822,34 +945,34 @@
<key>DebugSTDIOWindowFrame</key>
<string>{{200, 200}, {500, 300}}</string>
<key>Frame</key>
- <string>{{0, 0}, {1144, 739}}</string>
+ <string>{{0, 0}, {1232, 795}}</string>
<key>PBXDebugSessionStackFrameViewKey</key>
<dict>
<key>DebugVariablesTableConfiguration</key>
<array>
<string>Name</string>
- <real>174</real>
+ <real>363</real>
<string>Value</string>
<real>85</real>
<string>Summary</string>
- <real>357</real>
+ <real>217</real>
</array>
<key>Frame</key>
- <string>{{503, 0}, {641, 394}}</string>
+ <string>{{542, 0}, {690, 424}}</string>
<key>RubberWindowFrame</key>
- <string>377 305 1144 780 0 0 1920 1178 </string>
+ <string>299 342 1232 836 0 0 1920 1178 </string>
</dict>
<key>RubberWindowFrame</key>
- <string>377 305 1144 780 0 0 1920 1178 </string>
+ <string>299 342 1232 836 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXDebugSessionModule</string>
<key>Proportion</key>
- <string>739pt</string>
+ <string>795pt</string>
</dict>
</array>
<key>Proportion</key>
- <string>739pt</string>
+ <string>795pt</string>
</dict>
</array>
<key>Name</key>
@@ -863,18 +986,18 @@
<key>TableOfContents</key>
<array>
<string>1C530D54069F1CE1000CFCEE</string>
- <string>3DFB902B0F72927500E81BBC</string>
+ <string>3D390FF00F730F18000EED3B</string>
<string>1C162984064C10D400B95A72</string>
- <string>3DFB902C0F72927500E81BBC</string>
- <string>3DFB902D0F72927500E81BBC</string>
- <string>3DFB902E0F72927500E81BBC</string>
- <string>3DFB902F0F72927500E81BBC</string>
- <string>3DFB90300F72927500E81BBC</string>
+ <string>3D390FF10F730F18000EED3B</string>
+ <string>3D390FF20F730F18000EED3B</string>
+ <string>3D390FF30F730F18000EED3B</string>
+ <string>3D390FF40F730F18000EED3B</string>
+ <string>3D390FF50F730F18000EED3B</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
<key>WindowString</key>
- <string>377 305 1144 780 0 0 1920 1178 </string>
+ <string>299 342 1232 836 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>1C530D54069F1CE1000CFCEE</string>
<key>WindowToolIsVisible</key>
@@ -896,23 +1019,21 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CDD528C0622207200134675</string>
<key>PBXProjectModuleLabel</key>
- <string>ApplicationController.m</string>
+ <string>class.js</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {968, 522}}</string>
+ <string>{{0, 0}, {968, 448}}</string>
<key>RubberWindowFrame</key>
- <string>278 102 968 1012 0 0 1920 1178 </string>
+ <string>553 80 968 1012 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -921,9 +1042,11 @@
</dict>
</array>
<key>Proportion</key>
- <string>522pt</string>
+ <string>448pt</string>
</dict>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -934,14 +1057,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 527}, {968, 444}}</string>
+ <string>{{0, 453}, {968, 518}}</string>
<key>RubberWindowFrame</key>
- <string>278 102 968 1012 0 0 1920 1178 </string>
+ <string>553 80 968 1012 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXProjectFindModule</string>
<key>Proportion</key>
- <string>444pt</string>
+ <string>518pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -959,13 +1082,13 @@
<key>TableOfContents</key>
<array>
<string>1C530D57069F1CE1000CFCEE</string>
- <string>3D75AED50F6EDDFC00E8C785</string>
- <string>3D75AED60F6EDDFC00E8C785</string>
+ <string>3D3910190F730FA9000EED3B</string>
+ <string>3D39101A0F730FA9000EED3B</string>
<string>1CDD528C0622207200134675</string>
<string>1CD0528E0623707200166675</string>
</array>
<key>WindowString</key>
- <string>278 102 968 1012 0 0 1920 1178 </string>
+ <string>553 80 968 1012 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>1C530D57069F1CE1000CFCEE</string>
<key>WindowToolIsVisible</key>
@@ -1000,18 +1123,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {1120, 502}}</string>
+ <string>{{0, 0}, {1120, 462}}</string>
<key>RubberWindowFrame</key>
- <string>803 160 1120 543 0 0 1920 1178 </string>
+ <string>803 200 1120 503 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXDebugCLIModule</string>
<key>Proportion</key>
- <string>502pt</string>
+ <string>462pt</string>
</dict>
</array>
<key>Proportion</key>
- <string>502pt</string>
+ <string>462pt</string>
</dict>
</array>
<key>Name</key>
@@ -1025,13 +1148,13 @@
<key>TableOfContents</key>
<array>
<string>1C530D5B069F1CE1000CFCEE</string>
- <string>3DFB90310F72927500E81BBC</string>
+ <string>3D390FF60F730F18000EED3B</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.consoleV3</string>
<key>WindowString</key>
- <string>803 160 1120 543 0 0 1920 1178 </string>
+ <string>803 200 1120 503 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>1C530D5B069F1CE1000CFCEE</string>
<key>WindowToolIsVisible</key>
@@ -1237,7 +1360,7 @@
<real>168</real>
</array>
<key>RubberWindowFrame</key>
- <string>76 189 744 409 0 0 1920 1178 </string>
+ <string>543 139 744 409 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -1259,7 +1382,7 @@
<key>Frame</key>
<string>{{190, 0}, {554, 368}}</string>
<key>RubberWindowFrame</key>
- <string>76 189 744 409 0 0 1920 1178 </string>
+ <string>543 139 744 409 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -1286,19 +1409,19 @@
<true/>
<key>TableOfContents</key>
<array>
- <string>3DFB90A70F72969100E81BBC</string>
- <string>3DFB90A80F72969100E81BBC</string>
+ <string>3DF317480F72C42A0087E26D</string>
+ <string>3DF317490F72C42A0087E26D</string>
<string>1CE0B1FE06471DED0097A5F4</string>
<string>1CA1AED706398EBD00589147</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.breakpointsV3</string>
<key>WindowString</key>
- <string>76 189 744 409 0 0 1920 1178 </string>
+ <string>543 139 744 409 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
- <string>3DFB90A70F72969100E81BBC</string>
+ <string>3DF317480F72C42A0087E26D</string>
<key>WindowToolIsVisible</key>
- <false/>
+ <true/>
</dict>
<dict>
<key>Identifier</key>
View
1,879 TestsRunner/TestsRunner.xcodeproj/mini.pbxuser
816 additions, 1,063 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
3 TestsRunner/TestsRunner.xcodeproj/project.pbxproj
@@ -303,6 +303,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_ENABLE_OBJC_GC = required;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -318,7 +319,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
- GCC_ENABLE_OBJC_GC = unsupported;
+ GCC_ENABLE_OBJC_GC = required;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
OTHER_LDFLAGS = "-lffi";

0 comments on commit b7c45aa

Please sign in to comment.
Something went wrong with that request. Please try again.