Changeset 299 in dev for trunk/abdev/BasicCompiler_Common/include

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• Class.h (modified) (5 diffs)
• Compiler.h (modified) (1 diff)
• Member.h (modified) (1 diff)
• Type.h (modified) (6 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 );
 

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -123 +123 @@
 
 
-    static bool StringToType( const std::string &typeName, Type &type );
-    static const std::string TypeToString( const Type &type );
+    bool StringToType( const std::string &typeName, Type &type );
+    const std::string TypeToString( const Type &type );
 
     // コンパイル中のクラス

trunk/abdev/BasicCompiler_Common/include/Member.h

@@ -53 +53 @@
     }
 
-    Type GetType() const
+    const Type &GetType() const
     {
         return type;
+    }
+    void ResetType( const Type &type )
+    {
+        this->type = type;
     }
 

trunk/abdev/BasicCompiler_Common/include/Type.h

@@ -26 +26 @@
         const CClass *pClass;
     };
+
+    // ジェネリクス クラス インスタンス型の場合に使う
     GenericTypes actualGenericTypes;
+
+    // 型パラメータで使う
+    std::string formalTypeName; // 型パラメータの名前
+    int formalTypeIndex;        // 型パラメータの引数番号
 
     // XMLシリアライズ用
@@ -44 +50 @@
         {
             ar & BOOST_SERIALIZATION_NVP( index );
+        }
+
+        if( IsTypeParameter() )
+        {
+            ar & BOOST_SERIALIZATION_NVP( formalTypeName );
+            ar & BOOST_SERIALIZATION_NVP( formalTypeIndex );
         }
     }
@@ -71 +83 @@
         , index( type.index )
         , actualGenericTypes( type.actualGenericTypes )
+        , formalTypeName( type.formalTypeName )
+        , formalTypeIndex( type.formalTypeIndex )
     {
     }
@@ -81 +95 @@
         index = type.index;
         actualGenericTypes = type.actualGenericTypes;
+        formalTypeName = type.formalTypeName;
+        formalTypeIndex = type.formalTypeIndex;
     }
 
@@ -176 +192 @@
     bool HasMember() const;
 
+    // 型パラメータの名前を取得
+    const std::string &GetFormalTypeName() const
+    {
+        if( !IsTypeParameter() )
+        {
+            Jenga::Throw( "型パラメータでない型に対してGetFormalTypeNameメソッドが呼ばれた" );
+        }
+        return formalTypeName;
+    }
+    void SetFormalTypeName( const std::string &formalTypeName )
+    {
+        if( !IsTypeParameter() )
+        {
+            Jenga::Throw( "型パラメータでない型に対してSetFormalTypeNameメソッドが呼ばれた" );
+        }
+        this->formalTypeName = formalTypeName;
+    }
+    int GetFormalTypeIndex() const
+    {
+        if( !IsTypeParameter() )
+        {
+            Jenga::Throw( "型パラメータでない型に対してGetFormalTypeIndexメソッドが呼ばれた" );
+        }
+        return formalTypeIndex;
+    }
+    void SetFormalTypeIndex( int formalTypeIndex )
+    {
+        if( !IsTypeParameter() )
+        {
+            Jenga::Throw( "型パラメータでない型に対してSetFormalTypeIndexメソッドが呼ばれた" );
+        }
+        this->formalTypeIndex = formalTypeIndex;
+    }
+
     // 未完成
     const Type &GetDummyActualGenericType() const;
@@ -189 +239 @@
     static int GetBasicTypeFromSimpleName( const char *variable );
 };
+typedef std::vector<Type> Types;
+
+void ResolveFormalGenericTypeParameter( Type &typeParameter, const Type &classType, const UserProc *pUserProc = NULL );
 
 class GenericType