Changeset 331 in dev for trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

Timestamp:

Sep 27, 2007, 1:47:46 AM (17 years ago)

Author:

dai_9181

Message:

AddressOfの左辺値を加味した処理を簡潔にした

File:

• trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp (modified) (5 diffs)

trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -301 +301 @@
 }
 
-bool GetTermType( const char *term, Type &resultType, bool &isLiteral, bool *pIsClassName )
+bool GetTermType( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, bool *pIsClassName )
 {
     char parameter[VN_SIZE];
@@ -330 +330 @@
         bool isClassName = false;
         Type leftType;
-        if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
+        if( GetTermType( termLeft, Type(), leftType, isLiteral, &isClassName ) ){
             if( isClassName == false && compiler.GetObjectModule().meta.GetBlittableTypes().IsExist( leftType ) ){
                 // 左側のオブジェクト部分がBlittable型のとき
@@ -340 +340 @@
                     temporary );
 
-                if( !GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
+                if( !GetTermType( termLeft, Type(), leftType, isLiteral, &isClassName ) ){
                     goto globalArea;
                 }
@@ -446 +446 @@
             ////////////////
 
-            if( !CallProc(idProc,pProc,procName,parameter, resultType, false ) ){
+            if( !CallProc(idProc,pProc,procName,parameter, baseType, resultType, false ) ){
                 return false;
             }
@@ -716 +716 @@
 
                     bool isLiteral = true;
-                    if( GetTermType( term, resultType, isLiteral ) ){
+                    if( GetTermType( term, baseType, resultType, isLiteral ) ){
                         type_stack[sp] = resultType.GetBasicType();
                         index_stack[sp] = resultType.GetIndex();