Fixed immutable queue enumerator bug.

mono · May 16, 2013 · 4f14901 · 4f14901
1 parent e4b889c
commit 4f14901
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/System.Collections.Immutable/System.Collections.Immutable/ImmutableQueue.cs b/System.Collections.Immutable/System.Collections.Immutable/ImmutableQueue.cs
@@ -149,7 +149,7 @@ bool IEnumerator.MoveNext()
                 if (frontStack == null)
                 {
                     frontStack = start.frontStack;
-                    backStack = start.backStack;
+                    backStack = Reverse (start.backStack);
                 }
                 else if (!frontStack.IsEmpty)
                 {
@@ -159,7 +159,7 @@ bool IEnumerator.MoveNext()
                 {
                     backStack = backStack.Pop();
                 }
-                return !(frontStack.IsEmpty || backStack.IsEmpty);
+                return !(frontStack.IsEmpty && backStack.IsEmpty);
             }
 
             void IEnumerator.Reset()

diff --git a/UnitTests/ImmutableQueueTests.cs b/UnitTests/ImmutableQueueTests.cs
@@ -26,6 +26,7 @@
 using System;
 using NUnit.Framework;
 using System.Collections.Immutable;
+using System.Linq;
 
 namespace UnitTests
 {
@@ -121,7 +122,7 @@ public void TestEnumerator()
                 s = s.Enqueue(i);
 
             i = 1;
-
+            Assert.AreEqual (99, s.Count ());
             foreach (int x in s)
             {
                 Assert.AreEqual(i, x, "#4");

diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
@@ -32,6 +32,7 @@
     <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
       <Private>False</Private>
     </Reference>
+    <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ImmutableStackTests.cs" />