Changeset 415 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Mar 6, 2008, 11:19:38 PM (17 years ago)

Author:

dai_9181

Message:

代入演算時の左辺に関数呼び出しの戻り値を評価してメンバを取得するようなコードが存在するとき、エラーになってしまっていたので改修した。（32bit版のみ対応）

Location:

trunk/abdev/BasicCompiler_Common

Files:

• NumOpe_GetType.cpp (modified) (6 diffs)
• common.h (modified) (1 diff)
• hash.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -298 +298 @@
 }
 
-bool GetMemberTermType( const Type &leftType, const Type &baseType, Type &resultType, const char *termFull, const char *termLeft, const char *member )
+bool GetMemberTermType( const Type &leftType, const Type &baseType, Type &resultType, const char *termFull, const char *termLeft, const char *member, bool *pIsVariable )
 {
     ////////////////////////////////
@@ -325 +325 @@
     if( GetMemberType( leftType, member, resultType, 0, false ) ){
         // メンバが見つかったとき
+
+        if( pIsVariable )
+        {
+            *pIsVariable = true;
+        }
+
         return true;
     }
@@ -357 +363 @@
 }
 
-bool GetTermType( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, bool *pIsClassName )
+bool GetTermType( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, bool *pIsClassName, bool *pIsVariable )
 {
     char parameter[VN_SIZE];
@@ -415 +421 @@
         }
 
-        return GetMemberTermType( leftType, baseType, resultType, termFull, termLeft, member );
+        return GetMemberTermType( leftType, baseType, resultType, termFull, termLeft, member, pIsVariable );
     }
 
@@ -551 +557 @@
         isLiteral = false;
 
+        if( pIsVariable )
+        {
+            // 変数である
+            *pIsVariable = true;
+        }
+
         return true;
     }
@@ -572 +584 @@
 
     return false;
+}
+
+bool GetTermType( const char *term, Type &resultType )
+{
+    bool isLiteral;
+    return GetTermType( term, Type(), resultType, isLiteral );
+}
+
+bool GetTermTypeOnlyVariable( const char *term, Type &resultType )
+{
+    bool isLiteral, isVariable = false;
+    bool result = GetTermType( term, Type(), resultType, isLiteral, NULL, &isVariable );
+    return ( result && isVariable );
 }
 

trunk/abdev/BasicCompiler_Common/common.h

@@ -350 +350 @@
 int AutoBigCast(int BaseType,int CalcType);
 BOOL CheckCalcType(int idCalc,int *type,int sp);
-bool GetTermType( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, bool *pIsClassName = NULL );
+bool GetTermType( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, bool *pIsClassName = NULL, bool *pIsVariable = NULL );
+bool GetTermType( const char *term, Type &resultType );
+bool GetTermTypeOnlyVariable( const char *term, Type &resultType );
 bool NumOpe_GetType( const char *expression, const Type &baseType, Type &resultType, bool *pIsLiteralCalculation = NULL );
 

trunk/abdev/BasicCompiler_Common/hash.cpp

@@ -72 +72 @@
             //"->"によってオブジェクトを指定する通常のメンバ関数呼び出し
             Type type;
-            if( GetVarType(ObjName,type,0) ){
-                pobj_c = &type.GetClass();
+            if( GetTermType(ObjName,type) )
+            {
+                if( type.IsObject() )
+                {
+                    pobj_c = &type.GetClass();
+                }
             }
-            else{
+
+            if( !pobj_c )
+            {
                 pobj_c=compiler.GetObjectModule().meta.GetClasses().Find(ObjName);
                 if( pobj_c ){