Changeset 415 in dev for trunk/abdev/BasicCompiler32/NumOpe.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/abdev/BasicCompiler32/NumOpe.cpp (modified) (13 diffs)

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -140 +140 @@
     return true;
 }
-bool TermMemberOpe( const Type &leftType, const Type &baseType, Type &resultType, const char *termFull, const char *termLeft, const char *member )
+bool TermMemberOpe( const Type &leftType, const Type &baseType, Type &resultType, const char *termFull, const char *termLeft, const char *member, bool &isVariable, RELATIVE_VAR &relativeVar )
 {
     const CClass &objClass = leftType.GetClass();
@@ -179 +179 @@
                 compiler.codeGenerator.op_mov_RR( REG_ECX, useReg );
 
-                RELATIVE_VAR relativeVar;
-                relativeVar.dwKind=VAR_DIRECTMEM;
+                RELATIVE_VAR tempRelativeVar;
+                tempRelativeVar.dwKind=VAR_DIRECTMEM;
 
                 if( !_member_offset(
@@ -186 +186 @@
                     false,  //読み込み専用
                     leftType,
-                    VarName,&relativeVar,classType,0)){
+                    VarName,&tempRelativeVar,classType,0)){
                         return false;
                 }
 
                 // オブジェクトメンバのポインタをeaxにコピー
-                if( !VarToReg( relativeVar, baseType, resultType ) ){
+                if( !VarToReg( tempRelativeVar, baseType, resultType ) ){
                     SetError(11,termFull,cp);
                 }
@@ -225 +225 @@
         compiler.codeGenerator.op_mov_RR( REG_ECX, useReg );
 
-        RELATIVE_VAR relativeVar;
         relativeVar.dwKind=VAR_DIRECTMEM;
 
@@ -236 +235 @@
         }
 
-        if( !VarToReg( relativeVar, baseType, resultType ) ){
-            SetError(11,termFull,cp);
-        }
+        // 変数として扱う
+        isVariable = true;
 
         return true;
@@ -271 +269 @@
 
                 // まずはプロパティ値を取得
-                TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, methodName );
+                bool dummyIsVariable;
+                RELATIVE_VAR dummyRelativeVar;
+                TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, methodName, dummyIsVariable, dummyRelativeVar );
 
                 // 戻り値のオブジェクトインスタンスのインデクサを呼び出す
@@ -278 +278 @@
                 sprintf( temp2, "%s.%s", termLeft, methodName );
                 Type classType = resultType;
-                return TermMemberOpe( classType, baseType, resultType, termFull, temp2, temporary );
+                return TermMemberOpe( classType, baseType, resultType, termFull, temp2, temporary, isVariable, relativeVar );
             }
 
@@ -324 +324 @@
     return false;
 }
-bool TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool isWantObject, bool *pIsClassName, bool isProcedureCallOnly ){
+bool _TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool *pIsClassName, bool isProcedureCallOnly, bool &isVariable, RELATIVE_VAR &relativeVar, bool isWriteAccess )
+{
     char parameter[VN_SIZE];
 
@@ -364 +365 @@
         }
 
-        if( !TermOpe( termLeft, baseType, leftType, isLiteral, pbUseHeap, true, &isClassName ) ){
+        if( !TermOpe( termLeft, baseType, leftType, isLiteral, pbUseHeap, &isClassName ) ){
             goto globalArea;
         }
@@ -382 +383 @@
         }
 
-        return TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, member );
+        return TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, member, isVariable, relativeVar );
     }
 globalArea:
@@ -545 +546 @@
     ////////////////////////////////
 
-    RELATIVE_VAR relativeVar;
     if(GetVarOffset(
         false,  //エラー表示なし
-        false,  //読み込み専用
+        isWriteAccess,
         termFull,
         &relativeVar,resultType)){
@@ -555 +555 @@
         //////////
 
-        if( !VarToReg( relativeVar, baseType, resultType ) ){
-            SetError(11,termFull,cp);
-        }
+        // 変数として扱う
+        isVariable = true;
 
         isLiteral = false;
@@ -610 +609 @@
 
     return false;
+}
+
+bool TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool *pIsClassName, bool isProcedureCallOnly, bool isWriteAccess )
+{
+    RELATIVE_VAR relativeVar;
+    bool isVariable = false;
+    bool result = _TermOpe( term, baseType, resultType, isLiteral, pbUseHeap, pIsClassName, isProcedureCallOnly, isVariable, relativeVar, isWriteAccess );
+
+    if( isVariable )
+    {
+        // 変数の場合はeaxに変数ポインタを格納する
+        if( !VarToReg( relativeVar, baseType, resultType ) ){
+            SetError(11,term,cp);
+        }
+    }
+
+    return result;
+}
+bool TermOpeOnlyVariable( const char *term, Type &resultType, RELATIVE_VAR &relativeVar, bool isWriteAccess )
+{
+    bool isLiteral, isVariable = false;
+    bool result = _TermOpe( term, Type(), resultType, isLiteral, NULL, NULL, false, isVariable, relativeVar, isWriteAccess );
+
+    if( !isVariable )
+    {
+        SetError();
+    }
+
+    return result;
 }