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

Timestamp:

Jul 31, 2007, 4:30:31 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

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

trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -542 +542 @@
 }
 
-bool NumOpe_GetType( const char *expression, const Type &baseType, Type &resultType ){
+bool NumOpe_GetType( const char *expression, const Type &baseType, Type &resultType, bool *pIsLiteralCalculation ){
     extern int cp;
     int i,i3;
+
+    //リテラル値のみの計算かどうかを判別するためのフラグ
+    bool dummyBool;
+    if( pIsLiteralCalculation == NULL )
+    {
+        pIsLiteralCalculation = &dummyBool;
+    }
+    *pIsLiteralCalculation = true;
 
     if(expression[0]=='\0'){
@@ -553 +561 @@
     if(expression[0]==1&& expression[1]==ESC_NEW ){
         //New演算子（オブジェクト生成）
+        *pIsLiteralCalculation = false;
         return Operator_New_GetType(expression+2,baseType, resultType );
     }
@@ -590 +599 @@
     BOOL bError;
     bError=0;
-
-    //リテラル値のみの計算かどうかを判別するためのフラグ
-    BOOL bLiteralCalculation=1;
 
     int sp;
@@ -684 +690 @@
                         type_stack[sp]=DEF_OBJECT;
                         index_stack[sp]=(LONG_PTR)compiler.GetMeta().GetClasses().GetStringClassPtr();
-                        bLiteralCalculation=0;
+                        *pIsLiteralCalculation = false;
 
                         sp++;
@@ -691 +697 @@
 
                     type_stack[sp]=typeOfPtrChar;
-                    bLiteralCalculation=0;
+                    *pIsLiteralCalculation = false;
                 }
                 else if((term[0]=='e'||term[0]=='E')&&
@@ -711 +717 @@
 
                         if( !isLiteral ){
-                            bLiteralCalculation=0;
+                            *pIsLiteralCalculation = false;
                         }
 
@@ -730 +736 @@
                             index_stack[sp] = (LONG_PTR)compiler.GetMeta().GetClasses().GetObjectClassPtr();
                         }
-                        bLiteralCalculation = 0;
+                        *pIsLiteralCalculation = false;
                         sp++;
                         break;
@@ -784 +790 @@
 
                         index_stack[sp]=tempType.GetIndex();
-                        bLiteralCalculation=0;
+                        *pIsLiteralCalculation = false;
 
                         sp++;
@@ -900 +906 @@
     }
 
-    if(bLiteralCalculation){
+    if( *pIsLiteralCalculation ){
         //右辺値が数値の定数式の場合
         int base_type = 0;