Changeset 736 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/Symbol.cpp

Timestamp:

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

Author:

イグトランス (egtra)

Message:

Symbol周りを高速化

File:

• trunk/ab5.0/abdev/ab_common/src/Lexical/Symbol.cpp (modified) (4 diffs)

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;