Changeset 562 in dev for trunk/ab5.0

Timestamp:

May 5, 2008, 1:47:06 PM (16 years ago)

Author:

dai_9181

Message:

CClass::GetDelegateメソッドを廃止し、代わりにMeta::ToDelegateメソッドを実装。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/error.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Class.h (modified) (1 diff)
• BasicCompiler_Common/include/Meta.h (modified) (1 diff)
• BasicCompiler_Common/src/Class.cpp (modified) (1 diff)
• BasicCompiler_Common/src/Meta.cpp (modified) (1 diff)
• compiler_x86/Compile_Func.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/error.cpp

@@ -66 +66 @@
             // デリゲート同士の比較の場合
             // ※共変戻り値及び反辺引数をサポートすること
-            if( !varType.GetClass().GetDelegate().IsSimilar( calcType.GetClass().GetDelegate() ) )
+            const ::Delegate *pVarDelegate = &compiler.GetObjectModule().meta.ToDelegate( varType.GetClass() );
+            const ::Delegate *pCalcDelegate = &compiler.GetObjectModule().meta.ToDelegate( calcType.GetClass() );
+            if( !pVarDelegate->IsSimilar( *pCalcDelegate ) )
             {
                 // 等しいと見なされないとき

trunk/ab5.0/abdev/BasicCompiler_Common/include/Class.h

@@ -384 +384 @@
     }
 
-    // デリゲート情報を取得
-    const ::Delegate &GetDelegate() const;
-
     // ユーザ指定のアラインメント固定値
     int GetFixedAlignment() const

trunk/ab5.0/abdev/BasicCompiler_Common/include/Meta.h

@@ -153 +153 @@
         return delegates;
     }
+
+    const ::Delegate &ToDelegate( const CClass &_class );
 };

trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp

@@ -294 +294 @@
 
     return result;
-}
-
-const ::Delegate &CClass::GetDelegate() const
-{
-    const ::Delegate *dg = compiler.GetObjectModule().meta.GetDelegates().GetHashArrayElement( GetName().c_str() );
-    while( dg )
-    {
-        if( dg->IsEqualSymbol( GetNamespaceScopes(), GetName() ) ){
-            //名前空間とクラス名が一致した
-            return *dg;
-        }
-        dg = dg->GetChainNext();
-    }
-
-    Jenga::Throw( "CClass::GetDelegateメソッドに失敗" );
-    static ::Delegate dummy;
-    return dummy;
 }
 

trunk/ab5.0/abdev/BasicCompiler_Common/src/Meta.cpp

@@ -163 +163 @@
     meta.GetDelegates().PullOutAll();
 }
+
+const ::Delegate &Meta::ToDelegate( const CClass &_class )
+{
+    const ::Delegate *dg = this->GetDelegates().GetHashArrayElement( _class.GetName().c_str() );
+    while( dg )
+    {
+        if( dg->IsEqualSymbol( _class.GetNamespaceScopes(), _class.GetName() ) ){
+            //名前空間とクラス名が一致した
+            return *dg;
+        }
+        dg = dg->GetChainNext();
+    }
+
+    throw;
+}

trunk/ab5.0/abdev/compiler_x86/Compile_Func.cpp

@@ -443 +443 @@
     {
         // 左辺でデリゲートを要求されているとき
-        const Delegate *pTempDelegate = &baseType.GetClass().GetDelegate();
+        const Delegate *pTempDelegate = &compiler.GetObjectModule().meta.ToDelegate( baseType.GetClass() );
         pBaseParams = &pTempDelegate->Params();
         pBaseReturnType = &pTempDelegate->ReturnType();
@@ -611 +611 @@
         }
 
-        Opcode_CallDelegate( compiler.GetCompilingClass().GetDelegate(), methodPtrParamStr, objPtrValueStr, paramsStr + i );
+        Opcode_CallDelegate( compiler.GetObjectModule().meta.ToDelegate( compiler.GetCompilingClass() ), methodPtrParamStr, objPtrValueStr, paramsStr + i );
     }