Changeset 416 in dev for trunk/abdev/BasicCompiler64/NumOpe.cpp

Timestamp:

Mar 6, 2008, 11:28:05 PM (16 years ago)

Author:

dai_9181

Message:

[415]を64bit版にマージ。

File:

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

trunk/abdev/BasicCompiler64/NumOpe.cpp

@@ -130 +130 @@
     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();
@@ -166 +166 @@
                 compiler.codeGenerator.op_mov_RR( REG_R11, useReg );
 
-                RELATIVE_VAR relativeVar;
-                relativeVar.dwKind=VAR_DIRECTMEM;
+                RELATIVE_VAR tempRelativeVar;
+                tempRelativeVar.dwKind=VAR_DIRECTMEM;
 
                 if( !_member_offset(
@@ -173 +173 @@
                     false,  //読み込み専用
                     leftType,
-                    VarName,&relativeVar,classType,0))
-                {
-                    return false;
+                    VarName,&tempRelativeVar,classType,0)){
+                        return false;
                 }
 
                 // オブジェクトメンバのポインタをraxにコピー
-                if( !VarToReg( relativeVar, baseType, resultType ) ){
+                if( !VarToReg( tempRelativeVar, baseType, resultType ) ){
                     SetError(11,termFull,cp);
                 }
@@ -222 +221 @@
         compiler.codeGenerator.op_mov_RR( REG_R11, useReg );
 
-        RELATIVE_VAR relativeVar;
         relativeVar.dwKind=VAR_DIRECTMEM;
 
@@ -233 +231 @@
         }
 
-        if( !VarToReg( relativeVar, baseType, resultType ) ){
-            SetError(11,termFull,cp);
-        }
+        // 変数として扱う
+        isVariable = true;
 
         return true;
@@ -268 +265 @@
 
                 // まずはプロパティ値を取得
-                TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, methodName );
+                bool dummyIsVariable;
+                RELATIVE_VAR dummyRelativeVar;
+                TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, methodName, dummyIsVariable, dummyRelativeVar );
 
                 // 戻り値のオブジェクトインスタンスのインデクサを呼び出す
@@ -275 +274 @@
                 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 );
             }
 
@@ -333 +332 @@
     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];
 
@@ -373 +373 @@
         }
 
-        if( !TermOpe( termLeft, baseType, leftType, isLiteral, pbUseHeap, true, &isClassName ) ){
+        if( !TermOpe( termLeft, baseType, leftType, isLiteral, pbUseHeap, &isClassName ) ){
             goto globalArea;
         }
@@ -391 +391 @@
         }
 
-        return TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, member );
+        return TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, member, isVariable, relativeVar );
     }
 globalArea:
@@ -554 +554 @@
     ////////////////////////////////
 
-    RELATIVE_VAR relativeVar;
     if(GetVarOffset(
         false,  //エラー表示なし
-        false,  //読み込み専用
+        isWriteAccess,
         termFull,
         &relativeVar,resultType)){
@@ -564 +563 @@
         //////////
 
-        if( !VarToReg( relativeVar, baseType, resultType ) ){
-            SetError(11,termFull,cp);
-        }
+        // 変数として扱う
+        isVariable = true;
 
         isLiteral = false;
@@ -637 +635 @@
     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;
+}
+
 
 bool _numope( int *pReg,