Changeset 429 in dev for trunk

Timestamp:

Mar 11, 2008, 4:01:03 PM (16 years ago)

Author:

dai_9181

Message:

PareOrBracket列挙型を導入。

Location:

trunk/abdev

Files:

• BasicCompiler32/NumOpe.cpp (modified) (3 diffs)
• BasicCompiler_Common/VariableOpe.cpp (modified) (2 diffs)
• BasicCompiler_Common/VariableOpe.h (modified) (2 diffs)

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -249 +249 @@
     char methodName[VN_SIZE], lpPtrOffset[VN_SIZE], parameter[VN_SIZE], dummy[1];
     ReferenceKind refType;
-    bool isParameterInBracket = false;
+    PareOrBracket pareOrBracket = None;
     lstrcpy( methodName, member );
-    GetVarFormatString( methodName, parameter, lpPtrOffset, dummy, refType, &isParameterInBracket );
+    GetVarFormatString( methodName, parameter, lpPtrOffset, dummy, refType, &pareOrBracket );
 
     objClass.EnumDynamicMethodsOrInterfaceMethods( methodName, userProcs );
@@ -264 +264 @@
                 && parameter[0]                             // 実引数は1つ以上
                 && pUserProc->ReturnType().IsObject()       // 戻り値がクラス型の場合
-                && isParameterInBracket )                   // 実引数は[]で囲まれている
+                && pareOrBracket == Bracket )               // 実引数は[]で囲まれている
             {
                 // プロパティ値として返ってきたオブジェクトインスタンスのインデクサを呼び出す
@@ -317 +317 @@
             
             return true;
+        }
+    }
+    else if( pareOrBracket == Pare )
+    {
+        // 関数ポインタ
+        SetError();
+
+        ///////////////////////////////////////////////////////////////////
+        // メンバを検索
+        ///////////////////////////////////////////////////////////////////
+        if( GetMemberType( leftType, methodName, resultType, 0, false ) ){
+            // メンバが見つかったとき
         }
     }

trunk/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ -290 +290 @@
 
 
-BOOL GetVarFormatString( char *buffer,char *array,char *array2,char *NestMember,ReferenceKind &refType, bool *pIsParameterInBracket ){
+BOOL GetVarFormatString( char *buffer,char *array,char *array2,char *NestMember,ReferenceKind &refType, PareOrBracket *pPareOrBracket ){
     extern int cp;
     int i,i2,i3;
@@ -318 +318 @@
             }
 
-            if( pIsParameterInBracket )
+            if( pPareOrBracket )
             {
                 // []なのか、()なのかを伝える
                 if( cPare_Open == '[' )
                 {
-                    *pIsParameterInBracket = true;
+                    *pPareOrBracket = Bracket;
                 }
                 else
                 {
-                    *pIsParameterInBracket = false;
+                    *pPareOrBracket = Pare;
                 }
             }

trunk/abdev/BasicCompiler_Common/VariableOpe.h

@@ -3 +3 @@
 class Type;
 class CClass;
+
+enum PareOrBracket
+{
+    None = 0,
+    Pare,           // (...)
+    Bracket,        // [...]
+};
 
 BOOL IsPtrType(int type);
@@ -16 +23 @@
 Type GetStringTypeInfo();
 void GetWithName(char *buffer);
-BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember, ReferenceKind &refType, bool *pIsParameterInBracket = NULL );
+BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember, ReferenceKind &refType, PareOrBracket *pPareOrBracket = NULL );
 void GetArrayElement( const char *buffer,char *variable,char *array_element);
 BOOL CheckVarNameError(char *name,int nowLine);