Changeset 36 in dev for BasicCompiler_Common

Timestamp:

Jan 20, 2007, 4:55:26 AM (18 years ago)

Author:

dai_9181

Message:

Boolean型に対応。

Location:

BasicCompiler_Common

Files:

• BasicFixed.h (modified) (1 diff)
• Overload.cpp (modified) (1 diff)
• Variable.cpp (modified) (4 diffs)
• calculation.cpp (modified) (1 diff)

BasicCompiler_Common/BasicFixed.h

@@ -32 +32 @@
 #define DEF_DOUBLE      0x0000000A
 
+//bool型
+#define DEF_BOOLEAN     0x0000000B
+
 //文字列型
-#define DEF_STRING      0x0000000B
+#define DEF_STRING      0x0000000C
 
 //ポインタ型
-#define DEF_PTR_VOID    0x0000000C
-#define DEF_PTR_PROC    0x0000000D
+#define DEF_PTR_VOID    0x0000000D
+#define DEF_PTR_PROC    0x0000000E
 
 //特殊型

BasicCompiler_Common/Overload.cpp

@@ -46 +46 @@
 }
 
-BOOL OverloadCheck(PARAMETER_INFO *ppi1,int ParmNum1,PARAMETER_INFO *ppi2,int ParmNum2){
-    //パラメータの個数が不一致の場合
-    if(ParmNum1!=ParmNum2) return 0;
-
-    int i;
-    for(i=0;i<ParmNum1;i++){
-        if(ppi1[i].type!=ppi2[i].type) return 0;
-        else{
-            if(NATURAL_TYPE(ppi1[i].type)==DEF_OBJECT){
-                if(ppi1[i].u.index!=ppi2[i].u.index) return 0;
-            }
-        }
-    }
-
-    return 1;
-}
-BOOL OverloadCheckLevel2(PARAMETER_INFO *ppi1,int ParmNum1,PARAMETER_INFO *ppi2,int ParmNum2){
-    //パラメータの個数が不一致の場合
-    if(ParmNum1!=ParmNum2) return 0;
-
-    int i;
-    for(i=0;i<ParmNum1;i++){
-        if(ppi1[i].type!=ppi2[i].type){
-            if(!(
-                IsNaturalWholeNumberType(ppi1[i].type)&&IsNaturalWholeNumberType(ppi2[i].type)||
-                IsRealNumberType(ppi1[i].type)&&IsRealNumberType(ppi2[i].type)
-                )) return 0;
-        }
-        else{
-            if(NATURAL_TYPE(ppi1[i].type)==DEF_OBJECT){
-                if(ppi1[i].u.index!=ppi2[i].u.index) return 0;
-            }
-        }
-    }
-
-    return 1;
-}
 SUBINFO *OverloadSolution(char *name,SUBINFO **ppsi,int num,PARAMETER_INFO *ppi,int ParmNum,TYPEINFO *pReturnTypeInfo){
     // オーバーロードの解決

BasicCompiler_Common/Variable.cpp

@@ -56 +56 @@
 }
 BOOL IsWholeNumberType(int type){
-    return (IsNaturalWholeNumberType(type)||IsPtrType(type));
+    return (
+        IsNaturalWholeNumberType(type)
+        || IsPtrType(type)
+        || type == DEF_BOOLEAN
+        );
 }
 BOOL IsRealNumberType(int type){
@@ -132 +136 @@
     else if(type==DEF_INTEGER||type==DEF_WORD)
         return sizeof(WORD);
-    else if(type==DEF_CHAR||type==DEF_BYTE)
+    else if(type==DEF_CHAR||type==DEF_BYTE || type == DEF_BOOLEAN)
         return sizeof(BYTE);
 
@@ -187 +191 @@
     else if(lstrcmpi(TypeName,"Double")==0)     return DEF_DOUBLE;
 
+    //bool型
+    else if( lstrcmpi( TypeName, "Boolean" ) == 0 ) return DEF_BOOLEAN;
+
     //ポインタ型
     //※VoidPtr型以外のポインタ型はTypeDef宣言により定義される
@@ -253 +260 @@
     else if(type==DEF_SINGLE)       lstrcpy(name,"Single");
     else if(type==DEF_DOUBLE)       lstrcpy(name,"Double");
+
+    //bool型
+    else if(type==DEF_BOOLEAN)      lstrcpy(name,"Boolean");
 
     //オブジェクト

BasicCompiler_Common/calculation.cpp

@@ -628 +628 @@
                                     }
                                 }
+                                else if(i2==DEF_BOOLEAN){
+                                    BYTE byteData;
+                                    if(i3=ReadProcessMemory(hDebugProcess,offset,&byteData,sizeof(BYTE),&stAccBytes)){
+                                        i64nums[pnum]=(_int64)byteData;
+                                    }
+                                }
                                 else return 0;