Changeset 299 in dev for trunk/abdev/BasicCompiler_Common/include/Class.h

Timestamp:

Aug 23, 2007, 6:17:00 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/include/Class.h (modified) (5 diffs)

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -56 +56 @@
     const CClass *pSuperClass;
 
+    // 継承クラスの型パラメータ（実パラメータ）
+    Types superClassActualTypeParameters;
+
     // Blittable型情報
     Type blittableType;
@@ -93 +96 @@
         ar & BOOST_SERIALIZATION_NVP( formalGenericTypes );
         ar & boost::serialization::make_nvp( "pSuperClass", const_cast<CClass *&>(pSuperClass) );
+        ar & BOOST_SERIALIZATION_NVP( superClassActualTypeParameters );
         ar & BOOST_SERIALIZATION_NVP( blittableType );
         //ar & BOOST_SERIALIZATION_NVP( interfaces );
@@ -185 +189 @@
         this->formalGenericTypes.push_back( genericType );
     }
+    int GetFormalGenericTypeParameterIndex( const std::string &name ) const
+    {
+        int i = 0;
+        BOOST_FOREACH( const GenericType &genericType, formalGenericTypes )
+        {
+            if( genericType.GetName() == name )
+            {
+                return i;
+            }
+            i++;
+        }
+        return -1;
+    }
     bool IsExistFormalGenericTypeParameter( const std::string &name ) const
     {
@@ -210 +227 @@
         this->pSuperClass = pSuperClass;
     }
+    const Types &GetSuperClassActualTypeParameters() const
+    {
+        return superClassActualTypeParameters;
+    }
+    void SetSuperClassActualTypeParameters( const Types &actualTypeParameters )
+    {
+        this->superClassActualTypeParameters = actualTypeParameters;
+    }
 
     // Blittable型
@@ -270 +295 @@
     //継承させる
     bool Inherits( const char *inheritNames, int nowLine );
-    bool InheritsClass( const CClass &inheritsClass, int nowLine );
+    bool InheritsClass( const CClass &inheritsClass, const Types &actualTypeParameters, int nowLine );
     bool InheritsInterface( const CClass &inheritsClass, int nowLine );