Changeset 38 in dev

Timestamp:

Jan 22, 2007, 11:38:19 PM (17 years ago)

Author:

dai_9181

Message:

戻り値に基本型を持つインデクサ（Getter）が正常に呼び出せないバグを修正。

Files:

• BasicCompiler32/NumOpe.cpp (modified) (1 diff)
• BasicCompiler32/Opcode.h (modified) (1 diff)
• BasicCompiler32/OperatorProc.cpp (modified) (1 diff)
• BasicCompiler64/NumOpe.cpp (modified) (2 diffs)
• BasicCompiler64/Opcode.h (modified) (1 diff)
• BasicCompiler64/OperatorProc.cpp (modified) (1 diff)
• BasicCompiler_Common/NumOpe_GetType.cpp (modified) (2 diffs)
• BasicCompiler_Common/Subroutine.cpp (modified) (1 diff)
• BasicCompiler_Common/common.h (modified) (1 diff)

BasicCompiler32/NumOpe.cpp

@@ -361 +361 @@
                         if(i2==DEF_OBJECT){
                             TYPEINFO RetTypeInfo;
-                            CallArrayOperatorProc(pobj_c,variable,array_element,RetTypeInfo);
+                            CallIndexerGetterProc(pobj_c,variable,array_element,RetTypeInfo);
                             type[sp]=RetTypeInfo.type;
                             index_stack[sp]=RetTypeInfo.u.lpIndex;

BasicCompiler32/Opcode.h

@@ -241 +241 @@
 int CallOperatorProc(int idCalc,TYPEINFO *pBaseTypeInfo,int *type,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp);
 void CallCastOperatorProc(int &CalcType,LONG_PTR &lpCalcIndex,BOOL bCalcUseHeap,int ToType,LONG_PTR lpToIndex);
-void CallArrayOperatorProc(CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo);
+void CallIndexerGetterProc(CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo);
 
 //Compile_Statement.cpp

BasicCompiler32/OperatorProc.cpp

@@ -262 +262 @@
     SetError(-1,"キャスト演算子がオーバーロードされていません。",cp);
 }
-void CallArrayOperatorProc(CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo){
+void CallIndexerGetterProc(CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo){
     SUBINFO **ppsi;
     int num;

BasicCompiler64/NumOpe.cpp

@@ -404 +404 @@
 
 
+                    //インデクサ（getアクセサ）
                     char variable[VN_SIZE],array_element[VN_SIZE];
                     CClass *pobj_c;
@@ -411 +412 @@
                         if(i2==DEF_OBJECT){
                             TYPEINFO RetTypeInfo;
-                            CallArrayOperatorProc(UseReg,pobj_c,variable,array_element,RetTypeInfo);
+                            CallIndexerGetterProc(UseReg,pobj_c,variable,array_element,RetTypeInfo);
                             type[sp]=RetTypeInfo.type;
                             index_stack[sp]=RetTypeInfo.u.lpIndex;

BasicCompiler64/Opcode.h

@@ -394 +394 @@
 int CallOperatorProc(int idCalc,TYPEINFO *pBaseTypeInfo,int *type,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp);
 void CallCastOperatorProc(int reg,int &CalcType,LONG_PTR &lpCalcIndex,BOOL bCalcUseHeap,int ToType,LONG_PTR lpToIndex);
-void CallArrayOperatorProc(int reg,CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo);
+void CallIndexerGetterProc(int reg,CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo);
 
 //Compile_Statement.cpp

BasicCompiler64/OperatorProc.cpp

@@ -436 +436 @@
 }
 
-void CallArrayOperatorProc(int reg,CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo){
+//インデクサ（getter）を呼び出す
+void CallIndexerGetterProc(int reg,CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo){
     SUBINFO **ppsi;
     int num;

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -409 +409 @@
                     }
 
+
+                    //インデクサ（getアクセサ）
+                    char VarName[VN_SIZE],ArrayElements[VN_SIZE];
+                    GetArrayElement(values[i],VarName,ArrayElements);
+                    if(ArrayElements[0]){
+                        CClass *pobj_c;
+                        i2=GetVarType(VarName,(LONG_PTR *)&pobj_c,0);
+                        if(i2==DEF_OBJECT){
+                            TYPEINFO RetTypeInfo;
+                            if( !GetReturnTypeOfIndexerGetterProc(pobj_c,RetTypeInfo) ){
+                                SetError(1,NULL,cp);
+                                goto error;
+                            }
+                            type[sp]=RetTypeInfo.type;
+                            index_stack[sp]=RetTypeInfo.u.lpIndex;
+                            bLiteralCalculation=0;
+
+                            sp++;
+                            break;
+                        }
+                    }
+
+
                     i2=GetVarType(values[i],&index_stack[sp],0);
                     if(i2!=-1){
@@ -472 +495 @@
 
                     //配列要素を排除
-                    char VarName[VN_SIZE],ArrayElements[VN_SIZE];
                     GetArrayElement(values[i],VarName,ArrayElements);
 

BasicCompiler_Common/Subroutine.cpp

@@ -222 +222 @@
     return 1;
 }
+
+//インデクサ（getter）の戻り値を取得
+bool GetReturnTypeOfIndexerGetterProc(CClass *pobj_Class,TYPEINFO &RetTypeInfo){
+    SUBINFO **ppsi;
+    int num;
+    ppsi=pobj_Class->GetOperatorSubInfo(CALC_ARRAY_GET,num);
+    if(num==0){
+        HeapDefaultFree(ppsi);
+
+        return false;
+    }
+
+    RetTypeInfo.type = ppsi[0]->ReturnType;
+    RetTypeInfo.u.lpIndex = ppsi[0]->u.ReturnIndex;
+
+    HeapDefaultFree(ppsi);
+
+    return true;
+}
+
 
 void AddDeclareData(char *buffer,int NowLine){

BasicCompiler_Common/common.h

@@ -550 +550 @@
 int GetReturnTypeOfProc(int idProc,void *pInfo,char *name,char *Parameter,LONG_PTR *plpRetIndex);
 BOOL GetReturnTypeOfPropertyMethod(char *variable,char *RightSide,TYPEINFO *pRetTypeInfo);
+bool GetReturnTypeOfIndexerGetterProc(CClass *pobj_Class,TYPEINFO &RetTypeInfo);
 BOOL CompareParameter(PARAMETER_INFO *ppi1,int pi_num1,PARAMETER_INFO *ppi2,int pi_num2);
 SUBINFO *AddSubData(char *buffer,int NowLine,BOOL bVirtual,CClass *pobj_c,BOOL bStatic=0);