Changeset 290 in dev for trunk/abdev/BasicCompiler_Common/src/Type.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/abdev/BasicCompiler_Common/src/Type.cpp (modified) (7 diffs)

trunk/abdev/BasicCompiler_Common/src/Type.cpp

@@ -52 +52 @@
 };
 
+Type::~Type()
+{
+}
+
 bool Type::StringToBasicType( const string &typeName, int &basicType ){
     for( int i=0; ; i++ ){
@@ -120 +124 @@
 }
 
+const CClass &Type::GetClass() const
+{
+    if( !HasMember() )
+    {
+        Jenga::Throw( "クラスまたは構造体でない型に対してGetClassを呼び出した" );
+    }
+
+    return *pClass;
+}
 
 bool Type::Equals( const Type &type ) const
@@ -185 +198 @@
 
     // 構造体
-    if( basicType == DEF_STRUCT ){
+    if( IsStruct() )
+    {
         if( !pClass ){
             SmoothieException::Throw();
@@ -195 +209 @@
 
     // オブジェクト
-    if(basicType==DEF_OBJECT){
+    if( IsObject() )
+    {
         if( GetClass().IsInterface() ){
             // vtblOffsetのサイズを含める
@@ -379 +394 @@
 bool Type::IsObject() const
 {
-    if( basicType == DEF_OBJECT ){
-        return true;
-    }
-    return false;
+    return (
+        basicType == DEF_OBJECT
+        || IsTypeParameter()
+    );
 }
 bool Type::IsObjectPtr() const
@@ -390 +405 @@
     }
     return false;
+}
+bool Type::IsTypeParameter() const
+{
+    return ( basicType == DEF_TYPE_PARAMETER );
 }
 bool Type::IsObjectClass() const
@@ -428 +447 @@
 {
     if( NATURAL_TYPE( basicType ) == DEF_OBJECT
-        || NATURAL_TYPE( basicType ) == DEF_STRUCT ){
-            return true;
-    }
-    return false;
+        || NATURAL_TYPE( basicType ) == DEF_STRUCT
+        || NATURAL_TYPE( basicType ) == DEF_TYPE_PARAMETER
+    ){
+        return true;
+    }
+    return false;
+}
+
+const Type &Type::GetDummyActualGenericType() const
+{
+    return actualGenericTypes[0].GetType();
+}
+bool Type::HasActualGenericType() const
+{
+    return ( actualGenericTypes.size() > 0 );
 }