Changeset 206 in dev for trunk/abdev/BasicCompiler_Common/hash.cpp

Timestamp:

Jul 12, 2007, 2:58:26 AM (17 years ago)

Author:

dai_9181

Message:

コード全体のリファクタリングを実施

File:

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

trunk/abdev/BasicCompiler_Common/hash.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 
@@ -21 +23 @@
 }
 
-CONSTINFO *GetConstHash(const char *name){
-    //ハッシュ値を取得
-    int key;
-    key=hash_default(name);
-
-    //格納位置を取得
-    extern CONSTINFO **ppConstHash;
-    CONSTINFO *pci;
-    pci=ppConstHash[key];
-    while(pci){
-        if(lstrcmp(pci->name,name)==0) break;
-
-        pci=pci->pNextData;
-    }
-
-    return pci;
-}
-
 DllProc *GetDeclareHash(char *fullName){
     char ObjName[VN_SIZE];      //オブジェクト変数
     char NestMember[VN_SIZE];   //入れ子メンバ
-    bool isObjectMember = CClass::SplitName( fullName, ObjName, NestMember );
+    bool isObjectMember = SplitMemberName( fullName, ObjName, NestMember );
 
     //ハッシュ値を取得
@@ -64 +48 @@
 }
 
-void GetOverloadSubHash( const char *lpszName, std::vector<UserProc *> &subs ){
+void GetOverloadSubHash( const char *lpszName, std::vector<const UserProc *> &subs ){
     char name[VN_SIZE];
 
@@ -75 +59 @@
     char ObjName[VN_SIZE];      //オブジェクト変数
     char NestMember[VN_SIZE];   //入れ子メンバ
-    bool isObjectMember = CClass::SplitName( name, ObjName, NestMember );
+    bool isObjectMember = SplitMemberName( name, ObjName, NestMember );
 
     if(isObjectMember){
@@ -84 +68 @@
         if(lstrcmpi(ObjName,"Super")==0){
             //クラスメンバ関数内から基底クラスの呼び出し
-            pobj_c=Smoothie::Temp::pCompilingClass;
+            pobj_c=compiler.pCompilingClass;
         }
         else{
@@ -114 +98 @@
 
 
-    if(Smoothie::Temp::pCompilingClass){
+    if(compiler.pCompilingClass){
         //自身のオブジェクトのメンバ関数を検索
 
         // 静的メソッド
-        Smoothie::Temp::pCompilingClass->GetStaticMethods().Enum( name, subs );
+        compiler.pCompilingClass->GetStaticMethods().Enum( name, subs );
 
         // 動的メソッド
-        Smoothie::Temp::pCompilingClass->GetMethods().Enum( name, subs );
+        compiler.pCompilingClass->GetMethods().Enum( name, subs );
     }
 
 
-    ///////////////////////////
     // グローバル関数を検索
-    ///////////////////////////
-
-    //ハッシュ値を取得
-    int key;
-    key=hash_default(NestMember);
-
-    //格納位置を取得
-    extern GlobalProc **ppSubHash;
-    GlobalProc *pUserProc;
-    pUserProc=ppSubHash[key];
-    while(pUserProc){
-        if(!pUserProc->GetParentClassPtr()){
-            if( pUserProc->IsEqualSymbol( name ) ){
-                subs.push_back( pUserProc );
-            }
-        }
-
-        pUserProc=pUserProc->pNextData;
-    }
+    compiler.GetMeta().GetUserProcs().EnumGlobalProcs( NestMember, name, subs );
 }
 
 //オーバーロードされていない関数を取得（昔のコンパイラソースコードとの互換性保持）
-UserProc *GetSubHash(const char *lpszName,BOOL bError){
-    std::vector<UserProc *> subs;
+const UserProc *GetSubHash(const char *lpszName,BOOL bError){
+    std::vector<const UserProc *> subs;
     GetOverloadSubHash(lpszName,subs);
 
@@ -166 +131 @@
     }
 
-    UserProc *pUserProc;
-    pUserProc = subs[0];
+    const UserProc *pUserProc = subs[0];
 
     return pUserProc;
 }
-UserProc *GetMethodHash(const char *ObjectName,const char *MethodName,const char *Parameter,BOOL bError){
+const 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<UserProc *> subs;
-    UserProc *pUserProc;
+    std::vector<const UserProc *> subs;
     GetOverloadSubHash(temporary,subs);
 
@@ -185 +148 @@
 
     //オーバーロードを解決
-    pUserProc=OverloadSolutionWithStrParam(temporary,subs,Parameter,ObjectName);
+    const UserProc *pUserProc = OverloadSolutionWithStrParam(temporary,subs,Parameter,ObjectName);
 
     return pUserProc;
 }
 
-UserProc *GetClassMethod( const char *className, const char *methodName ){
+const UserProc *GetClassMethod( const char *className, const char *methodName ){
     const CClass *pClass = compiler.GetMeta().GetClasses().Find( className );
     if( pClass ){
-        vector<UserProc *> userProcs;
+        vector<const UserProc *> userProcs;
         pClass->GetMethods().Enum( methodName, userProcs );
         if( userProcs.size() == 1 ){