Changeset 40 in dev for BasicCompiler64/Compile_Var.cpp

Timestamp:

Jan 28, 2007, 3:48:22 AM (17 years ago)

Author:

dai_9181

Message:

ByRef修飾子を関数戻り値とDimステートメントで指定可能にした。

File:

• BasicCompiler64/Compile_Var.cpp (modified) (24 diffs)

BasicCompiler64/Compile_Var.cpp

@@ -206 +206 @@
     }
 
+    CMember *pMember=pobj_c->ppobj_Member[i];
+
 
     //アクセシビリティをチェック
     if(pobj_c==pobj_CompilingClass){
         //同一クラスオブジェクトの場合はプライベートアクセスを容認する
-        if(pobj_c->ppobj_Member[i]->dwAccess==ACCESS_NON){
+        if(pMember->dwAccess==ACCESS_NON){
             if(isErrorEnabled) SetError(107,VarName,cp);
             return 0;
@@ -216 +218 @@
     }
     else{
-        if((bPrivateAccess==0&&pobj_c->ppobj_Member[i]->dwAccess==ACCESS_PRIVATE)||
-            pobj_c->ppobj_Member[i]->dwAccess==ACCESS_NON){
+        if((bPrivateAccess==0&&pMember->dwAccess==ACCESS_PRIVATE)||
+            pMember->dwAccess==ACCESS_NON){
             if(isErrorEnabled) SetError(107,VarName,cp);
             return 0;
         }
-        else if(bPrivateAccess==0&&pobj_c->ppobj_Member[i]->dwAccess==ACCESS_PROTECTED){
+        else if(bPrivateAccess==0&&pMember->dwAccess==ACCESS_PROTECTED){
             if(isErrorEnabled) SetError(108,VarName,cp);
             return 0;
@@ -229 +231 @@
     //Const定義の場合は書き込みアクセスを制限する
     //※コンストラクタをコンパイル中の場合は例外的に許可する
-    if( pobj_c->ppobj_Member[i]->IsConst() &&       //定数メンバである
+    if( pMember->IsConst() &&       //定数メンバである
         isWriteAccess &&                            //書き込みアクセスを要求されている
         pobj_c->IsCompilingConstructor() == false   //コンストラクタ コンパイル中を除く
@@ -237 +239 @@
     }
 
-    *pType=pobj_c->ppobj_Member[i]->TypeInfo.type;
-    *plpNestIndex=pobj_c->ppobj_Member[i]->TypeInfo.u.lpIndex;
+    *pType=pMember->TypeInfo.type;
+    *plpNestIndex=pMember->TypeInfo.u.lpIndex;
 
     //ポインタ変数の場合
     if(IsPtrType(*pType)){
-        if(pobj_c->ppobj_Member[i]->SubScripts[0]==-1){
+        if(pMember->SubScripts[0]==-1){
             lstrcpy(lpPtrOffset,array);
             array[0]=0;
@@ -265 +267 @@
     if(array[0]){
         //配列オフセット
-        if(!GetArrayOffset(pobj_c->ppobj_Member[i]->SubScripts,array,*pType,pobj_c->ppobj_Member[i]->TypeInfo.u.lpIndex)){
+        if(!GetArrayOffset(pMember->SubScripts,array,*pType,pMember->TypeInfo.u.lpIndex)){
             if(isErrorEnabled) SetError(14,member,cp);
         }
     }
-    else if(pobj_c->ppobj_Member[i]->SubScripts[0]!=-1){
+    else if(pMember->SubScripts[0]!=-1){
         *pType|=FLAG_PTR;
     }
@@ -276 +278 @@
         //入れ子構造の場合
 
-        if(*pType==DEF_OBJECT){
+        if(*pType==DEF_OBJECT && pMember->IsRef() == false){
             if(RefType!=DEF_OBJECT){
                 if(isErrorEnabled) SetError(104,member,cp);
@@ -282 +284 @@
             }
         }
-        else if(*pType==DEF_PTR_OBJECT){
+        else if(*pType==DEF_PTR_OBJECT || ( *pType==DEF_OBJECT && pMember->IsRef() )){
             //構造体ポインタ型メンバ変数
 
             if(lpPtrOffset[0]){
                 //pObj[n].member
-                if(RefType!=DEF_OBJECT){
+                if(*pType==DEF_PTR_OBJECT&&RefType!=DEF_OBJECT){
                     if(isErrorEnabled) SetError(104,member,cp);
                     return 0;
@@ -300 +302 @@
             else{
                 //pObj->member
-                if(RefType!=DEF_PTR_OBJECT){
+                if(*pType==DEF_PTR_OBJECT&&RefType!=DEF_PTR_OBJECT){
                     if(isErrorEnabled) SetError(104,member,cp);
                     return 0;
@@ -347 +349 @@
             isErrorEnabled,
             isWriteAccess,
-            pobj_c->ppobj_Member[i]->TypeInfo.u.pobj_Class,
+            pMember->TypeInfo.u.pobj_Class,
             NestMember,
             pType,
@@ -383 +385 @@
     SetReg_WholeVariable(DEF_PTR_VOID,&RelativeVar,reg);
 }
-BOOL GetVarOffset(bool isErrorEnabled,bool isWriteAccess,char *NameBuffer,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpIndex,int *pss){
+BOOL GetVarOffset(bool isErrorEnabled,bool isWriteAccess,const char *NameBuffer,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpIndex,int *pss){
     extern BOOL bCompilingGlobal;
     int i,RefType;
@@ -432 +434 @@
             pRelativeVar->offset=-LocalVar[i].offset;
             pRelativeVar->bOffsetOffset=0;
-            if(LocalVar[i].fRef) pRelativeVar->dwKind=VAR_REFLOCAL;
+            if(LocalVar[i].fRef){
+                // 参照型
+                pRelativeVar->dwKind = VAR_REFLOCAL;
+            }
             else pRelativeVar->dwKind=VAR_LOCAL;
             *pType=LocalVar[i].type;
@@ -1045 +1050 @@
 
 
-void dim(char *Parameter,DWORD dwFlag){
+void dim(char *Parameter,DWORD dwFlags){
     extern BOOL bCompilingGlobal;
     extern HANDLE hHeap;
@@ -1051 +1056 @@
     char VarName[VN_SIZE];
 
-
-    if(dwFlag & DIMFLAG_CONST){
+    //参照型かどうか
+    bool isRef = false;
+
+    i2 = 0;
+
+    if( Parameter[i2] == 1 && Parameter[i2+1] == ESC_BYREF ){
+        //参照型
+        isRef = true;
+        Parameter += 2;
+    }
+
+    if(dwFlags & DIMFLAG_CONST){
+
         //////////////////////////////////
         // 定数変数の場合を考慮
         //////////////////////////////////
-        for(i2=0;;i2++){
+        for(;;i2++){
             if(Parameter[i2] == '=' ||
                 Parameter[i2] == 1 && Parameter[i2] == ESC_AS ||
@@ -1083 +1099 @@
     char InitBuf[8192];
     char ConstractParameter[VN_SIZE];
-    if(!GetDimentionFormat(Parameter,VarName,SubScripts,&TypeInfo,InitBuf,ConstractParameter))
+    if(!GetDimentionFormat(Parameter, isRef , VarName,SubScripts,&TypeInfo,InitBuf,ConstractParameter))
         return;
 
@@ -1104 +1120 @@
     TypeSize=GetTypeSize(TypeInfo.type,TypeInfo.u.lpIndex);
 
-    if(dwFlag&DIMFLAG_STATIC){
+    if(dwFlags&DIMFLAG_STATIC){
         if(bCompilingGlobal){
             SetError(60,NULL,cp);
@@ -1118 +1134 @@
         GetNowStaticVarFullName(VarName,temporary);
 
-        AddGlobalVariable(temporary,SubScripts,&TypeInfo,TypeSize,InitBuf,ConstractParameter,dwFlag);
+        AddGlobalVariable(temporary,SubScripts,&TypeInfo,TypeSize,InitBuf,ConstractParameter,dwFlags);
 
         /*
@@ -1131 +1147 @@
             /////////////////////////
 
-            AddGlobalVariable(VarName,SubScripts,&TypeInfo,TypeSize,InitBuf,ConstractParameter,dwFlag);
+            AddGlobalVariable(VarName,SubScripts,&TypeInfo,TypeSize,InitBuf,ConstractParameter,dwFlags);
         }
         else{
@@ -1149 +1165 @@
 
             LocalVar=(VARIABLE *)HeapReAlloc(hHeap,0,LocalVar,(MaxLocalVarNum+1)*sizeof(VARIABLE));
+            VARIABLE *pVar = &LocalVar[MaxLocalVarNum];
+            MaxLocalVarNum++;
+
+            if( isRef ){
+                //参照型
+                pVar->fRef = REF_VARIABLE;
+                TypeSize = PTR_SIZE;
+            }
+            else pVar->fRef=0;
 
             for(i2=1,i3=0;i3<255;i3++){
                 //配列要素数
-                LocalVar[MaxLocalVarNum].SubScripts[i3]=SubScripts[i3];
+                pVar->SubScripts[i3]=SubScripts[i3];
 
                 if(SubScripts[i3]==-1) break;
@@ -1160 +1185 @@
             if(VarSize%8) VarSize+=8-(VarSize%8);
 
-            VARIABLE *pVar = &LocalVar[MaxLocalVarNum];
-
-            MaxLocalVarNum++;
-
             //変数データを追加
             lstrcpy(pVar->name,VarName);
-            pVar->fRef=0;
-            if(dwFlag & DIMFLAG_CONST) pVar->bConst = true;
+            if(dwFlags & DIMFLAG_CONST) pVar->bConst = true;
             else pVar->bConst = false;
             if(SubScripts[0]==-1) pVar->bArray=0;
@@ -1194 +1214 @@
                 if(!result){
                     //動的な式だった場合は代入演算を行う
-                    char temporary[8192];
-                    sprintf(temporary,"%s=%s",VarName,InitBuf);
-                    OpcodeCalc(temporary);
+                    if( isRef ){
+                        SetRefVariable( VarName, InitBuf );
+                    }
+                    else{
+                        char temporary[8192];
+                        sprintf(temporary,"%s=%s",VarName,InitBuf);
+                        OpcodeCalc(temporary);
+                    }
                 }
 
@@ -1227 +1252 @@
 
         //コンストラクタ呼び出し
-        if(TypeInfo.type==DEF_OBJECT&&(dwFlag&DIMFLAG_NONCALL_CONSTRACTOR)==0){
+        if(TypeInfo.type==DEF_OBJECT&&(dwFlags&DIMFLAG_NONCALL_CONSTRACTOR)==0&& isRef == false ){
             CallConstractor(VarName,SubScripts,TypeInfo,ConstractParameter);
         }
@@ -1239 +1264 @@
     }
 }
-void OpcodeDim(char *Parameter,DWORD dwFlag){
+void OpcodeDim(char *Parameter,DWORD dwFlags){
     int i,i2,i3,IsStr=0;
     char temporary[8192];
@@ -1261 +1286 @@
             temporary[i2]=0;
 
-            dim(temporary,dwFlag);
+            dim(temporary,dwFlags);
 
             if(Parameter[i]=='\0') break;
@@ -1322 +1347 @@
         }
     }
-    else if(pRelativeVar->dwKind==VAR_REFLOCAL){
+    else if( pRelativeVar->dwKind == VAR_REFLOCAL ){
         if(pRelativeVar->bOffsetOffset){
             //add r11,qword ptr[rsp+offset]