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

Timestamp:

Sep 27, 2007, 1:47:46 AM (17 years ago)

Author:

dai_9181

Message:

AddressOfの左辺値を加味した処理を簡潔にした

File:

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

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -221 +221 @@
     compiler.codeGenerator.op_mov_RV( REG_EAX, typeSize );
 }
-void Opcode_Func_AddressOf( const char *name ){
+void Opcode_Func_AddressOf( const char *name, const Type &baseType ){
     extern int cp;
     const UserProc *pUserProc;
 
-    extern LONG_PTR ProcPtr_BaseIndex;
-    if(ProcPtr_BaseIndex!=-1){
+    if( baseType.IsProcPtr() )
+    {
         //左辺の型にのっとり、オーバーロードを解決
 
@@ -237 +237 @@
 
         //オーバーロードを解決
-        pUserProc=OverloadSolution(name,subs,compiler.GetObjectModule().meta.GetProcPointers()[ProcPtr_BaseIndex]->Params(), Type() );
+        pUserProc=OverloadSolution(name,subs,compiler.GetObjectModule().meta.GetProcPointers()[baseType.GetIndex()]->Params(), Type() );
 
         if(!pUserProc){
@@ -477 +477 @@
 }
 
-bool Opcode_CallFunc( const char *Parameter, const int FuncNum, Type &resultType, bool isCallOn ){
+bool Opcode_CallFunc( const char *Parameter, const int FuncNum, const Type &baseType, Type &resultType, bool isCallOn )
+{
     switch(FuncNum){
         case FUNC_FIX:
@@ -492 +493 @@
             break;
         case FUNC_ADDRESSOF:
-            if( isCallOn ) Opcode_Func_AddressOf(Parameter);
+            if( isCallOn ) Opcode_Func_AddressOf( Parameter, baseType );
             resultType.SetBasicType( DEF_PTR_VOID );
             break;