Changeset 103 in dev for BasicCompiler_Common/NumOpe_GetType.cpp

Timestamp:

May 2, 2007, 4:08:58 AM (17 years ago)

Author:

dai_9181

Message:

名前空間機能をグローバル変数、定数と列挙型に適用。
一部、クラスの静的メンバと名前空間の相性が悪いコードが潜んでいるため、要改修

File:

• BasicCompiler_Common/NumOpe_GetType.cpp (modified) (4 diffs)

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -323 +323 @@
         Type leftType;
         if( !GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
-            return false;
+            goto globalArea;
         }
 
@@ -658 +658 @@
                     // 何らかの識別子
 
+                        if( (string)term=="ParentArea2.xxxxxx"){
+                            int test=0;
+                        }
+
                     bool isLiteral = true;
                     if( GetTermType( term, resultType, isLiteral ) ){
@@ -693 +697 @@
                     //////////////
 
-                    i3 = CDBConst::obj.GetType(term);
+                    i3 = CDBConst::obj.GetBasicType(term);
                     if(i3){
+                        if( CDBConst::obj.IsStringPtr( term ) ){
+                            //リテラル文字列
+                            goto StrLiteral;
+                        }
+
                         type_stack[sp]=i3;
                         if(IsRealNumberType(i3)){
@@ -708 +717 @@
                             goto Literal;
                         }
-                        else if(i3==DEF_STRING){
-                            //リテラル文字列
-                            goto StrLiteral;
-                        }
                         else{
                             SetError(1,NULL,0);