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

Timestamp:

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

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/calculation.cpp (modified) (8 diffs)

trunk/abdev/BasicCompiler_Common/calculation.cpp

@@ -726 +726 @@
                         //リテラル値
                         StrPtr[pnum]=0;
-                        type[pnum]=GetLiteralValue(Parms,&i64data,BaseType);
+                        type[pnum]=GetLiteralValue(Parms,&i64data,BaseType, enableerror);
+                        if( type[pnum] == -1 )
+                        {
+                            // エラー
+                            return false;
+                        }
                         if(IsRealNumberType(type[pnum])){
                             //実数型
@@ -969 +974 @@
 #pragma optimize("", off)
 #pragma warning(disable : 4748)
-DWORD GetLiteralValue(char *value,_int64 *pi64,int BaseType){
+DWORD GetLiteralValue(char *value,_int64 *pi64,int BaseType, bool isNotifyError ){
     extern HANDLE hHeap;
     extern int cp;
@@ -987 +992 @@
             }
             if(temporary[i]){
+                if( !isNotifyError )
+                {
+                    return -1;
+                }
                 SetError(57,NULL,cp);
                 return DEF_BYTE;
@@ -1009 +1018 @@
             }
             if(temporary[i]){
+                if( !isNotifyError )
+                {
+                    return -1;
+                }
                 SetError(58,NULL,cp);
                 return DEF_BYTE;
@@ -1021 +1034 @@
         }
         else{
+            if( !isNotifyError )
+            {
+                return -1;
+            }
             SetError(12,"&",cp);
             return DEF_BYTE;
@@ -1070 +1087 @@
                     if(bDebugRun) return DEF_DOUBLE;
 
+                    if( !isNotifyError )
+                    {
+                        return -1;
+                    }
+
                     SetError(3,value,cp);
                     return DEF_DOUBLE;
@@ -1111 +1133 @@
     if(bDebugRun) return DEF_DOUBLE;
 
+    if( !isNotifyError )
+    {
+        return -1;
+    }
+
     SetError(33,NULL,cp);
     return DEF_DOUBLE;
@@ -1116 +1143 @@
 #pragma optimize("", on)
 
-int IsStrCalculation(char *Command){
+int IsStrCalculation(const char *Command){
     int i,i2,i3,i4,PareNum;
     char temporary[VN_SIZE],temp2[8192];