Changeset 9 in dev for BasicCompiler64/NumOpe.cpp

Timestamp:

Dec 7, 2006, 3:10:13 AM (18 years ago)

Author:

dai_9181

Message:

Constステートメントで定数変数を宣言できるように改良。

File:

• BasicCompiler64/NumOpe.cpp (modified) (4 diffs)

BasicCompiler64/NumOpe.cpp

@@ -490 +490 @@
                     //////////////
 
-                    i3=GetConstValue(term,&dbl,temporary,&index_stack[sp]);
-                    if(i3!=-1){
-                        type[sp]=i3;
+                    i3 = CDBConst::obj.GetType(term);
+                    if(i3){
+                        type[sp] = i3;
                         if(IsRealNumberType(i3)){
                             //実数
+                            double dbl = CDBConst::obj.GetDoubleData(term);
                             memcpy(&i64data,&dbl,sizeof(double));
                             goto Literal;
@@ -500 +501 @@
                         else if(IsWholeNumberType(i3)){
                             //整数
-                            i64data=(_int64)dbl;
+                            i64data = CDBConst::obj.GetWholeData(term);
                             goto Literal;
                         }
-                        else if(Is64Type(i3)){
-                            //64ビット整数値
-                            memcpy(&i64data,&dbl,sizeof(_int64));
-                            goto Literal;
-                        }
-                        else if(i3==DEF_STRING){
+                        /*else if(i3==DEF_STRING){
                             //リテラル文字列
 
@@ -516 +512 @@
                             memcpy(term,temporary,i3);
                             goto StrLiteral;
-                        }
+                        }*/
                         else{
                             SetError(1,NULL,0);
@@ -522 +518 @@
                         }
                     }
+