Changeset 828 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/Const.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/ab_common/src/Lexical/Const.cpp (modified) (2 diffs)

trunk/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;
 }