Changeset 736 in dev for trunk/ab5.0

Timestamp:

Aug 25, 2008, 5:38:29 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

Symbol周りを高速化

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/StrOperation.cpp (modified) (1 diff)
• ab_common/src/Lexical/Namespace.cpp (modified) (3 diffs)
• ab_common/src/Lexical/NamespaceSupporter.cpp (modified) (1 diff)
• ab_common/src/Lexical/Symbol.cpp (modified) (4 diffs)

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

@@ -391 +391 @@
             if( esc == ESC_OPERATOR )
             {
-                extern char *calcNames[256];
+                extern char const *calcNames[256];
                 unsigned char calcId = temporary[i+2];
                 if( calcNames[calcId] )

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

@@ -1 +1 @@
 #include "stdafx.h"
-
+#include <algorithm>
 
 using namespace ActiveBasic::Common::Lexical;
@@ -28 +28 @@
 NamespaceScopes NamespaceScopes::operator+ ( const NamespaceScopes &namespaceScopes ) const
 {
-    NamespaceScopes result = *this;
-    BOOST_FOREACH( const std::string &name, namespaceScopes )
-    {
-        result.push_back( name );
-    }
+    NamespaceScopes result;
+    result.reserve( this->size() + namespaceScopes.size() );
+    result = *this;
+    result.append( namespaceScopes );
     return result;
 }
@@ -42 +41 @@
         return false;
     }
-
-    for( int i=static_cast<int>(this->size()-1); i>=0; i-- )
-    {
-        if( (*this)[i] != namespaceScopes[i] )
-        {
-            return false;
-        }
-    }
-
-    return true;
+    return std::equal(begin(), end(), namespaceScopes.begin() );
 }
 

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

@@ -31 +31 @@
 
     // 現在の名前空間とのマッチングを試みる
-    NamespaceScopes tempCurrent = this->livingNamespaceScopes;
-    while( !tempCurrent.empty() )
+    typedef NamespaceScopes::const_iterator cnsit_t;
+    cnsit_t first = livingNamespaceScopes.begin();
+    cnsit_t last = livingNamespaceScopes.end();
+    NamespaceScopes temp;
+    while( first != last )
     {
-        if( base.IsEqual( tempCurrent + entry ) )
+        temp.assign( first, last );
+        temp.append( entry );
+        if( base.IsEqual( temp ) )
         {
             return true;
         }
-
-        tempCurrent.pop_back();
+        --last;
     }
 

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

@@ -5 +5 @@
 const NamespaceSupporter *Symbol::namespaceSupporter = NULL;
 
-char *calcNames[256] = {
-    "xor",
+char const *calcNames[256] = {
+    0,
 };
 void InitCalcNames()
@@ -14 +14 @@
         return;
     }
-
-    memset( calcNames, 0, 255 * sizeof(char *) );
     calcNames[CALC_XOR] = "xor";
     calcNames[CALC_OR] = "or";
@@ -106 +104 @@
     if( namespaceScopes.size() )
     {
-        return namespaceScopes.ToString() + "." + name;
+        return namespaceScopes.ToString() + '.' + name;
     }
 
@@ -123 +121 @@
 bool Symbol::IsEqualSymbol( const Symbol &symbol ) const
 {
-    if( IsEqualSymbol( symbol.GetNamespaceScopes(), symbol.GetName() ) )
+    const NamespaceScopes &symbolNS = symbol.GetNamespaceScopes();
+    if( IsEqualSymbol( symbolNS, symbol.GetName() ) )
     {
         return true;
     }
 
-    if( symbol.GetNamespaceScopes().size() >= 1 )
+    if( !symbolNS.empty() )
     {
         // 静的メンバを考慮
-        NamespaceScopes namespaceScopes( symbol.GetNamespaceScopes() );
-        std::string name = namespaceScopes[namespaceScopes.size()-1] + "." + symbol.GetName();
-        namespaceScopes.pop_back();
-
-        return IsEqualSymbol( namespaceScopes, name );
+        std::string name = symbolNS.back() + '.' + symbol.GetName();
+        if( GetName() != name ){
+            return false;
+        }
+        return IsEqualSymbol( NamespaceScopes( symbolNS.begin(), symbolNS.end() - 1 ), name );
     }
     return false;