Changeset 101 in dev for BasicCompiler_Common

Timestamp:

Apr 25, 2007, 4:19:28 AM (18 years ago)

Author:

dai_9181

Message:

名前空間機能をグローバル関数に適用（作業完了）。

Location:

BasicCompiler_Common

Files:

• Class.cpp (modified) (6 diffs)
• Class.h (modified) (3 diffs)
• DebugMiddleFile.cpp (modified) (1 diff)
• Procedure.cpp (modified) (3 diffs)
• Procedure.h (modified) (3 diffs)
• Subroutine.cpp (modified) (2 diffs)
• hash.cpp (modified) (3 diffs)
• include/Namespace.h (modified) (3 diffs)
• include/Smoothie.h (modified) (1 diff)
• src/Namespace.cpp (added)
• src/Smoothie.cpp (modified) (1 diff)

BasicCompiler_Common/Class.cpp

@@ -144 +144 @@
 
 
-CClass::CClass(const char *name):
+CClass::CClass( const NamespaceScopes &namespaceScopes, const char *name ):
+    namespaceScopes( namespaceScopes ),
     ConstructorMemberSubIndex( 0 ),
     DestructorMemberSubIndex( 0 ),
@@ -193 +194 @@
 }
 
+bool CClass::IsEqualSymbol() const
+{
+    return false;
+}
+
 bool CClass::IsUsing() const
 {
@@ -803 +809 @@
 }
 
-CClass *CDBClass::AddClass(const char *name,int nowLine){
+CClass *CDBClass::AddClass( const NamespaceScopes &namespaceScopes, const char *name,int nowLine){
     //////////////////////////////////////////////////////////////////////////
     // クラスを追加
@@ -810 +816 @@
 
     CClass *pobj_c;
-    pobj_c=new CClass(name);
+    pobj_c=new CClass(namespaceScopes, name);
 
     if(lstrcmp(name,"String")==0){
@@ -852 +858 @@
 void CDBClass::InitNames(void){
     extern char *basbuf;
-    int i;
+    int i, i2;
+    char temporary[VN_SIZE];
+
+    // 名前空間管理
+    NamespaceScopes &namespaceScopes = Smoothie::Lexical::liveingNamespaceScopes;
+    namespaceScopes.clear();
 
     for(i=0;;i++){
         if(basbuf[i]=='\0') break;
+
+        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&&(
@@ -891 +926 @@
 
                 //クラスを追加
-                CClass *pClass = pobj_DBClass->AddClass(temporary,nowLine);
+                CClass *pClass = pobj_DBClass->AddClass(namespaceScopes, temporary,nowLine);
                 if( pClass ){
                     if( basbuf[nowLine+1] == ESC_CLASS ){

BasicCompiler_Common/Class.h

@@ -61 +61 @@
     friend CDBClass;
     friend CDebugSection;
+
+    // 名前空間
+    NamespaceScopes namespaceScopes;
 
     //静的メンバ情報
@@ -104 +107 @@
 
 public:
-    CClass(const char *name);
+    CClass( const NamespaceScopes &namespaceScopes, const char *name );
     ~CClass();
+
+    virtual const NamespaceScopes &GetNamespaceScopes() const
+    {
+        return namespaceScopes;
+    }
+
+    bool IsEqualSymbol() const;
 
     bool IsUsing() const;
@@ -232 +242 @@
     CClass *check(const char *name);
 
-    CClass *AddClass(const char *name,int nowLine);
+    CClass *AddClass( const NamespaceScopes &namespaceScopes, const char *name,int nowLine);
 
     void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection);

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -486 +486 @@
     for(i3=0;i3<iMaxClassCount;i3++){
         //クラス名
-        pobj_DBClass->AddClass(buffer+i2,0);
+        // TODO: 名前空間が未完成
+        pobj_DBClass->AddClass(NamespaceScopes(),buffer+i2,0);
         i2+=lstrlen(buffer+i2)+1;
     }

BasicCompiler_Common/Procedure.cpp

@@ -370 +370 @@
     return ( pMethod->bVirtual != 0 );
 }
-bool UserProc::EqualName( const string &name ) const
+const NamespaceScopes &UserProc::GetNamespaceScopes() const
+{
+    if( !pParentClass ){
+        SetError();
+    }
+    return pParentClass->GetNamespaceScopes();
+}
+bool UserProc::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
 {
     SetError();
-    return true;
+    return false;
 }
 
@@ -503 +510 @@
     return true;
 }
-bool GlobalProc::EqualName( const string &name ) const
+bool GlobalProc::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
 {
-    char AreaName[VN_SIZE];     //オブジェクト変数
-    char NestName[VN_SIZE];     //入れ子メンバ
-    bool isNest = SplitMemberName( name.c_str(), AreaName, NestName );
-
-    if( isNest ){
-        if( GetNamespaceScopes().Equal( AreaName ) ){
-            if( GetName() == NestName ){
+    if( namespaceScopes.size() ){
+        if( GetNamespaceScopes().IsCoverd( namespaceScopes ) ){
+            if( GetName() == name ){
                 return true;
             }
@@ -519 +522 @@
         if( GetNamespaceScopes().size() ){
             // 名前空間の判断が必要なとき
-            if( !GetNamespaceScopes().IsUsing() ){
+            if( !GetNamespaceScopes().IsUsing()
+                && !GetNamespaceScopes().IsLiving() ){
                 // この名前空間は暗黙的に参照できないとき
                 return false;
             }
         }
-        if( GetName() == name ){
-            return true;
+        else{
+            if( GetName() == name ){
+                return true;
+            }
         }
     }
 
     return false;
+}
+bool GlobalProc::IsEqualSymbol( const GlobalProc &globalProc ) const
+{
+    return IsEqualSymbol( globalProc.GetNamespaceScopes(), globalProc.GetName() );
+}
+bool GlobalProc::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 );
 }
 

BasicCompiler_Common/Procedure.h

@@ -221 +221 @@
     }
 
+    virtual const NamespaceScopes &GetNamespaceScopes() const;
+    virtual bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
+
     // ローカル変数
     Variables localVars;
@@ -249 +252 @@
         return *pCompilingUserProc;
     }
-
-    virtual bool EqualName( const string &name ) const;
 };
 
@@ -270 +271 @@
     bool AddGlobalProc( const NamespaceScopes &namespaceScopes, char *buffer,int nowLine );
 
-    const NamespaceScopes &GetNamespaceScopes() const
+    virtual const NamespaceScopes &GetNamespaceScopes() const
     {
         return namespaceScopes;
     }
 
-    virtual bool EqualName( const string &name ) const;
+    virtual bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
+    virtual bool IsEqualSymbol( const GlobalProc &globalProc ) const;
+    virtual bool IsEqualSymbol( const string &name ) const;
 };
 

BasicCompiler_Common/Subroutine.cpp

@@ -618 +618 @@
             if(pobj_c==psi2->GetParentClassPtr()){
                 //重複エラーチェックを行う
-                if( pUserProc->GetName() == psi2->GetName() ){
+                if( pUserProc->IsEqualSymbol( *psi2 ) ){
                     if( Parameter::Equals( psi2->Params(), pUserProc->Params() ) ){
                         SetError(15,pUserProc->GetName().c_str(),nowLine);
@@ -661 +661 @@
 
     // 名前空間管理
-    NamespaceScopes namespaceScopes;
+    NamespaceScopes &namespaceScopes = Smoothie::Lexical::liveingNamespaceScopes;
+    namespaceScopes.clear();
 
     i=-1;

BasicCompiler_Common/hash.cpp

@@ -64 +64 @@
     else lstrcpy(name,lpszName);
 
+    if( (string)lpszName == "Test2.Proc3" ){
+        int test=0;
+    }
 
     char ObjName[VN_SIZE];      //オブジェクト変数
@@ -92 +95 @@
         }
 
-        if( pobj_c ){
+        if( pobj_c && pobj_c != (CClass *)-1 ){
             if( isStatic ){
                 // 静的メソッドから列挙
@@ -131 +134 @@
     while(pUserProc){
         if(!pUserProc->GetParentClassPtr()){
-            if( pUserProc->EqualName( name ) ){
+            if( pUserProc->IsEqualSymbol( name ) ){
                 subs.push_back( pUserProc );
             }

BasicCompiler_Common/include/Namespace.h

@@ -11 +11 @@
 public:
     NamespaceScopes(){}
+    NamespaceScopes( const char *name );
     ~NamespaceScopes(){}
 
-    void ToString( string &namespaceStr ) const
+    string ToString() const
     {
+        string namespaceStr;
         const vector<string> &me = *this;
 
@@ -28 +30 @@
             namespaceStr += itemStr;
         }
+        return namespaceStr;
     }
 
-    bool Equal( const string &name ) const
+    // 等しいかをチェック
+    bool IsEqual( const string &name ) const
     {
-        string tempName;
-        ToString( tempName );
-        if( tempName == name ){
+        if( ToString() == name ){
             return true;
         }
@@ -40 +42 @@
     }
 
+    // 等しいかをチェック
+    bool IsEqual( const NamespaceScopes &namespaceScopes ) const
+    {
+        if( ToString() == namespaceScopes.ToString() ){
+            return true;
+        }
+        return false;
+    }
+
+    // 所属しているかをチェック
+    // 例:
+    // baseNamespaceScopes =  "Discoversoft"
+    // entryNamespaceScopes = "Discoversoft.ActiveBasic"
+    // この場合、entryNamespaceScopes は baseNamespaceScopes に所属している。
+    static bool IsBelong( const NamespaceScopes &baseNamespaceScopes, const NamespaceScopes &entryNamespaceScopes )
+    {
+        if( baseNamespaceScopes.size() > entryNamespaceScopes.size() ){
+            return false;
+        }
+
+        for( int i=0; i<(int)baseNamespaceScopes.size(); i++ ){
+            if( baseNamespaceScopes[i] != entryNamespaceScopes[i] ){
+                return false;
+            }
+        }
+        return true;
+    }
+
     bool IsUsing() const
     {
+        // TODO: 実装
         return false;
     }
+
+    bool IsLiving() const;
+
+    // 包括しているかをチェック
+    // 例:
+    // this =   "Discoversoft.ActiveBasic"
+    // living = "Discoversoft.ActiveBasic"
+    // name =   "ActiveBasic"
+    // この場合、living は name を包括している。
+    bool IsCoverd( const string &name ) const;
+    bool IsCoverd( const NamespaceScopes &namespaceScopes ) const;
 };

BasicCompiler_Common/include/Smoothie.h

@@ -40 +40 @@
     public:
         static BasicSource source;
+        static NamespaceScopes liveingNamespaceScopes;
     };
 

BasicCompiler_Common/src/Smoothie.cpp

@@ -4 +4 @@
 
 BasicSource Smoothie::Lexical::source;
+NamespaceScopes Smoothie::Lexical::liveingNamespaceScopes;
 
 TypeDefCollection Smoothie::Meta::typeDefs;