Changeset 103 in dev for BasicCompiler_Common/calculation.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• BasicCompiler_Common/calculation.cpp (modified) (3 diffs)

BasicCompiler_Common/calculation.cpp

@@ -653 +653 @@
                         /////////
                         StrPtr[pnum]=0;
-                        type[pnum] = CDBConst::obj.GetType(Parms);
+                        type[pnum] = CDBConst::obj.GetBasicType(Parms);
                         if(type[pnum]){
                             if(IsRealNumberType(type[pnum])){
@@ -900 +900 @@
                     }
                 }
+
+                if( type_stack[sp-1] == DEF_OBJECT || type_stack[sp-1] == DEF_STRUCT ){
+                    // リテラル値ではないため抜け出す
+                    return false;
+                }
+
                 type_stack[sp-2]=type_stack[sp-1];
                 index_stack[sp-2]=index_stack[sp-1];
@@ -1299 +1305 @@
 
                 //定数
-                i3 = CDBConst::obj.GetType(Command+i2);
+                i3 = CDBConst::obj.GetBasicType(Command+i2);
                 if(i3==DEF_STRING) return 1;    //文字列
                 if(i3) return 0;            //数値