Changeset 38 in dev for BasicCompiler_Common

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

BasicCompiler_Common

Files:

• NumOpe_GetType.cpp (modified) (2 diffs)
• Subroutine.cpp (modified) (1 diff)
• common.h (modified) (1 diff)

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);