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

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

@@ -34 +34 @@
         int codeSizeOfGlobalProc = 0;
         int codeSizeOfClassMethod = 0;
-        compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
-        while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
+        foreach (auto pUserProc, compiler.GetObjectModule().meta.GetUserProcs())
         {
-            UserProc *pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
             if( pUserProc->IsCompiled() ){
                 if( pUserProc->HasParentClass() ){
@@ -60 +58 @@
         int codeSizeOfEnum = 0;
 
-        // イテレータをリセット
-        compiler.GetObjectModule().meta.GetClasses().Iterator_Reset();
-
-        while( compiler.GetObjectModule().meta.GetClasses().Iterator_HasNext() ){
+        foreach (auto pClass, compiler.GetObjectModule().meta.GetClasses())
+        {
             int codeSizeOfClass = 0;
 
-            CClass &objClass = *compiler.GetObjectModule().meta.GetClasses().Iterator_GetNext();
+            CClass &objClass = *pClass;
 
             if( !objClass.IsEnum() ){
@@ -82 +78 @@
             // 静的メソッド
             foreach( const CMethod *pMethod, objClass.GetStaticMethods() ){
-                    codeSizeOfClass += pMethod->GetUserProc().GetCodeSize();
+                codeSizeOfClass += pMethod->GetUserProc().GetCodeSize();
             }
 
@@ -99 +95 @@
         ///////////////////////////////////////////////////////////////////
 
-        // イテレータをリセット
-        compiler.GetObjectModule().meta.GetClasses().Iterator_Reset();
-
-        while( compiler.GetObjectModule().meta.GetClasses().Iterator_HasNext() ){
+        foreach (auto pClass, compiler.GetObjectModule().meta.GetClasses())
+        {
             int codeSizeOfClass = 0;
 
-            CClass &objClass = *compiler.GetObjectModule().meta.GetClasses().Iterator_GetNext();
+            CClass &objClass = *pClass;
 
             // 動的メソッド
@@ -116 +110 @@
             // 静的メソッド
             foreach( const CMethod *pMethod, objClass.GetStaticMethods() ){
-                    codeSizeOfClass += pMethod->GetUserProc().GetCodeSize();
+                codeSizeOfClass += pMethod->GetUserProc().GetCodeSize();
             }
 
-            if( codeSizeOfClass ){
-                temporary[0]=0;
-                lstrcat( temporary, "------------------------------------------------------------------\n" );
-                sprintf( temporary + lstrlen(temporary), "【 %s クラスのコード情報】\n", objClass.GetName().c_str() );
-                sprintf( temporary + lstrlen(temporary), "class code size: %d bytes\n", codeSizeOfClass );
-                lstrcat( temporary, "------------------------------------------------------------------\n" );
-                lstrcat( temporary, "\n" );
+            if( codeSizeOfClass )
+            {
+                sprintf(temporary,
+                    "------------------------------------------------------------------\n"
+                    "【 %s クラスのコード情報】\n"
+                    "class code size: %d bytes\n"
+                    "------------------------------------------------------------------\n"
+                    "\n",
+                    objClass.GetName().c_str(), codeSizeOfClass);
                 trace_for_size( temporary );
             }