Changeset 672 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/Class.cpp

Timestamp:

Jun 29, 2008, 2:08:44 AM (16 years ago)

Author:

dai_9181

Message:

#171への対応。テンプレート展開後のクラスメソッドの実装で、SizeOf(T)が正常値を返さない不具合を修正（特にTが4バイト未満の型場合）。

File:

• trunk/ab5.0/abdev/ab_common/src/Lexical/Class.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/ab_common/src/Lexical/Class.cpp

@@ -30 +30 @@
     int DestructorMemberSubIndex,
     int vtblNum,
-    int fixedAlignment )
+    int fixedAlignment,
+    const Types &expandedClassActualTypeParameters )
     : ClassPrototype( symbol )
     , importedNamespaces( importedNamespaces )
@@ -43 +44 @@
     , vtblNum( vtblNum )
     , fixedAlignment( fixedAlignment )
+    , expandedClassActualTypeParameters( expandedClassActualTypeParameters )
     , vtbl_offset( -1 )
     , comVtblOffset( 0 )
@@ -379 +381 @@
 }
 
+void CClass::ResolveExpandedClassActualTypeParameter( Type &type ) const
+{
+    if( !this->IsExpanded() )
+    {
+        _ASSERTE( false );
+    }
+
+    if( !type.IsTypeParameter() )
+    {
+        // 型パラメータではない場合
+        return;
+    }
+
+    type = expandedClassActualTypeParameters[type.GetFormalTypeIndex()];
+}
+
 //サイズを取得
 int CClass::GetSize() const