Changeset 803 in dev for branches/egtra/ab5.0/abdev/ab_common/src/Lexical

Timestamp:

Feb 11, 2011, 10:05:14 PM (14 years ago)

Author:

イグトランス (egtra)

Message:

Hashmapの実装にunorderedを用いるよう変更

Location:

branches/egtra/ab5.0/abdev/ab_common/src/Lexical

Files:

• Class.cpp (modified) (1 diff)
• Const.cpp (modified) (2 diffs)
• Meta.cpp (modified) (10 diffs)
• Procedure.cpp (modified) (2 diffs)

branches/egtra/ab5.0/abdev/ab_common/src/Lexical/Class.cpp

@@ -777 +777 @@
 
     std::vector<const CClass *> classes;
-    const CClass *pClass = GetHashArrayElement( symbol.GetName().c_str() );
-    while( pClass )
-    {
-        if( pClass->IsEqualSymbol( symbol.GetNamespaceScopes(), symbol.GetName() ) ){
+    foreach (auto pClass, GetHashArrayElement(symbol.GetName()))
+    {
+        if ( pClass->IsEqualSymbol(symbol.GetNamespaceScopes(), symbol.GetName()))
+        {
             //名前空間とクラス名が一致した
             classes.push_back( pClass );
         }
-        pClass = pClass->GetChainNext();
     }
     if( classes.size() > 0 )
     {
         // 複数の名前空間の中に同一のクラス名が存在する場合があるので、アクセス可能で尚且つ階層が一番深いものをチョイスする
-        pClass = classes.front();
+        auto pClass = classes.front();
 
         foreach( const CClass *pTempClass, classes )

branches/egtra/ab5.0/abdev/ab_common/src/Lexical/Const.cpp

@@ -29 +29 @@
 CConst *Consts::GetObjectPtr( const Symbol &symbol )
 {
-    CConst *pConst = GetHashArrayElement( symbol.GetName().c_str() );
-    while( pConst )
-    {
-        if( pConst->IsEqualSymbol( symbol ) )
-        {
-            break;
-        }
-        pConst = pConst->GetChainNext();
-    }
-
-    return pConst;
+    auto c = GetHashArrayElement(symbol.GetName());
+    auto it = std::find_if(c.begin(), c.end(),
+        [&](CConst* t) {return t->IsEqualSymbol(symbol);});
+    return it != c.end()
+        ? *it
+        : nullptr;
 }
 
@@ -131 +126 @@
 ConstMacro *ConstMacros::Find( const Symbol &symbol )
 {
-    ConstMacro *pConstMacro = GetHashArrayElement( symbol.GetName().c_str() );
-    while( pConstMacro )
-    {
-        if( pConstMacro->IsEqualSymbol( symbol ) )
-        {
-            break;
-        }
-        pConstMacro = pConstMacro->GetChainNext();
-    }
-
-    return pConstMacro;
+    auto c = GetHashArrayElement(symbol.GetName());
+    auto it = std::find_if(c.begin(), c.end(),
+        [&](ConstMacro* t) {return t->IsEqualSymbol(symbol);});
+    return it != c.end()
+        ? *it
+        : nullptr;
 }

branches/egtra/ab5.0/abdev/ab_common/src/Lexical/Meta.cpp

@@ -46 +46 @@
 
     // 関数・メソッド
-    meta.GetUserProcs().Iterator_Reset();
-    while( meta.GetUserProcs().Iterator_HasNext() )
-    {
-        UserProc *pUserProc = meta.GetUserProcs().Iterator_GetNext();
+    foreach (auto pUserProc, meta.GetUserProcs())
+    {
         if( pUserProc->IsExternal() )
         {
@@ -65 +63 @@
 
     // DLL関数
-    meta.GetDllProcs().Iterator_Reset();
-    while( meta.GetDllProcs().Iterator_HasNext() )
-    {
-        DllProc *pDllProc = meta.GetDllProcs().Iterator_GetNext();
+    foreach (auto pDllProc, meta.GetDllProcs())
+    {
         if( pDllProc->IsExternal() )
         {
@@ -81 +77 @@
 
     // クラス
-    meta.GetClasses().Iterator_Reset();
-    while( meta.GetClasses().Iterator_HasNext() )
-    {
-        CClass *pClass = meta.GetClasses().Iterator_GetNext();
+    foreach (auto pClass, meta.GetClasses())
+    {
         if( pClass->IsExternal() )
         {
@@ -132 +126 @@
 
     // グローバル定数
-    meta.GetGlobalConsts().Iterator_Reset();
-    while( meta.GetGlobalConsts().Iterator_HasNext() )
-    {
-        CConst *pConst = meta.GetGlobalConsts().Iterator_GetNext();
+    foreach (auto pConst, meta.GetGlobalConsts())
+    {
         if( pConst->IsExternal() )
         {
@@ -148 +140 @@
 
     // グローバル定数マクロ
-    meta.GetGlobalConstMacros().Iterator_Reset();
-    while( meta.GetGlobalConstMacros().Iterator_HasNext() )
-    {
-        ConstMacro *pConstMacro = meta.GetGlobalConstMacros().Iterator_GetNext();
+    foreach (auto pConstMacro, meta.GetGlobalConstMacros())
+    {
         if( pConstMacro->IsExternal() )
         {
@@ -200 +190 @@
 
     // デリゲート
-    meta.GetDelegates().Iterator_Reset();
-    while( meta.GetDelegates().Iterator_HasNext() )
-    {
-        Delegate *pDelegate = meta.GetDelegates().Iterator_GetNext();
+    foreach (auto pDelegate, meta.GetDelegates())
+    {
         if( pDelegate->IsExternal() )
         {
@@ -218 +206 @@
 const ::Delegate &Meta::ToDelegate( const CClass &_class )
 {
-    const ::Delegate *dg = this->GetDelegates().GetHashArrayElement( _class.GetName().c_str() );
-    while( dg )
-    {
-        if( dg->IsEqualSymbol( _class.GetNamespaceScopes(), _class.GetName() ) ){
+    auto dg = this->GetDelegates().GetHashArrayElement(_class.GetName());
+    foreach (auto t, dg)
+    {
+        if( t->IsEqualSymbol( _class.GetNamespaceScopes(), _class.GetName() ) ){
             //名前空間とクラス名が一致した
-            return *dg;
-        }
-        dg = dg->GetChainNext();
-    }
-
-    throw;
+            return *t;
+        }
+    }
+
+    throw std::runtime_error("Meta::ToDelegate");
 }
 
@@ -256 +243 @@
 {
     // 関数・メソッド
-    this->GetUserProcs().Iterator_Init();
-    this->GetUserProcs().Iterator_Reset();
-    while( this->GetUserProcs().Iterator_HasNext() )
-    {
-        UserProc *pUserProc = this->GetUserProcs().Iterator_GetNext();
+    foreach (auto pUserProc, this->GetUserProcs())
+    {
         pUserProc->Resolve( resolver, resolveErrors );
     }
 
     // DLL関数
-    this->GetDllProcs().Iterator_Init();
-    this->GetDllProcs().Iterator_Reset();
-    while( this->GetDllProcs().Iterator_HasNext() )
-    {
-        DllProc *pDllProc = this->GetDllProcs().Iterator_GetNext();
+    foreach (auto pDllProc, this->GetDllProcs())
+    {
         pDllProc->Resolve( resolver, resolveErrors );
     }
 
     // クラス
-    this->GetClasses().Iterator_Init();
-    this->GetClasses().Iterator_Reset();
-    while( this->GetClasses().Iterator_HasNext() )
-    {
-        CClass *pClass = this->GetClasses().Iterator_GetNext();
+    foreach (auto pClass, this->GetClasses())
+    {
         pClass->Resolve( resolver, resolveErrors );
     }
@@ -289 +267 @@
 
     // グローバル定数
-    this->GetGlobalConsts().Iterator_Init();
-    this->GetGlobalConsts().Iterator_Reset();
-    while( this->GetGlobalConsts().Iterator_HasNext() )
-    {
-        CConst *pConst = this->GetGlobalConsts().Iterator_GetNext();
+    foreach (auto pConst, this->GetGlobalConsts())
+    {
         pConst->Resolve( resolver, resolveErrors );
     }
 
     // グローバル定数マクロ
-    this->GetGlobalConstMacros().Iterator_Init();
-    this->GetGlobalConstMacros().Iterator_Reset();
-    while( this->GetGlobalConstMacros().Iterator_HasNext() )
-    {
-        ConstMacro *pConstMacro = this->GetGlobalConstMacros().Iterator_GetNext();
+    foreach (auto pConstMacro, this->GetGlobalConstMacros())
+    {
         pConstMacro->Resolve( resolver, resolveErrors );
     }
@@ -325 +297 @@
 
     // デリゲート
-    this->GetDelegates().Iterator_Init();
-    this->GetDelegates().Iterator_Reset();
-    while( this->GetDelegates().Iterator_HasNext() )
-    {
-        Delegate *pDelegate = this->GetDelegates().Iterator_GetNext();
+    foreach (auto pDelegate, this->GetDelegates())
+    {
         pDelegate->Resolve( resolver, resolveErrors );
     }

branches/egtra/ab5.0/abdev/ab_common/src/Lexical/Procedure.cpp

@@ -243 +243 @@
 
     // ハッシュ値を取得
-    UserProc *pUserProc = GetHashArrayElement( simpleName );
-    while(pUserProc){
+    foreach (auto pUserProc, GetHashArrayElement( simpleName ))
+    {
         if( pUserProc->IsGlobalProcedure() ){
             if( pUserProc->IsEqualSymbol( localSymbol ) ){
@@ -250 +250 @@
             }
         }
-
-        pUserProc=pUserProc->GetChainNext();
     }
 }