Changeset 102 in dev for BasicCompiler_Common

Timestamp:

Apr 29, 2007, 2:34:04 AM (18 years ago)

Author:

dai_9181

Message:

名前空間機能をクラスに適用。

Location:

BasicCompiler_Common

Files:

• Class.cpp (modified) (11 diffs)
• Class.h (modified) (3 diffs)
• DebugMiddleFile.cpp (modified) (4 diffs)
• NumOpe_GetType.cpp (modified) (1 diff)
• Procedure.cpp (modified) (1 diff)
• Type.cpp (modified) (1 diff)
• hash.cpp (modified) (3 diffs)
• include/Namespace.h (modified) (1 diff)

BasicCompiler_Common/Class.cpp

@@ -194 +194 @@
 }
 
-bool CClass::IsEqualSymbol() const
-{
-    return false;
+bool CClass::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
+{
+    if( GetName() != name ){
+        return false;
+    }
+
+    return NamespaceScopes::IsSameArea( GetNamespaceScopes(), namespaceScopes );
+}
+bool CClass::IsEqualSymbol( const CClass &objClass ) const
+{
+    return IsEqualSymbol( objClass.GetNamespaceScopes(), objClass.GetName() );
+}
+bool CClass::IsEqualSymbol( const string &fullName ) const
+{
+    char AreaName[VN_SIZE] = "";        //オブジェクト変数
+    char NestName[VN_SIZE] = "";        //入れ子メンバ
+    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
+
+    return IsEqualSymbol( NamespaceScopes( AreaName ), NestName );
 }
 
@@ -735 +751 @@
 
 
-int CDBClass::hash(const char *name){
+int CDBClass::hash(const char *name) const{
     int key;
 
@@ -789 +805 @@
 }
 
-CClass *CDBClass::check(const char *name){
+CClass *CDBClass::Find( const string &fullName ) const
+{
+    char AreaName[VN_SIZE] = "";        //オブジェクト変数
+    char NestName[VN_SIZE] = "";        //入れ子メンバ
+    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
+
     int key;
-    key=hash(name);
+    key=hash(NestName);
 
     if(pobj_ClassHash[key]){
@@ -797 +818 @@
         pobj_c=pobj_ClassHash[key];
         while(1){
-            if(lstrcmp(name,pobj_c->name)==0){
-                //重複した場合
+            if( pobj_c->IsEqualSymbol( fullName ) ){
+                //名前空間とクラス名が一致した
+                return pobj_c;
+            }
+
+            if(pobj_c->pobj_NextClass==0) break;
+            pobj_c=pobj_c->pobj_NextClass;
+        }
+    }
+    return NULL;
+}
+CClass *CDBClass::Find( const NamespaceScopes &namespaceScopes, const string &name ) const
+{
+    int key;
+    key=hash(name.c_str());
+
+    if(pobj_ClassHash[key]){
+        CClass *pobj_c;
+        pobj_c=pobj_ClassHash[key];
+        while(1){
+            if( pobj_c->IsEqualSymbol( namespaceScopes, name ) ){
+                //名前空間とクラス名が一致した
                 return pobj_c;
             }
@@ -838 +879 @@
         pobj_c2=pobj_ClassHash[key];
         while(1){
-            if(lstrcmp(name,pobj_c2->name)==0){
-                //重複した場合
+            if( pobj_c2->IsEqualSymbol( namespaceScopes, name ) ){
+                //名前空間及びクラス名が重複した場合
                 SetError(15,name,nowLine);
                 return 0;
@@ -1100 +1141 @@
     char temporary[8192];
 
+    // 名前空間管理
+    NamespaceScopes &namespaceScopes = Smoothie::Lexical::liveingNamespaceScopes;
+    namespaceScopes.clear();
+
     for(i=0;;i++){
         if(basbuf[i]=='\0') break;
 
-        CClass *pobj_c;
+
+        // 名前空間
+        if( basbuf[i] == 1 && basbuf[i+1] == ESC_NAMESPACE ){
+            for(i+=2,i2=0;;i2++,i++){
+                if( IsCommandDelimitation( basbuf[i] ) ){
+                    temporary[i2]=0;
+                    break;
+                }
+                temporary[i2]=basbuf[i];
+            }
+            namespaceScopes.push_back( temporary );
+
+            continue;
+        }
+        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_ENDNAMESPACE ){
+            if( namespaceScopes.size() <= 0 ){
+                SetError(12, "End Namespace", i );
+            }
+            else{
+                namespaceScopes.pop_back();
+            }
+
+            i += 2;
+            continue;
+        }
+
+
 
         if(basbuf[i]==1&&basbuf[i+1]==ESC_INTERFACE){
@@ -1117 +1188 @@
             GetIdentifierToken( temporary, basbuf, i );
 
-            pobj_c=pobj_DBClass->check(temporary);
+            CClass *pobj_c=pobj_DBClass->Find(namespaceScopes, temporary);
             if(!pobj_c) continue;
 
@@ -1155 +1226 @@
 
                 //継承元クラスを取得
-                CClass *pInheritsClass = check(temporary);
+                CClass *pInheritsClass = Find(temporary);
                 if( !pInheritsClass ){
                     SetError(106,temporary,i);
@@ -1263 +1334 @@
             GetIdentifierToken( temporary, basbuf, i );
 
-            pobj_c=pobj_DBClass->check(temporary);
+            CClass *pobj_c=pobj_DBClass->Find(namespaceScopes, temporary);
             if(!pobj_c) continue;
 
@@ -1320 +1391 @@
 
                 //継承元クラスを取得
-                CClass *pInheritsClass = check(temporary);
+                CClass *pInheritsClass = Find(temporary);
                 if( !pInheritsClass ){
                     SetError(106,temporary,i);
@@ -1328 +1399 @@
                 if( pInheritsClass->IsInterface() ){
                     // クラスを継承していないとき
-                    CClass *pObjectClass = check("Object");
+                    CClass *pObjectClass = Find("Object");
                     if( !pObjectClass ){
                         SetError(106,"Object",i);

BasicCompiler_Common/Class.h

@@ -115 +115 @@
     }
 
-    bool IsEqualSymbol() const;
+    const string GetName() const
+    {
+        return name;
+    }
+
+    bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
+    bool IsEqualSymbol( const CClass &objClass ) const;
+    bool IsEqualSymbol( const string &name ) const;
 
     bool IsUsing() const;
@@ -232 +239 @@
 #define MAX_CLASS_HASH 65535
 class CDBClass{
-    int hash(const char *name);
+    int hash(const char *name) const;
     void DestroyClass(CClass *pobj_c);
 public:
@@ -240 +247 @@
     ~CDBClass();
 
-    CClass *check(const char *name);
+    CClass *Find( const string &fullName ) const;
+    CClass *Find( const NamespaceScopes &namespaceScopes, const string &name ) const;
 
     CClass *AddClass( const NamespaceScopes &namespaceScopes, const char *name,int nowLine);

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -28 +28 @@
         (*p)+=lstrlen(buffer+(*p))+1;
 
-        type.SetIndex( (LONG_PTR)pobj_DBClass->check(szClassName) );
+        type.SetIndex( (LONG_PTR)pobj_DBClass->Find(szClassName) );
     }
     else{
@@ -586 +586 @@
         CClass *pClass = NULL;
         if(szParentClassName[0])
-            pClass=pobj_DBClass->check(szParentClassName);
+            pClass=pobj_DBClass->Find(szParentClassName);
 
         //ID
@@ -690 +690 @@
         i2+=lstrlen(buffer+i2)+1;
 
-        pobj_c=pobj_DBClass->check(szClassName);
+        pobj_c=pobj_DBClass->Find(szClassName);
 
         //仮想関数の数
@@ -742 +742 @@
             CClass *pobj_InheritsClass = NULL;
             if(szInherits[0]){
-                pobj_InheritsClass=pobj_DBClass->check(szInherits);
+                pobj_InheritsClass=pobj_DBClass->Find(szInherits);
             }
 

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -378 +378 @@
 
     if( pIsClassName ){
-        if( pobj_DBClass->check( termFull ) ){
+        if( pobj_DBClass->Find( termFull ) ){
             *pIsClassName = true;
             return true;

BasicCompiler_Common/Procedure.cpp

@@ -512 +512 @@
 bool GlobalProc::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
 {
-    if( namespaceScopes.size() ){
-        if( GetNamespaceScopes().IsCoverd( namespaceScopes ) ){
-            if( GetName() == name ){
-                return true;
-            }
-        }
-    }
-    else{
-        if( GetNamespaceScopes().size() ){
-            // 名前空間の判断が必要なとき
-            if( !GetNamespaceScopes().IsUsing()
-                && !GetNamespaceScopes().IsLiving() ){
-                // この名前空間は暗黙的に参照できないとき
-                return false;
-            }
-        }
-        else{
-            if( GetName() == name ){
-                return true;
-            }
-        }
-    }
-
-    return false;
+    if( GetName() != name ){
+        return false;
+    }
+
+    return NamespaceScopes::IsSameArea( GetNamespaceScopes(), namespaceScopes );
 }
 bool GlobalProc::IsEqualSymbol( const GlobalProc &globalProc ) const

BasicCompiler_Common/Type.cpp

@@ -96 +96 @@
 
     //クラス
-    CClass *pobj_c = pobj_DBClass->check( typeName.c_str() );
+    CClass *pobj_c = pobj_DBClass->Find( typeName.c_str() );
     if(pobj_c){
         type.pClass = pobj_c;

BasicCompiler_Common/hash.cpp

@@ -64 +64 @@
     else lstrcpy(name,lpszName);
 
-    if( (string)lpszName == "Test2.Proc3" ){
-        int test=0;
-    }
-
     char ObjName[VN_SIZE];      //オブジェクト変数
     char NestMember[VN_SIZE];   //入れ子メンバ
@@ -88 +84 @@
             }
             else{
-                pobj_c=pobj_DBClass->check(ObjName);
+                pobj_c=pobj_DBClass->Find(ObjName);
                 if( pobj_c ){
                     isStatic = true;
@@ -186 +182 @@
 
 UserProc *GetClassMethod( const char *className, const char *methodName ){
-    CClass *pClass = pobj_DBClass->check( className );
+    CClass *pClass = pobj_DBClass->Find( className );
     if( pClass ){
         vector<UserProc *> userProcs;

BasicCompiler_Common/include/Namespace.h

@@ -86 +86 @@
     bool IsCoverd( const string &name ) const;
     bool IsCoverd( const NamespaceScopes &namespaceScopes ) const;
+
+    // 指定された名前空間が同一エリアと見なされるかどうかをチェック
+    static bool IsSameArea( const NamespaceScopes &baseNamespaceScopes, const NamespaceScopes &entryNamespaceScopes ){
+        if( entryNamespaceScopes.size() ){
+            if( baseNamespaceScopes.IsCoverd( entryNamespaceScopes ) ){
+                // 包括しているときは同一と見なす
+                return true;
+            }
+        }
+        else{
+            if( baseNamespaceScopes.size() ){
+                // 名前空間の判断が必要なとき
+                if( baseNamespaceScopes.IsUsing()
+                    || baseNamespaceScopes.IsLiving() ){
+                    // Using指定があるとき
+                    // または
+                    // 指定された名前空間が現在の名前空間スコープと同一のとき
+                    return true;
+                }
+            }
+            else{
+                return true;
+            }
+        }
+
+        return false;
+    }
 };