Changeset 631 for trunk

Timestamp:

Sep 22, 2008, 5:31:01 AM (16 years ago)

Author:

NoWest

Message:

List<T>、Stack<T>、Queue<T>を相互にIEnumerator<T>を使って変換できるようにしました。

List<T>クラスからReadOnlyCollectionの呼び出しがコンパイルできません。
どうしても問題を再現できなかったので、皆さんの所でも問題が発生するか確認のためにupしておきます。
やっぱり問題がおきたら、RevertするかListのAsReadOnlyメソッドをコメントアウトしてください。

Location:

trunk/ab5.0/ablib/src/Classes/System/Collections

Files:

• Generic/List.ab (modified) (3 diffs)
• Generic/Queue.ab (modified) (1 diff)
• Generic/Stack.ab (modified) (1 diff)
• ObjectModel/ReadOnlyCollection.ab (modified) (3 diffs)

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

@@ -80 +80 @@
     @author NoWest
     @date   2008/07/13
-    @param  インデックス
+    @param  基になる配列へのポインタ
+    @param  配列の長さ
     */
     Sub List( array As *T, length As Long )
@@ -87 +88 @@
         memmove( This.items, array, length * SizeOf(T) )
         This.count = length
+    End Sub
+
+    /*!
+    @brief  既存のIEnumerator<T>使用してListを初期化
+    @author NoWest
+    @date   2008/09/22
+    @param  基になるIEnumerator<T>
+    */
+    Sub List ( enumerator As IEnumerator<T> )
+        _Initialize( 1 )
+        While enumerator.MoveNext()
+            'This.Add(enumerator.Current())
+        Wend
     End Sub
 
@@ -185 +199 @@
     End Sub
 
-'   Function AsReadOnly() As ReadOnlyCollection
+    /*!
+    @brief  読み取り専用のListのラッパーを取得
+    @author NoWest
+    @date   2008/09/22
+    */
+    Function AsReadOnly() As System.Collections.ObjectModel.ReadOnlyCollection<T>
+        Return New System.Collections.ObjectModel.ReadOnlyCollection<T>(This)
+    End Function
 
     /*!

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

@@ -15 +15 @@
     End Sub
 
+    Sub initialize()
+        This.items = GC_malloc(1)
+    End Sub
+
 Public
     Sub Queue ()
-        This.items = GC_malloc( 1 )
+        This.initialize()
     End Sub
 
     Sub Queue ( capacity As Long )
-        This.items = GC_malloc( 1 )
+        This.initialize()
         If capacity > 0 Then
             This.size = capacity
             Realloc(capacity)
         End If
+    End Sub
+
+    Sub Queue ( enumerator As IEnumerator<T> )
+        This.initialize()
+        While enumerator.MoveNext()
+            This.Enqueue(enumerator.Current())
+        Wend
     End Sub
 

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

@@ -15 +15 @@
     End Sub
 
+    Sub initialize()
+        This.items = GC_malloc(1)
+    End Sub
 Public
     Sub Stack ()
-        This.items = GC_malloc( 1 )
+        This.initialize()
     End Sub
 
     Sub Stack ( capacity As Long )
-        This.items = GC_malloc( 1 )
+        This.initialize()
         If capacity > 0 Then
             This.size = capacity
             Realloc(capacity)
         End If
+    End Sub
+
+    Sub Stack ( enumerator As IEnumerator<T> )
+        This.initialize()
+        While enumerator.MoveNext()
+            This.Push(enumerator.Current())
+        Wend
     End Sub
 

trunk/ab5.0/ablib/src/Classes/System/Collections/ObjectModel/ReadOnlyCollection.ab

@@ -6 +6 @@
 
 Class ReadOnlyCollection<T>
-    Implements Generic.IList<T>
-    list As Generic.IList<T>
+    Implements System.Collections.Generic.IList<T>
+    list As System.Collections.Generic.IList<T>
 
 Public
     'Collection クラスの新しいインスタンスを初期化します。 
     Sub ReadOnlyCollection ()
-        This.list = New Generic.List<T>
+        Dim l = New System.Collections.Generic.List<T>
+        This.list = l
     End Sub
-    Sub ReadOnlyCollection ( list As Generic.IList<T> )
+    Sub ReadOnlyCollection ( list As System.Collections.Generic.IList<T> )
         This.list = list
     End Sub
@@ -35 +36 @@
     'Collection をラップする IList ラッパーを取得します。 
     Function Items () As Generic.IList<T>
-        Return list
+        Return This
     End Function
 
@@ -57 +58 @@
 
     'Collection を反復処理する列挙子を返します。 
-    Override Function GetEnumerator () As Generic.IEnumerator<T>
+    Override Function GetEnumerator () As System.Collections.Generic.IEnumerator<T>
         Return This.list.GetEnumerator()
     End Function