Changeset 140 in dev for BasicCompiler_Common/Variable.cpp

Timestamp:

Jun 15, 2007, 4:00:25 AM (17 years ago)

Author:

dai_9181

Message:

traceログ機能を搭載
動的メンバをstl::vectorにまとめた
シンボルをクラス化した

File:

• BasicCompiler_Common/Variable.cpp (modified) (1 diff)

BasicCompiler_Common/Variable.cpp

@@ -1 +1 @@
 #include "common.h"
 
-bool Variable::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
+bool Variable::IsEqualSymbol( const Symbol &symbol, bool isSupportStaticMember ) const
 {
-    if( GetName() != name ){
-        return false;
-    }
-    return NamespaceScopes::IsSameArea( this->namespaceScopes, namespaceScopes );
-}
-bool Variable::IsEqualSymbol( const string &fullName ) const
-{
-    char AreaName[VN_SIZE] = "";        //オブジェクト変数
-    char NestName[VN_SIZE] = "";        //入れ子メンバ
-    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
-
-    if( IsEqualSymbol( NamespaceScopes( AreaName ), NestName ) ){
+    if( GetName() == symbol.GetName()
+        && NamespaceScopes::IsSameArea( this->namespaceScopes, symbol.GetNamespaceScopes() ) )
+    {
         return true;
     }
 
-    if( isNest ){
+    if( isSupportStaticMember && symbol.GetNamespaceScopes().size() >= 1 )
+    {
         // 静的メンバを考慮
+        NamespaceScopes namespaceScopes( symbol.GetNamespaceScopes() );
+        string name = namespaceScopes[namespaceScopes.size()-1] + "." + symbol.GetName();
+        namespaceScopes.pop_back();
 
-        char AreaName2[VN_SIZE] = "";       //オブジェクト変数
-        char NestName2[VN_SIZE] = "";       //入れ子メンバ
-        bool isNest = SplitMemberName( AreaName, AreaName2, NestName2 );
-        lstrcat( NestName2, "." );
-        lstrcat( NestName2, NestName );
-
-        return IsEqualSymbol( NamespaceScopes( AreaName2 ), NestName2 );
+        return IsEqualSymbol( Symbol( namespaceScopes, name ), false );
     }
-
     return false;
 }