Changeset 75 in dev for BasicCompiler_Common/hash.cpp

Timestamp:

Mar 20, 2007, 4:36:16 AM (17 years ago)

Author:

dai_9181

Message:

TYPEINFO→Typeへのリファクタリングを実施。64bitはほぼ完了。32bitが全般的に未完成。

File:

• BasicCompiler_Common/hash.cpp (modified) (9 diffs)

BasicCompiler_Common/hash.cpp

@@ -7 +7 @@
 #endif
 
-int hash_default(char *name){
+int hash_default(const char *name){
     int key;
 
@@ -35 +35 @@
 }
 
-DECLAREINFO *GetDeclareHash(char *name){
+DllProc *GetDeclareHash(char *name){
     //ハッシュ値を取得
     int key;
@@ -41 +41 @@
 
     //格納位置を取得
-    extern DECLAREINFO **ppDeclareHash;
-    DECLAREINFO *pdi;
-    pdi=ppDeclareHash[key];
-    while(pdi){
-        if(lstrcmp(pdi->name,name)==0) break;
+    extern DllProc **ppDeclareHash;
+    DllProc *pDllProc;
+    pDllProc=ppDeclareHash[key];
+    while(pDllProc){
+        if( pDllProc->GetName() == name ){
+            break;
+        }
 
-        pdi=pdi->pNextData;
+        pDllProc=pDllProc->pNextData;
     }
 
-    return pdi;
+    return pDllProc;
 }
 
-void GetOverloadSubHash( const char *lpszName, std::vector<SubInfo *> &subs ){
+void GetOverloadSubHash( const char *lpszName, std::vector<UserProc *> &subs ){
     char name[VN_SIZE];
 
@@ -72 +74 @@
 
         bool isStatic = false;
-        CClass *pobj_c;
+        const CClass *pobj_c = NULL;
         if(lstrcmpi(ObjName,"Super")==0){
             //クラスメンバ関数内から基底クラスの呼び出し
@@ -79 +81 @@
         else{
             //"->"によってオブジェクトを指定する通常のメンバ関数呼び出し
-            int type = GetVarType(ObjName,(LONG_PTR *)&pobj_c,0);
-            if(!(NATURAL_TYPE(type)==DEF_OBJECT)){
+            Type type;
+            GetVarType(ObjName,type,0);
+            pobj_c = &type.GetClass();
+            if((NATURAL_TYPE(type.GetBasicType())!=DEF_OBJECT)){
                 pobj_c=pobj_DBClass->check(ObjName);
                 if( pobj_c ){
@@ -123 +127 @@
 
         //格納位置を取得
-        extern SubInfo **ppSubHash;
-        SubInfo *psi;
-        psi=ppSubHash[key];
-        while(psi){
-            if(!psi->pobj_ParentClass){
-                if(lstrcmp(psi->name,name)==0){
-                    subs.push_back( psi );
+        extern UserProc **ppSubHash;
+        UserProc *pUserProc;
+        pUserProc=ppSubHash[key];
+        while(pUserProc){
+            if(!pUserProc->GetParentClassPtr()){
+                if( pUserProc->GetName() == name ){
+                    subs.push_back( pUserProc );
                 }
             }
 
-            psi=psi->pNextData;
+            pUserProc=pUserProc->pNextData;
         }
 
@@ -140 +144 @@
 
 //オーバーロードされていない関数を取得（昔のコンパイラソースコードとの互換性保持）
-SubInfo *GetSubHash(const char *lpszName,BOOL bError){
-    std::vector<SubInfo *> subs;
+UserProc *GetSubHash(const char *lpszName,BOOL bError){
+    std::vector<UserProc *> subs;
     GetOverloadSubHash(lpszName,subs);
 
     //関数が存在しないとき
     if(subs.size() == 0){
+        if(bError){
+            SetError(3,lpszName,cp);
+        }
         return 0;
     }
@@ -154 +161 @@
     }
 
-    SubInfo *psi;
-    psi = subs[0];
+    UserProc *pUserProc;
+    pUserProc = subs[0];
 
-    return psi;
+    return pUserProc;
 }
-SubInfo *GetMethodHash(char *ObjectName,char *MethodName,char *Parameter,BOOL bError){
+UserProc *GetMethodHash(const char *ObjectName,const char *MethodName,const char *Parameter,BOOL bError){
     char temporary[VN_SIZE];
     sprintf(temporary,"%s.%s",ObjectName,MethodName);
 
-    std::vector<SubInfo *> subs;
-    SubInfo *psi;
+    std::vector<UserProc *> subs;
+    UserProc *pUserProc;
     GetOverloadSubHash(temporary,subs);
 
@@ -173 +180 @@
 
     //オーバーロードを解決
-    psi=OverloadSolutionWithStrParam(temporary,subs,Parameter,ObjectName,NULL);
+    pUserProc=OverloadSolutionWithStrParam(temporary,subs,Parameter,ObjectName);
 
-    return psi;
+    return pUserProc;
 }