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

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

Location:

branches/egtra/ab5.0/abdev/BasicCompiler_Common/src

Files:

• LexicalAnalyzer_Class.cpp (modified) (2 diffs)
• LexicalAnalyzer_Const.cpp (modified) (1 diff)
• LexicalAnalyzer_Delegate.cpp (modified) (2 diffs)
• Linker.cpp (modified) (1 diff)
• ProcedureGenerator.cpp (modified) (3 diffs)
• VtblGenerator.cpp (modified) (2 diffs)

branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp

@@ -1348 +1348 @@
     delete pobj_LoopRefCheck;
     pobj_LoopRefCheck=0;
-
-    // イテレータの準備
-    classes.Iterator_Init();
 }
 
@@ -1412 +1409 @@
 
     compiler.GetObjectModule().meta.GetUserProcs().Put( pUserProc );
-    compiler.GetObjectModule().meta.GetUserProcs().Iterator_Init();
 
     LexicalAnalyzer::AddMethod(

branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Const.cpp

@@ -206 +206 @@
         }
     }
-
-    // イテレータを初期化
-    compiler.GetObjectModule().meta.GetGlobalConsts().Iterator_Init();
-    compiler.GetObjectModule().meta.GetGlobalConstMacros().Iterator_Init();
 }
 

branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Delegate.cpp

@@ -127 +127 @@
     Jenga::Common::SourceTemplate sourceTemplate( ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\templates\\delegate_class.tab" );
 
-    delegates.Iterator_Reset();
-    while( delegates.Iterator_HasNext() )
-    {
-        const Delegate &dg = *delegates.Iterator_GetNext();
+    foreach (auto pDelegate, delegates)
+    {
+        const Delegate &dg = *pDelegate;
 
         if( dg.IsExternal() )
@@ -263 +262 @@
 void LexicalAnalyzer::RefleshDelegatesParameterAndReturnType( Delegates &delegates )
 {
-    delegates.Iterator_Reset();
-    while( delegates.Iterator_HasNext() )
-    {
-        Delegate &dg = *delegates.Iterator_GetNext();
-        RefleshDelegateParameterAndReturnType( dg );
-    }
-}
+    foreach (auto *pDelegate, delegates)
+    {
+        RefleshDelegateParameterAndReturnType(*pDelegate);
+    }
+}

branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/Linker.cpp

@@ -257 +257 @@
     nativeCode.PutEx( masterObjectModule.globalNativeCode );
 
-    masterObjectModule.meta.GetUserProcs().Iterator_Reset();
-    while( masterObjectModule.meta.GetUserProcs().Iterator_HasNext() )
-    {
-        const UserProc *pUserProc = masterObjectModule.meta.GetUserProcs().Iterator_GetNext();
-
+    foreach (auto pUserProc, masterObjectModule.meta.GetUserProcs())
+    {
         if( pUserProc->GetNativeCode().GetSize() > 0 )
         {

branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/ProcedureGenerator.cpp

@@ -18 +18 @@
     int back_cp=cp;
 
-    classes.Iterator_Reset();
-    while(classes.Iterator_HasNext()){
-        CClass &objClass = *classes.Iterator_GetNext();
+    foreach(auto pClass, classes)
+    {
+        CClass &objClass = *pClass;
         if( objClass.IsExternal() )
         {
@@ -83 +83 @@
     ////////////////////////////////////////////////////////////////////
 
-    // イテレータをリセット
-    classes.Iterator_Reset();
-
-    while( classes.Iterator_HasNext() ){
-        const CClass &objClass = *classes.Iterator_GetNext();
+    foreach (auto pClass, classes)
+    {
+        const CClass &objClass = *pClass;
 
         if( !objClass.IsUsing() ){
@@ -152 +150 @@
     ChangeOpcode( temporary );
 
-    // イテレータをリセット
-    classes.Iterator_Reset();
-
-    while( classes.Iterator_HasNext() ){
-        const CClass &objClass = *classes.Iterator_GetNext();
+    foreach (auto pClass, classes)
+    {
+        const CClass &objClass = *pClass;
 
         if( !objClass.IsUsing() ){

branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/VtblGenerator.cpp

@@ -93 +93 @@
 void VtblGenerator::GenerateVTablesForAllClasses( Classes &classes )
 {
-    classes.Iterator_Reset();
-    while( classes.Iterator_HasNext() )
+    foreach (auto pClass, classes)
     {
-        CClass *pClass = classes.Iterator_GetNext();
         GenerateFullVTables( *pClass );
 
@@ -177 +175 @@
 void VtblGenerator::ActionVtblScheduleForAllClasses( Classes &classes, LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection, LONG_PTR MemPos_DataSection )
 {
-    classes.Iterator_Reset();
-    while( classes.Iterator_HasNext() )
+    foreach(auto pClass, classes)
     {
-        CClass *pClass = classes.Iterator_GetNext();
         ActionVtblSchedule( *pClass, ImageBase, MemPos_CodeSection, MemPos_DataSection );