Changeset 49 in dev for BasicCompiler_Common/Variable.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• BasicCompiler_Common/Variable.cpp (modified) (3 diffs)

BasicCompiler_Common/Variable.cpp

@@ -297 +297 @@
     TYPEINFO TypeInfo = { DEF_OBJECT, (LONG_PTR)pobj_StringClass };
     return TypeInfo;
+}
+
+bool FormatUseProcReturnObject( const char *term, char *procName, char *parameter, int &RefType, char *member ){
+    int p1 = 0, p2 = 0;
+
+    for( int i=0; term[i]!='\0' ; i++ ){
+
+        if( term[i] == '[' ){
+            i = JumpStringInBracket( term, i + 1 );
+            continue;
+        }
+        if( term[i] == '(' ){
+            int temp_p = i;
+            i = JumpStringInPare( term, i + 1 ) + 1;
+            if( term[i] == '.'
+                || term[i] == 1 && term[i] == ESC_PSMEM ){
+                    p1 = temp_p;
+                    p2 = i;
+            }
+            continue;
+        }
+    }
+    if( !p1 ) return false;
+
+    //メソッド名
+    memcpy( procName, term, p1 );
+    procName[p1] = 0;
+
+    //パラメータ
+    memcpy( parameter, term + p1 + 1, p2 - p1 - 2 );
+    parameter[ p2 - p1 - 2 ] = 0;
+
+    //参照タイプ
+    if( term[p2] == '.' ){
+        RefType = DEF_OBJECT;
+    }
+    else{
+        RefType = DEF_PTR_OBJECT;
+        p2++;
+    }
+
+    //メンバ
+    lstrcpy( member, term + p2 + 1 );
+
+    return true;
 }
 
@@ -632 +677 @@
     extern BOOL bCompilingGlobal;
     int i;
+    LONG_PTR lpIndex;
     char variable[VN_SIZE],member[VN_SIZE],VarName[VN_SIZE],array[VN_SIZE],lpPtrOffset[VN_SIZE];
 
@@ -640 +686 @@
     else lstrcpy(variable,NameBuffer);
 
+
+    int RefType;
+    if( FormatUseProcReturnObject( variable, VarName, array, RefType, member ) ){
+        // 戻り値オブジェクトのメンバを直接参照しているとき
+        //例: func().member
+
+        void *pInfo;
+        int idProc=GetProc(VarName,&pInfo);
+
+        if(idProc){
+
+            int type=GetReturnTypeOfProc(idProc,pInfo,VarName,array,&lpIndex);
+
+            return GetMemberType((CClass *)lpIndex,member,plpIndex,1,bError);
+        }
+    }
+
+
+
     lstrcpy(VarName,variable);
-    GetVarFormatString(VarName,array,lpPtrOffset,member,&i);
+    GetVarFormatString(VarName,array,lpPtrOffset,member,&RefType);
 
     int *pSubScripts;
     int type;
-    LONG_PTR lpIndex;
 
     extern int MaxGlobalVarNum;