Changeset 335 in dev for trunk

Timestamp:

Sep 28, 2007, 3:27:35 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_Func.cpp (modified) (2 diffs)
• BasicCompiler_Common/src/Delegate.cpp (modified) (1 diff)
• BasicCompiler_Common/src/Type.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -296 +296 @@
     userProc.Using();
 }
-void Opcode_CreateSimpleDelegate( const CClass &dgClass, const char *methodInstanceName, const UserProc &userProc )
+void Opcode_CreateDelegate( const CClass &dgClass, const char *methodInstanceName, const UserProc &userProc )
 {
     /////////////////////////////////////////////////////////////////
@@ -401 +401 @@
         {
             // デリゲートのとき
-            Opcode_CreateSimpleDelegate( baseType.GetClass(), name, *pUserProc );
+            Opcode_CreateDelegate( baseType.GetClass(), name, *pUserProc );
         }
         resultType = baseType;

trunk/abdev/BasicCompiler_Common/src/Delegate.cpp

@@ -188 +188 @@
         destSource += sourceTemplate.GetResult( values );
     }
+/*
+    ofstream ofs( ( Jenga::Common::Environment::GetAppDir() + "\\generated_delegate_code.log" ).c_str() );
+    ofs << destSource;
+    ofs.close();
+    */
 }

trunk/abdev/BasicCompiler_Common/src/Type.cpp

@@ -512 +512 @@
         if( pUserProc )
         {
-            // 基底クラスでの自己解決
-            const CClass *pClass = &classType.GetClass();
-            while( pClass->HasSuperClass() )
+            if( classType.IsObject() )
             {
-                if( pUserProc->GetParentClassPtr() == &pClass->GetSuperClass() )
+                // 基底クラスでの自己解決
+                const CClass *pClass = &classType.GetClass();
+                while( pClass->HasSuperClass() )
                 {
-                    if( pClass->GetSuperClassActualTypeParameters().size() )
+                    if( pUserProc->GetParentClassPtr() == &pClass->GetSuperClass() )
                     {
-                        // TODO: 適切な形に実装し直す（暫定的にトップの型を持ってきている）
-                        typeParameter = pClass->GetSuperClassActualTypeParameters()[0];
+                        if( pClass->GetSuperClassActualTypeParameters().size() )
+                        {
+                            // TODO: 適切な形に実装し直す（暫定的にトップの型を持ってきている）
+                            typeParameter = pClass->GetSuperClassActualTypeParameters()[0];
+                        }
                     }
+                    pClass = &pClass->GetSuperClass();
                 }
-                pClass = &pClass->GetSuperClass();
             }
         }