Changeset 49 in dev for BasicCompiler_Common

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

BasicCompiler_Common

Files:

• NumOpe_GetType.cpp (modified) (12 diffs)
• StrOperation.cpp (modified) (2 diffs)
• Variable.cpp (modified) (3 diffs)
• Variable.h (modified) (1 diff)
• calculation.cpp (modified) (1 diff)
• common.h (modified) (1 diff)

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -327 +327 @@
                 index_stack[sp]=-1;
 
-                if(values[i][0]=='\"'){
+                char *term;
+                term = values[i];
+
+                if(term[0]=='\"'){
 StrLiteral:
 
@@ -349 +352 @@
                     bLiteralCalculation=0;
                 }
-                else if((values[i][0]=='e'||values[i][0]=='E')&&
-                    (values[i][1]=='x'||values[i][1]=='X')&&
-                    values[i][2]=='\"'){
+                else if((term[0]=='e'||term[0]=='E')&&
+                    (term[1]=='x'||term[1]=='X')&&
+                    term[2]=='\"'){
                     //拡張版リテラル文字列（エスケープシーケンス可能）
                     goto StrLiteral;
                 }
-                else if(IsVariableTopChar(values[i][0])||
-                    values[i][0]=='*'||
-                    (values[i][0]=='.'&&IsVariableTopChar(values[i][1]))){
+                else if(IsVariableTopChar(term[0])||
+                    term[0]=='*'||
+                    (term[0]=='.'&&IsVariableTopChar(term[1]))){
                     //////////////////
                     // 何らかの識別子
@@ -365 +368 @@
                     //////////////////////////////////////
 
-                    i2=GetCallProcName(values[i],temporary);
-                    if(values[i][i2]=='('){
-                        i4=GetStringInPare_RemovePare(temp2,values[i]+i2+1);
+                    i2=GetCallProcName(term,temporary);
+                    if(term[i2]=='('){
+                        i4=GetStringInPare_RemovePare(temp2,term+i2+1);
 
                         int idProc;
@@ -374 +377 @@
 
                         if(idProc){
-                            //閉じカッコ")"に続く文字がNULLでないときはエラーにする
-                            if(values[i][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);
+                                }
+                            }
 
 
@@ -400 +411 @@
 
                             //閉じカッコ")"に続く文字がNULLでないときはエラーにする
-                            if(values[i][i2+1+i4+1]!='\0') SetError(42,NULL,cp);
+                            if(term[i2+1+i4+1]!='\0') SetError(42,NULL,cp);
 
                             //マクロ関数の場合
@@ -416 +427 @@
                         }
                     }
-
+NonProc:
 
                     //インデクサ（getアクセサ）
                     char VarName[VN_SIZE],ArrayElements[VN_SIZE];
-                    GetArrayElement(values[i],VarName,ArrayElements);
+                    GetArrayElement(term,VarName,ArrayElements);
                     if(ArrayElements[0]){
                         CClass *pobj_c;
@@ -440 +451 @@
 
 
-                    i2=GetVarType(values[i],&index_stack[sp],0);
+                    i2=GetVarType(term,&index_stack[sp],0);
                     if(i2!=-1){
                         //////////
@@ -457 +468 @@
                     //////////////
 
-                    i3 = CDBConst::obj.GetType(values[i]);
+                    i3 = CDBConst::obj.GetType(term);
                     if(i3){
                         type[sp]=i3;
@@ -488 +499 @@
 
                     LONG_PTR lp;
-                    i3=GetTypeFixed(values[i],&lp);
+                    i3=GetTypeFixed(term,&lp);
                     if(i3!=-1){
                         type[sp]=i3|FLAG_CAST;
@@ -503 +514 @@
 
                     //配列要素を排除
-                    GetArrayElement(values[i],VarName,ArrayElements);
+                    GetArrayElement(term,VarName,ArrayElements);
 
                     if(GetSubHash(VarName,0)){
                         TYPEINFO RetTypeInfo;
-                        GetReturnTypeOfPropertyMethod(values[i],NULL,&RetTypeInfo);
+                        GetReturnTypeOfPropertyMethod(term,NULL,&RetTypeInfo);
 
                         //大きな型への暗黙の変換
@@ -523 +534 @@
                     //該当する識別子が見当たらないときはエラー扱いにする
                     bError=1;
-                    SetError(3,values[i],cp);
+                    SetError(3,term,cp);
                     type[sp]=DEF_DOUBLE;
                 }
@@ -531 +542 @@
                     base_type=0;
                     if(pBaseType) base_type=pBaseType->type;
-                    type[sp]=GetLiteralValue(values[i],&i64data,base_type);
+                    type[sp]=GetLiteralValue(term,&i64data,base_type);
 Literal:
                     if((long)i64data==0&&index_stack[sp]==-1) index_stack[sp]=LITERAL_NULL;

BasicCompiler_Common/StrOperation.cpp

@@ -317 +317 @@
     return i;
 }
-int JumpStringInPare(char *buffer,int pos){
+int JumpStringInPare(const char *buffer,int pos){
     int PareNum;
     for(PareNum=1;;pos++){
@@ -335 +335 @@
     return 0;
 }
-int JumpStringInBracket(char *buffer,int pos){
+int JumpStringInBracket(const char *buffer,int pos){
     int PareNum;
     for(PareNum=1;;pos++){

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;

BasicCompiler_Common/Variable.h

@@ -16 +16 @@
 void GetOriginalTypeName(char *buffer);
 BOOL GetTypeName(int type,LONG_PTR lpIndex,char *name);
+bool FormatUseProcReturnObject( const char *term, char *procName, char *parameter, int &RefType, char *member );
 BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember,int *pRefType);
 void GetArrayElement(char *buffer,char *variable,char *array_element);

BasicCompiler_Common/calculation.cpp

@@ -519 +519 @@
                         i2=lstrlen(Parms);
 
-StrLiteral:
                         nums[pnum]=i2;
                         StrPtr[pnum]=(char *)HeapAlloc(hHeap,0,i2+1);

BasicCompiler_Common/common.h

@@ -509 +509 @@
 int GetStringInPare_RemovePare(char *buffer,char *ReadBuffer);
 int GetStringInBracket(char *buffer,const char *ReadBuffer);
-int JumpStringInPare(char *buffer,int pos);
-int JumpStringInBracket(char *buffer,int pos);
+int JumpStringInPare(const char *buffer,int pos);
+int JumpStringInBracket(const char *buffer,int pos);
 int GetCpFromLine(int LineNum);
 BOOL GetLineNum(int pos,int *pLine,char *FileName);