Changeset 672 in dev for trunk/ab5.0/abdev/ab_common

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/ab5.0/abdev/ab_common

Files:

• include/Lexical/Class.h (modified) (4 diffs)
• src/Lexical/Class.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/ab_common/include/Lexical/Class.h

@@ -83 +83 @@
 public:
     ActiveBasic::Common::Lexical::ExpandedTemplateClasses expandedTemplateClasses;
+    Types expandedClassActualTypeParameters;
 
     // XMLシリアライズ用
@@ -117 +118 @@
         ar & BOOST_SERIALIZATION_NVP( fixedAlignment );
         ar & BOOST_SERIALIZATION_NVP( expandedTemplateClasses );
+        ar & BOOST_SERIALIZATION_NVP( expandedClassActualTypeParameters );
     }
 
@@ -131 +133 @@
         int DestructorMemberSubIndex,
         int vtblNum,
-        int fixedAlignment );
+        int fixedAlignment,
+        const Types &expandedClassActualTypeParameters );
     CClass();
     ~CClass();
@@ -399 +402 @@
     }
 
+    // 展開時の型パラメータ情報
+    bool IsExpanded() const
+    {
+        return !expandedClassActualTypeParameters.empty();
+    }
+    void ResolveExpandedClassActualTypeParameter( Type &type ) const;
+
     // メンバの総合サイズを取得
 private:

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