Changeset 735 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/Class.cpp

Timestamp:

Aug 25, 2008, 5:26:44 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

改行コード変換などを高速化

File:

• trunk/ab5.0/abdev/ab_common/src/Lexical/Class.cpp (modified) (12 diffs)

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

@@ -1 +1 @@
 #include "stdafx.h"
-
+#include <algorithm>
+#include <boost/checked_delete.hpp>
 
 CClass::CClass( const Symbol &symbol, const NamespaceScopesCollection &importedNamespaces )
@@ -74 +75 @@
 CClass::~CClass()
 {
+    using std::for_each;
+    using boost::checked_deleter;
     // 動的メンバ
-    BOOST_FOREACH( Member *member, dynamicMembers )
-    {
-        delete member;
-    }
-
+    for_each( dynamicMembers.begin(), dynamicMembers.end(), checked_deleter<Member>() );
     // 静的メンバ
-    BOOST_FOREACH( Member *member, staticMembers )
-    {
-        delete member;
-    }
-
+    for_each( staticMembers.begin(), staticMembers.end(), checked_deleter<Member>() );
     // インターフェイス
-    BOOST_FOREACH( ::Interface *pInterface, interfaces )
-    {
-        delete pInterface;
-    }
-
+    for_each( interfaces.begin(), interfaces.end(), checked_deleter<::Interface>() );
     // テンプレート展開済みのクラス
-    BOOST_FOREACH( ExpandedTemplateClass *pExpandedTemplateClass, expandedTemplateClasses )
-    {
-        delete pExpandedTemplateClass;
-    }
+    for_each( expandedTemplateClasses.begin(), expandedTemplateClasses.end(), checked_deleter<ExpandedTemplateClass>() );
 }
 
@@ -233 +221 @@
 {
     //メソッドをコピー
-    BOOST_FOREACH( const CMethod *pBaseMethod, inheritsClass.GetDynamicMethods() ){
+    const Methods& inheritsClassMethods = inheritsClass.GetDynamicMethods();
+    GetDynamicMethods().reserve( inheritsClassMethods.size() );
+    BOOST_FOREACH( const CMethod *pBaseMethod, inheritsClassMethods ){
         CMethod *pMethod = new DynamicMethod( *pBaseMethod );
 
@@ -264 +254 @@
 
     // インターフェイスを引き継ぐ
-    BOOST_FOREACH( ::Interface *pInterface, inheritsClass.GetInterfaces() )
+    const Interfaces& inheritsClassInterfaces = inheritsClass.GetInterfaces();
+    interfaces.reserve( inheritsClassInterfaces.size() );
+    BOOST_FOREACH( const ::Interface *pInterface, inheritsClassInterfaces )
     {
         interfaces.push_back( new ::Interface( *pInterface ) );
@@ -307 +299 @@
     //メソッド
     BOOST_FOREACH( const CMethod *pMethod, GetDynamicMethods() ){
-        if( lstrcmp( name, pMethod->GetUserProc().GetName().c_str() ) == 0 ){
+        if(  name == pMethod->GetUserProc().GetName() ){
             return 1;
         }
@@ -328 +320 @@
 
     // 動的メンバ
-    BOOST_FOREACH( Member *pMember, dynamicMembers )
+    BOOST_FOREACH( const Member *pMember, dynamicMembers )
     {
         if( GetName() == pMember->GetName() )
@@ -438 +430 @@
         if( this->HasSuperClass() )
         {
+            const CClass& super = this->GetSuperClass();
             // 基底クラスのサイズを追加
-            resultSize += this->GetSuperClass().GetSize();
+            resultSize += super.GetSize();
 
             // 基底クラスのアラインメントを取得
-            alignment = this->GetSuperClass().GetAlignment();
+            alignment = super.GetAlignment();
         }
         else
@@ -455 +448 @@
     BOOST_FOREACH( Member *pMember, dynamicMembers )
     {
+        const Type& memberType = pMember->GetType();
         // メンバサイズ
-        int tempMemberSize = pMember->GetType().GetSize();
+        int tempMemberSize = memberType.GetSize();
 
         // 一時アラインメントを算出
         int tempAlignment = tempMemberSize;
-        if( pMember->GetType().IsStruct() )
+        if( memberType.IsStruct() )
         {
             // メンバが構造体の場合は、メンバのアラインメントを取得
-            tempAlignment = pMember->GetType().GetClass().GetAlignment();
+            tempAlignment = memberType.GetClass().GetAlignment();
         }
 
@@ -484 +478 @@
             if( tempMemberSize == 0 )
             {
-                if( !pMember->GetType().IsStruct() )
+                if( !memberType.IsStruct() )
                 {
                     throw;
@@ -847 +841 @@
         if( result.size() )
         {
-            result += ",";
-        }
-
-        result += "\"" + pMember->GetName() + "\"";
+            result += ',';
+        }
+
+        result += '\"' + pMember->GetName() + '\"';
     }
 
@@ -863 +857 @@
         if( result.size() )
         {
-            result += ",";
+            result += ',';
         }
 
@@ -869 +863 @@
 
         char temporary[255];
-        itoa( offset, temporary, 16 );
+        _itoa( offset, temporary, 16 );
 
         result += (std::string)"&H" + temporary;