Changeset 828 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/VarList.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/BasicCompiler_Common/VarList.cpp (modified) (4 diffs)

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

@@ -1 +1 @@
 #include "stdafx.h"
 
+#include <boost/range/algorithm.hpp>
 #include <Compiler.h>
 
@@ -411 +412 @@
     if(pobj_dti->lplpSpBase[i2]==0) return;
 
-    UserProc *pUserProc = NULL;
-    compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
-    while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
+    auto const& t = compiler.GetObjectModule().meta.GetUserProcs();
+    auto it = boost::find_if<boost::return_found>(t, [&](UserProc *pUserProc) -> bool {
+        return rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2] &&
+            pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress());
+    });
+    if (it == boost::end(t))
     {
-        pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
-        if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
-            pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress())){
-            break;
-        }
-    }
-    if(!pUserProc) return;
+        return;
+    }
+    UserProc *pUserProc = *it;
 
     foreach( Variable *pVar, pUserProc->GetLocalVars() ){
@@ -696 +696 @@
     //プロシージャ コンボボックス
     SendMessage(hProcCombo,CB_RESETCONTENT,0,0);
-    for(i2=pobj_dti->iProcLevel;i2>=0;i2--){
-
+    for(i2=pobj_dti->iProcLevel;i2>=0;i2--)
+    {
+        auto const& t = compiler.GetObjectModule().meta.GetUserProcs();
+        auto it = boost::find_if<boost::return_found>(t, [&](UserProc* p) {
+            return rva_to_real(p->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2] &&
+                pobj_dti->lplpObp[i2] < rva_to_real(p->GetEndOpAddress());
+        });
         UserProc *pUserProc = NULL;
-        compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
-        while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
+        if (it != boost::end(t))
         {
-            pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
-
-            if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
-                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress()))
-            {
-                lstrcpy(temporary,pUserProc->GetName().c_str());
-                break;
-            }
+            pUserProc = *it;
+            lstrcpy(temporary, pUserProc->GetName().c_str());
         }
         if(!pUserProc){
@@ -811 +809 @@
     i2=pobj_dti->iProcLevel-i2;
 
-    if(pobj_dti->lplpSpBase[i2]){
-
-        UserProc *pUserProc = NULL;
-        compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
-        while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
+    if(pobj_dti->lplpSpBase[i2])
+    {
+        auto const& t = compiler.GetObjectModule().meta.GetUserProcs();
+        auto it = boost::find_if<boost::return_found>(t, [&](UserProc* p) {
+            return rva_to_real(p->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2] &&
+                pobj_dti->lplpObp[i2] < rva_to_real(p->GetEndOpAddress());
+        });
+
+        if (it != boost::end(t))
         {
-            pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
-
-            if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
-                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress())){
-                break;
-            }
-        }
-
-        if(pUserProc){
-            compiler.StartProcedureCompile( pUserProc );
+            compiler.StartProcedureCompile(*it);
         }
     }