Changeset 334 in dev for trunk/abdev/BasicCompiler32/Compile_Func.cpp

Timestamp:

Sep 28, 2007, 12:05:10 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler32/Compile_Func.cpp (modified) (6 diffs)

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -296 +296 @@
     userProc.Using();
 }
-void Opcode_CreateSimpleDelegate( const char *methodInstanceName, const UserProc &userProc )
+void Opcode_CreateSimpleDelegate( const CClass &dgClass, const char *methodInstanceName, const UserProc &userProc )
 {
     /////////////////////////////////////////////////////////////////
@@ -339 +339 @@
     compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EAX, REG_EAX, 0, MOD_BASE );
 
-    //push this
+    //push eax
     compiler.codeGenerator.op_push( REG_EAX );
 
@@ -347 +347 @@
     /////////////////////////////////////////////////////////////////
 
+    std::vector<const UserProc *> subs;
+    dgClass.GetStaticMethods().Enum( "_CreateDelegate", subs );
+
     // call _System_CreateSimpleDynamicDelegate
-    extern const UserProc *pSub_System_CreateSimpleDynamicDelegate;
-    compiler.codeGenerator.op_call( pSub_System_CreateSimpleDynamicDelegate );
+    compiler.codeGenerator.op_call( subs[0] );
 }
 void Opcode_Func_AddressOf( const char *name, const Type &baseType, bool isCallOn, Type &resultType ){
@@ -356 +358 @@
 
     const Parameters *pBaseParams = NULL;
-    bool isDelegate = false;
     if( baseType.IsProcPtr() )
     {
@@ -362 +363 @@
         pBaseParams = &compiler.GetObjectModule().meta.GetProcPointers()[baseType.GetIndex()]->Params();
     }
-    else if( baseType.IsObject() && baseType.GetClass().GetName() == "_SimpleDelegate" )
-    {
-        extern const Delegate *pConstructingDelegate;
-        if( !pConstructingDelegate )
-        {
-            SetError();
-        }
+    else if( baseType.IsDelegate() )
+    {
         // 左辺でデリゲートを要求されているとき
-        pBaseParams = &pConstructingDelegate->Params();
-
-        isDelegate = true;
+        pBaseParams = &baseType.GetClass().GetDelegate().Params();
     }
 
@@ -402 +396 @@
     }
 
-    if( isDelegate )
+    if( baseType.IsDelegate() )
     {
         if( isCallOn )
         {
             // デリゲートのとき
-            Opcode_CreateSimpleDelegate( name, *pUserProc );
+            Opcode_CreateSimpleDelegate( baseType.GetClass(), name, *pUserProc );
         }
         resultType = baseType;