[Issue newyankeecodeshop#11] Fixed internal state management for NSFastEnumeration implementation.

newyankeecodeshop · newyankeecodeshop · commit de752876a738 · 2013-01-10T18:43:12.000-05:00
diff --git a/Classes/GAScriptObject.m b/Classes/GAScriptObject.m
@@ -255,11 +255,8 @@ - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state
         // or until we've provided as many items as the stack based buffer will hold.
         while((enumState->state < propCount) && (count < len))
         {
-            // For this sample, we generate the contents on the fly.
-            // A real implementation would likely just be copying objects from internal storage.
-            enumState->itemsPtr[count] = [enumState->propNames objectAtIndex:count];
+            enumState->itemsPtr[count++] = [enumState->propNames objectAtIndex:enumState->state];
             enumState->state++;
-            count++;
         }
     }
     else
diff --git a/GAJavaScript.xcodeproj/project.pbxproj b/GAJavaScript.xcodeproj/project.pbxproj
@@ -282,7 +282,7 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "GAJavaScript" */;
 			compatibilityVersion = "Xcode 3.2";
diff --git a/Tests/TScriptObject.m b/Tests/TScriptObject.m
@@ -184,6 +184,19 @@ - (void)testFastEnumeration
 	}
 
 	GHAssertTrue(foundHostName, nil);
+	
+	// Test that the enumeration does not return duplicate property names. It was doing that for objects with
+	// more than 16 properties.
+	//
+	jsObject = [_engine scriptObjectWithReference:@"window"];
+	NSMutableArray *keyNames = [NSMutableArray array];
+	
+	for (id key in jsObject)
+	{
+		GHAssertFalse([keyNames containsObject:key], @"Enumeration is returning duplicates!");
+		
+		[keyNames addObject:key];
+	}
 }
 
 - (void)testCallFunction

Original file line number	Diff line number	Diff line change
`@@ -255,11 +255,8 @@ - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state`
`255`	`255`	`// or until we've provided as many items as the stack based buffer will hold.`
`256`	`256`	`while((enumState->state < propCount) && (count < len))`
`257`	`257`	`{`
`258`		`- // For this sample, we generate the contents on the fly.`
`259`		`- // A real implementation would likely just be copying objects from internal storage.`
`260`		`- enumState->itemsPtr[count] = [enumState->propNames objectAtIndex:count];`
	`258`	`+ enumState->itemsPtr[count++] = [enumState->propNames objectAtIndex:enumState->state];`
`261`	`259`	`enumState->state++;`
`262`		`- count++;`
`263`	`260`	`}`
`264`	`261`	`}`
`265`	`262`	`else`