Changeset 49 in dev for BasicCompiler32

Timestamp:

Feb 10, 2007, 6:13:37 AM (17 years ago)

Author:

dai_9181

Message:

戻り値オブジェクトのメンバを直接的に参照できるようにした。

Location:

BasicCompiler32

Files:

• Compile_Var.cpp (modified) (2 diffs)
• NumOpe.cpp (modified) (2 diffs)
• Opcode.h (modified) (1 diff)

BasicCompiler32/Compile_Var.cpp

@@ -362 +362 @@
     extern BOOL bCompilingGlobal;
     int i,RefType;
+    LONG_PTR lpIndex;
     char variable[VN_SIZE],member[VN_SIZE],VarName[VN_SIZE],array[VN_SIZE],lpPtrOffset[VN_SIZE];
 
@@ -370 +371 @@
     else lstrcpy(variable,NameBuffer);
 
+
+    if( FormatUseProcReturnObject( variable, VarName, array, RefType, member ) ){
+        // 戻り値オブジェクトのメンバを直接参照しているとき
+        //例: func().member
+
+        void *pInfo;
+        int idProc=GetProc(VarName,&pInfo);
+
+        if(idProc){
+            pRelativeVar->dwKind=VAR_DIRECTMEM;
+
+
+            ////////////////
+            // 呼び出し
+            ////////////////
+
+            *pType=CallProc(idProc,pInfo,VarName,array,&lpIndex);
+
+            //戻り値をecxにコピー
+            op_mov_RR( REG_ECX, REG_EAX );
+
+
+            LONG_PTR lp2;
+            if(!GetMemberOffset(
+                isErrorEnabled,
+                isWriteAccess,
+                (CClass *)lpIndex,
+                member,pType,pRelativeVar,&lp2,0)) return 0;
+            if(plpIndex) *plpIndex=lp2;
+
+            return 1;
+        }
+    }
+
+
     lstrcpy(VarName,variable);
     GetVarFormatString(VarName,array,lpPtrOffset,member,&RefType);
 
-    LONG_PTR lpIndex;
     int *pSubScripts;
     bool bConst;

BasicCompiler32/NumOpe.cpp

@@ -284 +284 @@
 
                         if(idProc){
-                            //閉じカッコ")"に続く文字がNULLでないときはエラーにする
-                            if(term[i2+1+i4+1]!='\0') SetError(42,NULL,cp);
+                            //閉じカッコ")"に続く文字がNULLでないとき
+                            if(term[i2+1+i4+1]!='\0'){
+                                if( term[i2+1+i4+1] == '.'
+                                    || term[i2+1+i4+1] == 1 && term[i2+1+i4+2] == ESC_PSMEM ){
+                                        goto NonProc;
+                                }
+                                else{
+                                    SetError(42,NULL,cp);
+                                }
+                            }
 
                             ////////////////
@@ -351 +359 @@
                         }
                     }
+NonProc:
 
 

BasicCompiler32/Opcode.h

@@ -33 +33 @@
 #define VAR_DIRECTMEM   4   //Direct memory
 
+
 extern int cp;
 extern int obp;
 extern char *OpBuffer;
+
+#define breakpoint OpBuffer[obp++]=(char)0xCC;
+
 
 //ラベルアドレス