Changeset 97 in dev for BasicCompiler_Common/Subroutine.cpp

Timestamp:

Apr 16, 2007, 3:52:40 AM (17 years ago)

Author:

dai_9181

Message:

関数の戻り値オブジェクトのメンバ・メソッドを一時オブジェクトを介さずに参照できるようにした。

File:

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

BasicCompiler_Common/Subroutine.cpp

@@ -83 +83 @@
     }
 }
+bool SplitMemberName( const char *desc, char *object, char *member, CClass::RefType &refType ){
+    int lastIndex = -1;
+    for( int i=0; desc[i]; i++ ){
+        if( desc[i] == '(' ){
+            i=JumpStringInPare(desc,i+1);
+            continue;
+        }
+        else if( desc[i] == '[' ){
+            i=JumpStringInBracket(desc,i+1);
+            continue;
+        }
+        else if(desc[i]=='.'||(desc[i]==1&&desc[i+1]==ESC_PSMEM)){
+            lastIndex = i;
+        }
+    }
+    if( lastIndex == -1 ){
+        return false;
+    }
+
+    if(desc[lastIndex]=='.'){
+        lstrcpy(member,desc+lastIndex+1);
+        refType = CClass::Dot;
+    }
+    else{
+        lstrcpy(member,desc+lastIndex+2);
+        refType = CClass::Pointer;
+    }
+
+    if( object ){
+        lstrcpy( object, desc );
+        object[lastIndex]=0;
+    }
+
+    return true;
+}
 bool SplitMemberName( const char *desc, char *object, char *member ){
-    int i;
-    for(i=lstrlen(desc)-1;i>=0;i--){
-        if(desc[i]=='.'||(desc[i]==1&&desc[i+1]==ESC_PSMEM))
-            break;
-    }
-    if(i==-1) return false;
-    else{
-        if(desc[i]=='.')
-            lstrcpy(member,desc+i+1);
-        else
-            lstrcpy(member,desc+i+2);
-
-        if( object ){
-            lstrcpy( object, desc );
-            object[i]=0;
-        }
-    }
-
-    return true;
+    CClass::RefType dummyRefType;
+    return SplitMemberName( desc, object, member, dummyRefType );
 }
 
@@ -565 +583 @@
     SubNum++;
 
-
     UserProc *pUserProc = new UserProc( temporary, kind, isMacro, isCdecl, isExport );
     pUserProc->SetParentClass( pobj_c );
@@ -580 +597 @@
     // ※第1パラメータにに指定するデータの例："( s As String ) As String"
     pUserProc->SetParamsAndReturnType( buffer + i, nowLine, isStatic );
+
+#ifdef _DEBUG
+    pUserProc->_paramStr = buffer + i;
+#endif