Changeset 564 in dev

Timestamp:

May 5, 2008, 2:17:58 PM (16 years ago)

Author:

dai_9181

Message:

・IsExist→IsExistDuplicationKeyName
・キー名ではなく、インスタンスそのものの重複を発見するためのIsExistメソッドを実装。

Location:

trunk/ab5.0

Files:

• abdev/BasicCompiler_Common/VariableOpe.cpp (modified) (2 diffs)
• abdev/BasicCompiler_Common/include/Class.h (modified) (1 diff)
• abdev/BasicCompiler_Common/src/Class.cpp (modified) (1 diff)
• abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp (modified) (1 diff)
• abdev/BasicCompiler_Common/src/LexicalAnalyzer_Const.cpp (modified) (1 diff)
• abdev/compiler_x86/Compile_Calc.cpp (modified) (1 diff)
• jenga/include/common/Hashmap.h (modified) (1 diff)

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

@@ -1050 +1050 @@
 
         //定数マクロとして定義されている場合は抜け出す
-        if( compiler.GetObjectModule().meta.GetGlobalConstMacros().IsExist( VarName ) )
+        if( compiler.GetObjectModule().meta.GetGlobalConstMacros().IsExistDuplicationKeyName( VarName ) )
         {
             return;
@@ -1073 +1073 @@
 
     //定数マクロとして定義されている場合
-    if( compiler.GetObjectModule().meta.GetGlobalConstMacros().IsExist( VarName ) ){
+    if( compiler.GetObjectModule().meta.GetGlobalConstMacros().IsExistDuplicationKeyName( VarName ) ){
         compiler.errorMessenger.Output(15,VarName,cp);
         return;

trunk/ab5.0/abdev/BasicCompiler_Common/include/Class.h

@@ -494 +494 @@
     }
 
-    virtual CClass *Create( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name);
     bool Insert( CClass *pClass, int nowLine );
     CClass *Add( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name,int nowLine);

trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp

@@ -646 +646 @@
 
     return false;
-}
-
-CClass *Classes::Create( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name){
-    return new CClass(namespaceScopes, importedNamespaces, name);
-}
-bool Classes::Insert( CClass *pClass, int nowLine )
-{
-    /////////////////////////////////
-    // ハッシュデータに追加
-    /////////////////////////////////
-
-    if( !Put( pClass ) )
-    {
-        compiler.errorMessenger.Output(15,pClass->GetName(), nowLine);
-        return false;
-    }
-    return true;
-}
-CClass *Classes::Add( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name,int nowLine){
-    //////////////////////////////////////////////////////////////////////////
-    // クラスを追加
-    // ※名前のみを登録。その他の情報はSetClassメソッドで！
-    //////////////////////////////////////////////////////////////////////////
-
-    CClass *pClass = Create(namespaceScopes, importedNamespaces, name);
-
-    if( !Insert( pClass, nowLine ) )
-    {
-        return NULL;
-    }
-
-    return pClass;  
 }
 

trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp

@@ -121 +121 @@
 
             //クラスを追加
-            CClass *pClass = classes.Add(namespaceScopes, importedNamespaces, temporary,nowLine);
-            if( pClass ){
-                if( source[nowLine+1] == ESC_CLASS ){
-                    if( isEnum )
-                    {
-                        pClass->SetClassType( CClass::Enum );
-                    }
-                    else if( isDelegate )
-                    {
-                        pClass->SetClassType( CClass::Delegate );
-                    }
-                    else{
-                        pClass->SetClassType( CClass::Class );
-                    }
-                }
-                else if( source[nowLine+1] == ESC_INTERFACE ){
-                    pClass->SetClassType( CClass::Interface );
+            CClass *pClass = new CClass( namespaceScopes, importedNamespaces, temporary );
+            if( classes.IsExist( pClass ) )
+            {
+                // 既に存在している
+                compiler.errorMessenger.Output(15,pClass->GetName(), nowLine);
+
+                delete pClass;
+
+                continue;
+            }
+
+            classes.Put( pClass );
+
+            if( source[nowLine+1] == ESC_CLASS )
+            {
+                if( isEnum )
+                {
+                    pClass->SetClassType( CClass::Enum );
+                }
+                else if( isDelegate )
+                {
+                    pClass->SetClassType( CClass::Delegate );
                 }
                 else{
-                    pClass->SetClassType( CClass::Structure );
-                }
+                    pClass->SetClassType( CClass::Class );
+                }
+            }
+            else if( source[nowLine+1] == ESC_INTERFACE )
+            {
+                pClass->SetClassType( CClass::Interface );
+            }
+            else
+            {
+                pClass->SetClassType( CClass::Structure );
             }
 

trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Const.cpp

@@ -162 +162 @@
 
                 //重複チェック
-                if( compiler.GetObjectModule().meta.GetGlobalConstMacros().IsExist( name )
-                    || compiler.GetObjectModule().meta.GetGlobalConsts().IsExist( name ) )
+                if( compiler.GetObjectModule().meta.GetGlobalConstMacros().IsExistDuplicationKeyName( name )
+                    || compiler.GetObjectModule().meta.GetGlobalConsts().IsExistDuplicationKeyName( name ) )
                 {
                     compiler.errorMessenger.Output(15,name,cp);

trunk/ab5.0/abdev/compiler_x86/Compile_Calc.cpp

@@ -461 +461 @@
             }
             else{
-                if( compiler.GetObjectModule().meta.GetGlobalConsts().IsExist(variable)
-                    || compiler.GetObjectModule().meta.GetGlobalConstMacros().IsExist(variable) )
+                if( compiler.GetObjectModule().meta.GetGlobalConsts().IsExistDuplicationKeyName(variable)
+                    || compiler.GetObjectModule().meta.GetGlobalConstMacros().IsExistDuplicationKeyName(variable) )
                 {
                     //定数リストに該当したとき

trunk/ab5.0/jenga/include/common/Hashmap.h

@@ -86 +86 @@
     }
 
-    bool IsExist( const std::string &keyName ) const
+    bool IsExistDuplicationKeyName( const std::string &keyName ) const
     {
         int key = GetHash( keyName.c_str() );
 
         if(hashArray[key]){
-            T *temp = hashArray[key];
+            const T *temp = hashArray[key];
             while( true ){
                 if( temp->IsDuplication( keyName ) )
+                {
+                    // 重複している
+                    return true;
+                }
+
+                if( temp->GetChainNext() == NULL )
+                {
+                    break;
+                }
+                temp = temp->GetChainNext();
+            }
+        }
+
+        return false;
+    }
+
+    bool IsExist( const T* value ) const
+    {
+        int key = GetHash( value->GetKeyName().c_str() );
+
+        if(hashArray[key]){
+            const T *temp = hashArray[key];
+            while( true ){
+                if( temp->IsDuplication( value ) )
                 {
                     // 重複している