Changeset 828 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/hash.cpp

Timestamp:

Mar 19, 2012, 1:59:48 AM (13 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/BasicCompiler_Common/hash.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/hash.cpp

@@ -13 +13 @@
 using namespace ActiveBasic::Compiler;
 
-int hash_default(const char *name){
-    int key;
-
-    for(key=0;*name!='\0';name++){
-        key=((key<<8)+ *name )%MAX_HASH;
-    }
-
-    return key;
-}
-
 DllProc *GetDeclareHash(const char *fullName){
     char namespaceStr[VN_SIZE];     //オブジェクト変数
@@ -32 +22 @@
     ///////////////////////////
 
+    auto const s = LexicalAnalyzer::FullNameToSymbol( fullName );
+
     // ハッシュ値を取得
-    DllProc *pDllProc = compiler.GetObjectModule().meta.GetDllProcs().GetHashArrayElement( simpleName );
-    while(pDllProc){
-        if( pDllProc->IsEqualSymbol( LexicalAnalyzer::FullNameToSymbol( fullName ) ) ){
+    foreach (auto pDllProc, compiler.GetObjectModule().meta.GetDllProcs().GetHashArrayElement(simpleName))
+    {
+        if( pDllProc->IsEqualSymbol( s ) )
+        {
             return pDllProc;
         }
-
-        pDllProc=pDllProc->GetChainNext();
     }