Changeset 828 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/Meta.cpp

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 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/Meta.cpp (modified) (11 diffs)

trunk/ab5.0/abdev/ab_common/src/Lexical/Meta.cpp

@@ -37 +37 @@
 {
     // 名前空間
-    BOOST_FOREACH( NamespaceScopes &namespaceScopes, meta.namespaceScopesCollection )
+    foreach (NamespaceScopes const &namespaceScopes, meta.namespaceScopesCollection)
     {
         if( !this->namespaceScopesCollection.IsExist( namespaceScopes ) )
@@ -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 );
     }