Changeset 579 for trunk/ab5.0/ablib/src/Classes/System/Collections/Generic/Queue.ab

Timestamp:

Aug 8, 2008, 12:15:30 AM (16 years ago)

Author:

dai

Message:

• ForeachがIDisposableを実装したIEnumerator<T>を取り扱うように変更
• #120（列挙体のUnicode対応）の修正

File:

• trunk/ab5.0/ablib/src/Classes/System/Collections/Generic/Queue.ab (modified) (3 diffs)

trunk/ab5.0/ablib/src/Classes/System/Collections/Generic/Queue.ab

@@ -18 +18 @@
     Sub Queue ()
         This.items = GC_malloc( 1 )
-        Reset()
     End Sub
 
     Sub Queue ( capacity As Long )
         This.items = GC_malloc( 1 )
-        Reset()
         If capacity > 0 Then
             This.size = capacity
@@ -64 +62 @@
     */
     Override Function GetEnumerator () As IEnumerator<T>
-        Return This
+        Return New Detail.PointerEnumerator(items, count)
     End Function
 
@@ -116 +114 @@
         End If
     End Sub
-
-
-    '------------------------
-    '   IEnumeratorの実装
-    '------------------------
-    currentIndexForEnumerator As Long
-
-    Override Function Current () As T
-        If This.currentIndexForEnumerator = -1 Then
-            ' MoveNextメソッドがReset後、一度も呼び出されなかった
-            Return Nothing
-        End If
-        Return This.items[ This.currentIndexForEnumerator ]
-    End Function
-
-    Override Function MoveNext() As Boolean
-        If This.currentIndexForEnumerator + 1 >= This.size Then
-            ' 上限に達した
-            Return False
-        End If
-
-        This.currentIndexForEnumerator ++
-        Return True
-    End Function
-
-    Override Sub Reset ()
-        This.currentIndexForEnumerator = -1
-    End Sub
 End Class