Changeset 103 in dev for BasicCompiler32/NumOpe.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• BasicCompiler32/NumOpe.cpp (modified) (3 diffs)

BasicCompiler32/NumOpe.cpp

@@ -257 +257 @@
         Type leftType;
         if( !TermOpe( termLeft, baseType, leftType, isLiteral, pbUseHeap, &isClassName ) ){
-            return false;
+            goto globalArea;
         }
 
@@ -836 +836 @@
                     //////////////
 
-                    i3 = CDBConst::obj.GetType(term);
+                    i3 = CDBConst::obj.GetBasicType(term);
                     if(i3){
+                        if( CDBConst::obj.IsStringPtr( term ) ){
+                            //リテラル文字列
+
+                            double dbl = CDBConst::obj.GetDoubleData(term);
+                            memcpy(&i64data,&dbl,sizeof(double));
+
+                            //バイト数
+                            i3=lstrlen((char *)i64data);
+
+                            memcpy(term,(char *)i64data,i3);
+                            term[i3]=0;
+                            goto StrLiteral;
+                        }
+
                         type_stack[sp]=i3;
                         if(IsRealNumberType(i3)){
@@ -850 +864 @@
                             goto Literal;
                         }
-                        /*else if(i3==DEF_STRING){
-                            //リテラル文字列
-
-                            //バイト数
-                            i3=(int)dbl;
-
-                            memcpy(term,temporary,i3);
-                            goto StrLiteral;
-                        }*/
                         else{
                             SetError(300,NULL,cp);