Changeset 519

Timestamp:

Jun 10, 2008, 11:46:25 PM (16 years ago)

Author:

dai

Message:

ジェネリッククラスの型パラメータに値型が指定された場合、そのクラスがテンプレート展開されるように修正。ついに、下記のようなソースコードがビルド可能に！！！

#console

Dim b As System.Collections.Generic.List<Double>
b.Add( 10 )
b.Add( 20 )
Dim p = b As *Double	' ←ここがミソ！
Dim x = p[0]
Dim y = p[1]

Print x, y

System.Console.ReadLine()

Location:

trunk/ab5.0

Files:

• abdev.exe (modified) ( previous)
• ablib/src/Classes/System/Collections/Generic/List.ab (modified) (4 diffs)

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

@@ -25 +25 @@
 
     Sub Realloc( allocateSize As Long )
-        items = realloc( items, allocateSize * SizeOf(VoidPtr) )
+        items = realloc( items, allocateSize * SizeOf(T) )
     End Sub
 
@@ -46 +46 @@
     Function Operator[] ( index As Long ) As T
         Return items[index]
+    End Function
+
+    /*!
+    @brief  ポインタ型へのキャスト
+    @author Daisuke Yamamoto
+    @date   2007/08/22
+    @param  インデックス
+    */
+    Function Operator() As *T
+        Return items
     End Function
 
@@ -112 +122 @@
     Sub Insert( index As Long, item As T )
         Realloc( size + 1 )
-        memmove( items + (index+1)*SizeOf(VoidPtr), items + index*SizeOf(VoidPtr), (size-index)*SizeOf(VoidPtr) )
+        memmove( items + (index+1)*SizeOf(T), items + index*SizeOf(T), (size-index)*SizeOf(T) )
         items[index] = item
         size++
@@ -140 +150 @@
     */
     Sub RemoveAt( index As Long )
-        memmove( items + index*SizeOf(VoidPtr), items + (index+1)*SizeOf(VoidPtr), (size-(index+1))*SizeOf(VoidPtr) )
+        memmove( items + index*SizeOf(T), items + (index+1)*SizeOf(T), (size-(index+1))*SizeOf(T) )
         Realloc( size - 1 )
         size--