Changeset 387 for trunk/Include/Classes/System/Collections/Generic/List.ab

Timestamp:

Nov 23, 2007, 1:44:49 PM (17 years ago)

Author:

dai

Message:

Listクラスの列挙子メソッドのバグを修正。

File:

• trunk/Include/Classes/System/Collections/Generic/List.ab (modified) (4 diffs)

trunk/Include/Classes/System/Collections/Generic/List.ab

@@ -18 +18 @@
     Sub List()
         items = GC_malloc( 1 )
+
+        ' 列挙子の位置を初期化
+        Reset()
     End Sub
     Sub ~List()
@@ -146 +149 @@
     */
     Function MoveNext() As Boolean
-        If currentIndexForEnumerator >= size Then
+        If currentIndexForEnumerator + 1 >= size Then
             ' 上限に達した
             Return False
@@ -161 +164 @@
     */
     Sub Reset()
-        currentIndexForEnumerator = 0
+        currentIndexForEnumerator = -1
     End Sub
 
@@ -171 +174 @@
     */
     Function Current() As Object
+        If currentIndexForEnumerator = -1 Then
+            ' MoveNextメソッドがReset後、一度も呼び出されなかった
+            Return Nothing
+        End If
         Return items[currentIndexForEnumerator] As Object
     End Function