Changeset 46 in dev for BasicCompiler_Common

Timestamp:

Feb 6, 2007, 1:19:17 AM (17 years ago)

Author:

dai_9181

Message:

VarPtrの戻り値の型をVoidPtrではなく、ポインタレベルを増加した型にした。
関連関数のパラメータにconstを適用。

Location:

BasicCompiler_Common

Files:

• BasicFixed.h (modified) (1 diff)
• Class.cpp (modified) (9 diffs)
• Class.h (modified) (6 diffs)
• Overload.cpp (modified) (1 diff)
• Subroutine.cpp (modified) (1 diff)
• TypeDef.cpp (modified) (3 diffs)
• TypeDef.h (modified) (2 diffs)
• Variable.cpp (modified) (1 diff)
• Variable.h (modified) (1 diff)
• common.h (modified) (4 diffs)
• error.cpp (modified) (2 diffs)
• hash.cpp (modified) (2 diffs)

BasicCompiler_Common/BasicFixed.h

@@ -54 +54 @@
 #define NATURAL_TYPE(t) ((t)&MASK_NATURAL)
 #define MAKE_PTR_TYPE(t,p)  ((t)|((p)<<8))
-#define PTR_LEVEL_UP(t)     MAKE_PTR_TYPE(NATURAL_TYPE(t),PTR_LEVEL(t)+1)
-#define PTR_LEVEL_DOWN(t)   MAKE_PTR_TYPE(NATURAL_TYPE(t),PTR_LEVEL(t)-1)
+#define PTR_LEVEL_UP(t)     t = MAKE_PTR_TYPE(NATURAL_TYPE(t),PTR_LEVEL(t)+1)
+#define PTR_LEVEL_DOWN(t)   t = MAKE_PTR_TYPE(NATURAL_TYPE(t),PTR_LEVEL(t)-1)
 
 #define DEF_PTR_BYTE    MAKE_PTR_TYPE(DEF_BYTE,1)

BasicCompiler_Common/Class.cpp

@@ -181 +181 @@
 
 
-CClass::CClass(char *name){
+CClass::CClass(const char *name){
     memset(this,0,sizeof(CClass));
 
@@ -316 +316 @@
     iStaticMethodNum++;
 }
-BOOL CClass::DupliCheckAll(char *name){
+BOOL CClass::DupliCheckAll(const char *name){
     //重複チェック
 
@@ -333 +333 @@
     return 0;
 }
-BOOL CClass::DupliCheckMember(char *name){
+BOOL CClass::DupliCheckMember(const char *name){
     //重複チェック
 
@@ -374 +374 @@
     return ppobj_StaticMethod[i];
 }
-bool CClass::IsExistMethod( char *name ){
+bool CClass::IsExistMethod( const char *name ){
     for( int i=0; i<iMethodNum; i++ ){
         if( lstrcmp( ppobj_Method[i]->psi->name, name ) == 0 ) return true;
@@ -380 +380 @@
     return false;
 }
-bool CClass::IsExistStaticMethod( char *name ){
+bool CClass::IsExistStaticMethod( const char *name ){
     for( int i=0; i<iStaticMethodNum; i++ ){
         if( lstrcmp( ppobj_StaticMethod[i]->psi->name, name ) == 0 ) return true;
@@ -538 +538 @@
 
 
-int CDBClass::hash(char *name){
+int CDBClass::hash(const char *name){
     int key;
 
@@ -584 +584 @@
 }
 
-CClass *CDBClass::check(char *name){
+CClass *CDBClass::check(const char *name){
     int key;
     key=hash(name);
@@ -604 +604 @@
 }
 
-CClass *CDBClass::AddClass(char *name,int NowLine){
+CClass *CDBClass::AddClass(const char *name,int NowLine){
     //////////////////////////////////////////////////////////////////////////
     // クラスを追加
@@ -849 +849 @@
 }
 
-void CDBClass::GetClass_recur(char *lpszInheritsClass){
+void CDBClass::GetClass_recur(const char *lpszInheritsClass){
     extern char *basbuf;
     int i,i2,i3,sub_address,top_pos;

BasicCompiler_Common/Class.h

@@ -95 +95 @@
 
 public:
-    CClass(char *name);
+    CClass(const char *name);
     ~CClass();
 
@@ -106 +106 @@
     void AddStaticMethod(SUBINFO *psi,DWORD dwAccess);
 
-    BOOL DupliCheckAll(char *name);
-    BOOL DupliCheckMember(char *name);
+    BOOL DupliCheckAll(const char *name);
+    BOOL DupliCheckMember(const char *name);
 
     //メソッド取得
@@ -114 +114 @@
 
     //メソッドの存在を確認
-    bool IsExistMethod( char *name );
-    bool IsExistStaticMethod( char *name );
+    bool IsExistMethod( const char *name );
+    bool IsExistStaticMethod( const char *name );
 
 
@@ -162 +162 @@
 #define MAX_CLASS_HASH 65535
 class CDBClass{
-    int hash(char *name);
+    int hash(const char *name);
     void DestroyClass(CClass *pobj_c);
 public:
@@ -170 +170 @@
     ~CDBClass();
 
-    CClass *check(char *name);
-
-    CClass *AddClass(char *name,int NowLine);
+    CClass *check(const char *name);
+
+    CClass *AddClass(const char *name,int NowLine);
 
     void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection);
@@ -182 +182 @@
 public:
     void InitNames(void);
-    void GetClass_recur(char *lpszInheritsClass);
+    void GetClass_recur(const char *lpszInheritsClass);
     void GetObjectClassInfo(void);
 

BasicCompiler_Common/Overload.cpp

@@ -46 +46 @@
 }
 
-SUBINFO *OverloadSolution(char *name,SUBINFO **ppsi,int num,PARAMETER_INFO *ppi,int ParmNum,TYPEINFO *pReturnTypeInfo){
+SUBINFO *OverloadSolution(const char *name,SUBINFO **ppsi,int num,PARAMETER_INFO *ppi,int ParmNum,TYPEINFO *pReturnTypeInfo){
     // オーバーロードの解決
 

BasicCompiler_Common/Subroutine.cpp

@@ -64 +64 @@
 }
 
-void SplitObjectName(char *name,char *ObjectName,int *pRefType){
+void SplitObjectName(const char *name,char *ObjectName,int *pRefType){
     int i4;
     for(i4=lstrlen(name)-1;i4>=0;i4--){

BasicCompiler_Common/TypeDef.cpp

@@ -5 +5 @@
 
 
-CTypeDef::CTypeDef(char *name,char *base){
+CTypeDef::CTypeDef(const char *name,char *base){
     lpszName=(char *)malloc(lstrlen(name)+1);
     lstrcpy(lpszName,name);
@@ -32 +32 @@
     iNum=0;
 }
-void CDBTypeDef::add(char *name,char *base){
+void CDBTypeDef::add(const char *name,char *base){
     ppobj_TypeDef=(CTypeDef **)realloc(ppobj_TypeDef,(iNum+1)*sizeof(CTypeDef *));
     ppobj_TypeDef[iNum]=new CTypeDef(name,base);
@@ -65 +65 @@
     }
 }
-int CDBTypeDef::check(char *name){
+int CDBTypeDef::check(const char *name){
     int i;
     for(i=0;i<iNum;i++){

BasicCompiler_Common/TypeDef.h

@@ -4 +4 @@
     char *lpszName;
     char *lpszBaseName;
-    CTypeDef(char *name,char *base);
+    CTypeDef(const char *name,char *base);
     ~CTypeDef();
 };
@@ -17 +17 @@
     void init();
 
-    void add(char *name,char *base);
-    int check(char *name);
+    void add(const char *name,char *base);
+    int check(const char *name);
 };
 extern CDBTypeDef *pobj_DBTypeDef;

BasicCompiler_Common/Variable.cpp

@@ -160 +160 @@
     return MAKE_PTR_TYPE(NATURAL_TYPE(type),PTR_LEVEL(type)+1);
 }
-int GetTypeFixed(char *TypeName,LONG_PTR *lpNum){
+int GetTypeFixed(const char *TypeName,LONG_PTR *lpNum){
     int type;
 

BasicCompiler_Common/Variable.h

@@ -13 +13 @@
 int GetTypeSize(int type,LONG_PTR lpIndex);
 int GetPtrType(int type,LONG_PTR lpIndex);
-int GetTypeFixed(char *TypeName,LONG_PTR *lpNum);
+int GetTypeFixed(const char *TypeName,LONG_PTR *lpNum);
 void GetOriginalTypeName(char *buffer);
 BOOL GetTypeName(int type,LONG_PTR lpIndex,char *name);

BasicCompiler_Common/common.h

@@ -415 +415 @@
 CONSTINFO *GetConstHash(char *name);
 DECLAREINFO *GetDeclareHash(char *name);
-SUBINFO *GetSubHash(char *name,BOOL bError=0);
+SUBINFO *GetSubHash(const char *name,BOOL bError=0);
 SUBINFO *GetMethodHash(char *ObjectName,char *MethodName,char *Parameter,BOOL bError=0);
 SUBINFO **GetOverloadObjectSubHash(char *name,CClass *pobj_c, int *pNum);
-SUBINFO **GetOverloadSubHash(char *name,int *pNum);
+SUBINFO **GetOverloadSubHash(const char *name,int *pNum);
 
 //Object.cpp
@@ -428 +428 @@
 //Overload.sbp
 SUBINFO *OverloadSolutionWithStrParam(char *name,SUBINFO **ppsi,int num,char *Parameter,char *ObjectName,TYPEINFO *pReturnTypeInfo);
-SUBINFO *OverloadSolution(char *name,SUBINFO **ppsi,int num,PARAMETER_INFO *ppi,int ParmNum,TYPEINFO *pReturnTypeInfo);
+SUBINFO *OverloadSolution(const char *name,SUBINFO **ppsi,int num,PARAMETER_INFO *ppi,int ParmNum,TYPEINFO *pReturnTypeInfo);
 
 //Debug.cpp
@@ -548 +548 @@
 int GetCallProcName(char *buffer,char *name);
 int GetProc(char *name,void **ppInfo);
-void SplitObjectName(char *name,char *ObjectName,int *pRefType);
+void SplitObjectName(const char *name,char *ObjectName,int *pRefType);
 bool SplitMemberName( const char *desc, char *object, char *member );
 int GetReturnTypeOfProc(int idProc,void *pInfo,char *name,char *Parameter,LONG_PTR *plpRetIndex);
@@ -578 +578 @@
 void SetError(int ErrorNum,const char *KeyWord,int pos);
 void CompileMessage(char *buffer);
-bool CheckDifferentType(int VarType,LONG_PTR lpVarIndex,int CalcType,LONG_PTR lpCalcIndex,char *pszFuncName,int ParmNum);
+bool CheckDifferentType(const int VarType,const LONG_PTR lpVarIndex,const int CalcType,const LONG_PTR lpCalcIndex,const char *pszFuncName,const int ParmNum);
 
 //Compile.cpp

BasicCompiler_Common/error.cpp

@@ -364 +364 @@
 
 #define STRING_SYSTEM_DECLAREHANDLE "*_System_DeclareHandle_"
-void DifferentTypeError(int VarType,LONG_PTR VarIndex,int CalcType,LONG_PTR CalcIndex,int iWarning,char *pszFuncName,int ParmNum){
+void DifferentTypeError(const int VarType,LONG_PTR VarIndex,const int CalcType,LONG_PTR CalcIndex,const int iWarning,const char *pszFuncName,const int ParmNum){
     //////////////////////////
     // キャストに関する警告
@@ -396 +396 @@
 }
 
-bool CheckDifferentType(int VarType,LONG_PTR lpVarIndex,int CalcType,LONG_PTR lpCalcIndex,char *pszFuncName,int ParmNum){
+bool CheckDifferentType(const int VarType,const LONG_PTR lpVarIndex,int CalcType,const LONG_PTR lpCalcIndex,const char *pszFuncName,const int ParmNum){
 
     if(VarType==DEF_OBJECT||CalcType==DEF_OBJECT){

BasicCompiler_Common/hash.cpp

@@ -77 +77 @@
 }
 
-SUBINFO **GetOverloadSubHash(char *lpszName,int *pNum){
+SUBINFO **GetOverloadSubHash( const char *lpszName, int *pNum ){
     extern SUBINFO *pSubInfo;
     extern int SubInfoNum;
@@ -225 +225 @@
 
 //オーバーロードされていない関数を取得（昔のコンパイラソースコードとの互換性保持）
-SUBINFO *GetSubHash(char *lpszName,BOOL bError){
+SUBINFO *GetSubHash(const char *lpszName,BOOL bError){
     int num;
     SUBINFO **ppsi,*psi;