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

Timestamp:

Aug 21, 2007, 11:00:25 PM (17 years ago)

Author:

dai_9181

Message:

ジェネリクスのベースを実装

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• Class.h (modified) (5 diffs)
• Type.h (modified) (10 diffs)

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -9 +9 @@
 
 class UserProc;
+class CClass;
 
 class InheritedInterface
@@ -48 +49 @@
     // importされている名前空間
     NamespaceScopesCollection importedNamespaces;
-    
+
+    // 型パラメータ
+    GenericTypes formalGenericTypes;
+
     // 継承クラス
     const CClass *pSuperClass;
@@ -108 +112 @@
         , classType( Class )
         , pSuperClass( NULL )
+        , blittableType( Type() )
         , isReady( false )
         , fixedAlignment( 0 )
@@ -124 +129 @@
         , classType()
         , pSuperClass( NULL )
+        , blittableType( Type() )
         , isReady( false )
         , fixedAlignment( 0 )
@@ -173 +179 @@
     }
 
+    // 型パラメータ
+    void AddFormalGenericType( GenericType genericType )
+    {
+        this->formalGenericTypes.push_back( genericType );
+    }
+    bool IsExistFormalGenericTypeParameter( const std::string &name ) const
+    {
+        BOOST_FOREACH( const GenericType &genericType, formalGenericTypes )
+        {
+            if( genericType.GetName() == name )
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
     // 継承元クラス
     bool HasSuperClass() const

trunk/abdev/BasicCompiler_Common/include/Type.h

@@ -16 +16 @@
 
 class CClass;
+
+class GenericType;
+typedef std::vector<GenericType> GenericTypes;
 
 class Type{
@@ -23 +26 @@
         const CClass *pClass;
     };
+    GenericTypes actualGenericTypes;
 
     // XMLシリアライズ用
@@ -52 +56 @@
       index( -1 ){}
 
-    Type( int basicType, LONG_PTR index ):
-      basicType( basicType ),
-      index( index ){}
+    Type( int basicType, LONG_PTR index )
+        : basicType( basicType )
+        , index( index )
+    {
+    }
 
     Type( int basicType, const CClass &objClass ):
@@ -60 +66 @@
       index( (LONG_PTR)&objClass ){}
 
-    Type( const Type &type ):
-      basicType( type.basicType ),
-      index( type.index ){}
+    Type( const Type &type )
+        : basicType( type.basicType )
+        , index( type.index )
+        , actualGenericTypes( type.actualGenericTypes )
+    {
+    }
+
+    ~Type();
+
+    void operator= ( const Type &type )
+    {
+        basicType = type.basicType;
+        index = type.index;
+        actualGenericTypes = type.actualGenericTypes;
+    }
 
     __inline int GetBasicType() const
@@ -72 +90 @@
         return index;
     }
-    const CClass &GetClass() const
-    {
-        return *pClass;
-    }
+    const CClass &GetClass() const;
 
     void SetBasicType( int basicType ){
@@ -85 +100 @@
     void SetClassPtr( const CClass *pClass )
     {
+        int naturalBasicType = NATURAL_TYPE( basicType );
+        if( !HasMember() )
+        {
+            Jenga::Throw( "クラスまたは構造体でない型に対してSetClassPtrを呼び出した" );
+        }
         this->pClass = pClass;
     }
@@ -98 +118 @@
         SetBasicType( basicType );
         this->pClass = pClass;
+    }
+    void SetActualGenericTypes( const GenericTypes &genericTypes )
+    {
+        this->actualGenericTypes = genericTypes;
     }
 
@@ -142 +166 @@
     bool IsObject() const;
     bool IsObjectPtr() const;
+    bool IsTypeParameter() const;
     bool IsObjectClass() const;
     bool IsStringClass() const;
@@ -150 +175 @@
     bool HasMember() const;
 
-    void operator= ( const Type &type ){
-        basicType = type.basicType;
-        index = type.index;
-    }
+    // 未完成
+    const Type &GetDummyActualGenericType() const;
+    bool HasActualGenericType() const;
 
 
@@ -163 +187 @@
     static const char *Type::BasicTypeToCharPtr( const Type &type );
     static int GetBasicTypeFromSimpleName( const char *variable );
+};
+
+class GenericType
+{
+    std::string name;
+    Type type;
+public:
+    GenericType( const std::string &name, const Type &type )
+        : name( name )
+        , type( type )
+    {
+    }
+    GenericType()
+    {
+    }
+    ~GenericType()
+    {
+    }
+
+    const std::string &GetName() const
+    {
+        return name;
+    }
+    const Type &GetType() const
+    {
+        return type;
+    }
 };