Changeset 113 in dev

Timestamp:

May 10, 2007, 12:27:41 PM (18 years ago)

Author:

dai_9181

Message:

TypeDef、Declareの名前空間対応を行った。
TypeDef、Declareをローカル領域で使用した際、エラーを表示するようにした。

Files:

• BasicCompiler32/Compile_CallProc.cpp (modified) (1 diff)
• BasicCompiler_Common/Compile.cpp (modified) (2 diffs)
• BasicCompiler_Common/DebugMiddleFile.cpp (modified) (2 diffs)
• BasicCompiler_Common/Procedure.cpp (modified) (1 diff)
• BasicCompiler_Common/Procedure.h (modified) (1 diff)
• BasicCompiler_Common/Subroutine.cpp (modified) (1 diff)
• BasicCompiler_Common/TypeDef.cpp (modified) (9 diffs)
• BasicCompiler_Common/TypeDef.h (modified) (2 diffs)
• BasicCompiler_Common/error.cpp (modified) (1 diff)
• BasicCompiler_Common/hash.cpp (modified) (2 diffs)

BasicCompiler32/Compile_CallProc.cpp

@@ -363 +363 @@
     extern BOOL bDebugCompile;
     extern BOOL bDebugSupportProc;
-    if(bDebugCompile&&bDebugSupportProc==0&& pDllProc->GetName() != "DebugBreak" ){
+    if(bDebugCompile&&bDebugSupportProc==0&& pDllProc->IsEqualSymbol( "DebugBreak" ) ){
         Call_DebugSys_SaveContext();
     }

BasicCompiler_Common/Compile.cpp

@@ -161 +161 @@
 
             case ESC_TYPEDEF:
+                if( UserProc::IsLocalAreaCompiling() ){
+                    // ローカル領域をコンパイルしているとき
+                    SetError(65,"TypeDef",cp );
+                }
+
                 //既に収集済み
                 break;
@@ -219 +224 @@
                 break;
             case ESC_DECLARE:
+                if( UserProc::IsLocalAreaCompiling() ){
+                    // ローカル領域をコンパイルしているとき
+                    SetError(65,"Declare",cp );
+                }
                 break;
 

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -139 +139 @@
     i2+=sizeof(long);
     for(i3=0;i3<(int)Smoothie::Meta::typeDefs.size();i3++){
-        lstrcpy(buffer+i2,Smoothie::Meta::typeDefs[i3].GetNewName().c_str() );
+        lstrcpy(buffer+i2,Smoothie::Meta::typeDefs[i3].GetName().c_str() );
         i2+=lstrlen(buffer+i2)+1;
 
@@ -509 +509 @@
         i2+=lstrlen(buffer+i2)+1;
 
-        Smoothie::Meta::typeDefs.push_back( TypeDef( temp5, buffer+i2 ) );
+        // 名前空間に未対応
+        Smoothie::Meta::typeDefs.push_back( TypeDef( NamespaceScopes(), temp5, buffer+i2 ) );
 
         i2+=lstrlen(buffer+i2)+1;

BasicCompiler_Common/Procedure.cpp

@@ -539 +539 @@
 }
 
+bool DllProc::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
+{
+    if( GetName() != name ){
+        return false;
+    }
+    return NamespaceScopes::IsSameArea( this->namespaceScopes, namespaceScopes );
+}
+bool DllProc::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 ) ){
+        return true;
+    }
+
+    if( isNest ){
+        // 静的メンバを考慮
+
+        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 false;
+}
+
+
 bool DllProc::SetParamsAndReturnType( const char *sourceOfParams, int nowLine ){
     int i = 0;

BasicCompiler_Common/Procedure.h

@@ -311 +311 @@
     ~DllProc(){}
 
+    bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
+    bool IsEqualSymbol( const string &name ) const;
+
+    const NamespaceScopes &GetNamespaceScopes() const
+    {
+        return namespaceScopes;
+    }
+
     virtual bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine );
 

BasicCompiler_Common/Subroutine.cpp

@@ -441 +441 @@
     extern DllProc **ppDeclareHash;
     if(ppDeclareHash[key]){
-        DllProc *pTempProc;
-        pTempProc=ppDeclareHash[key];
+        DllProc *pTempProc = ppDeclareHash[key];
         while(1){
-            if( pDllProc->GetName() == pTempProc->GetName() ){
+            if( pTempProc->IsEqualSymbol( pDllProc->GetNamespaceScopes(), pDllProc->GetName() ) ){
                 //重複エラー
                 SetError(15,procName,nowLine);

BasicCompiler_Common/TypeDef.cpp

@@ -2 +2 @@
 
 
-TypeDef::TypeDef( const string &newName, const string &baseName ):
-    newName( newName ),
-    baseName( baseName )
+TypeDef::TypeDef( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName )
+    : namespaceScopes( namespaceScopes )
+    , name( name )
+    , baseName( baseName )
 {
     if( !Type::StringToType( baseName, baseType ) ){
@@ -14 +15 @@
 }
 
+bool TypeDef::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
+{
+    if( GetName() != name ){
+        return false;
+    }
+    return NamespaceScopes::IsSameArea( this->namespaceScopes, namespaceScopes );
+}
+bool TypeDef::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 ) ){
+        return true;
+    }
+
+    if( isNest ){
+        // 静的メンバを考慮
+
+        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 false;
+}
+
+
 
 TypeDefCollection::TypeDefCollection(){
@@ -19 +53 @@
 TypeDefCollection::~TypeDefCollection(){
 }
-void TypeDefCollection::Add( const string &newName, const string &baseName ){
-    TypeDef typeDef( newName, baseName );
+void TypeDefCollection::Add( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName ){
+    TypeDef typeDef( namespaceScopes, name, baseName );
     this->push_back( typeDef );
 }
@@ -26 +60 @@
     int max = (int)(*this).size();
     for( int i=0; i<max; i++ ){
-        if( (*this)[i].newName == typeName ){
+        if( (*this)[i].IsEqualSymbol( typeName ) ){
             return i;
         }
@@ -33 +67 @@
 }
 
-void TypeDefCollection::Add( const string &expression, int nowLine ){
+void TypeDefCollection::Add( const NamespaceScopes &namespaceScopes, const string &expression, int nowLine ){
     int i;
     char temporary[VN_SIZE];
@@ -98 +132 @@
     cp = nowLine;
 
-    Smoothie::Meta::typeDefs.Add(temporary,pTemp);
+    Add( namespaceScopes, temporary, pTemp );
 }
 
@@ -105 +139 @@
     clear();
 
-    int i=-1;
+    // 名前空間管理
+    NamespaceScopes &namespaceScopes = Smoothie::Lexical::liveingNamespaceScopes;
+    namespaceScopes.clear();
+
+    // Importsされた名前空間の管理
+    NamespaceScopesCollection &importedNamespaces = Smoothie::Meta::importedNamespaces;
+    importedNamespaces.clear();
+
+    int i=-1, i2;
+    char temporary[VN_SIZE];
     while(1){
+        extern char *basbuf;
+
         i++;
 
-        extern char *basbuf;
+        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;
+        }
+        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_IMPORTS ){
+            for(i+=2,i2=0;;i2++,i++){
+                if( IsCommandDelimitation( basbuf[i] ) ){
+                    temporary[i2]=0;
+                    break;
+                }
+                temporary[i2]=basbuf[i];
+            }
+            importedNamespaces.Imports( temporary );
+
+            continue;
+        }
+        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_CLEARNAMESPACEIMPORTED ){
+            importedNamespaces.clear();
+            continue;
+        }
+
         if( basbuf[i]==1 ){
             char temporary[VN_SIZE];
@@ -122 +206 @@
                     if(basbuf[i]=='\0') break;
                 }
-                Add(temporary,i);
+                Add( namespaceScopes, temporary, i );
 
                 continue;
@@ -136 +220 @@
                     if(basbuf[i]=='\0') break;
                 }
-                Smoothie::Meta::typeDefs.Add(temporary,"Long");
+                Add( namespaceScopes, temporary, "Long" );
             }
         }

BasicCompiler_Common/TypeDef.h

@@ -13 +13 @@
     friend TypeDefCollection;
 
-    string newName;
+    NamespaceScopes namespaceScopes;
+
+    string name;
     string baseName;
     Type baseType;
 public:
-    TypeDef( const string &newName, const string &baseName );
+    TypeDef( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName );
     ~TypeDef();
 
-    const string &GetNewName(){
-        return newName;
+    const string &GetName() const
+    {
+        return name;
     }
-    const string &GetBaseName(){
+    const string &GetBaseName() const
+    {
         return baseName;
     }
-    const Type &GetBaseType(){
+    const Type &GetBaseType() const
+    {
         return baseType;
     }
+
+    bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
+    bool IsEqualSymbol( const string &name ) const;
 };
 
@@ -37 +45 @@
     ~TypeDefCollection();
 
-    void Add( const string &newName, const string &baseName );
+    void Add( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName );
     int GetIndex( const string &typeName ) const;
 
 private:
-    void Add( const string &expression, int nowLine );
+    void Add( const NamespaceScopes &namespaceScopes, const string &expression, int nowLine );
 public:
     void Init();

BasicCompiler_Common/error.cpp

@@ -154 +154 @@
     if(num==63) lstrcpy(msg,"名前空間が正しく閉じられていません。");
     if(num==64) sprintf(msg,"\"%s\" 無効な名前空間です。",tempKeyWord);
+    if(num==65) sprintf(msg,"ローカル領域で%sは使用できません。",tempKeyWord);
 
 

BasicCompiler_Common/hash.cpp

@@ -35 +35 @@
 }
 
-DllProc *GetDeclareHash(char *name){
+DllProc *GetDeclareHash(char *fullName){
+    char ObjName[VN_SIZE];      //オブジェクト変数
+    char NestMember[VN_SIZE];   //入れ子メンバ
+    bool isObjectMember = SplitMemberName( fullName, ObjName, NestMember );
+
     //ハッシュ値を取得
     int key;
-    key=hash_default(name);
+    key=hash_default(NestMember);
 
     //格納位置を取得
@@ -45 +49 @@
     pDllProc=ppDeclareHash[key];
     while(pDllProc){
-        if( pDllProc->GetName() == name ){
+        // TODO: Declare名前空間対応
+        if( pDllProc->IsEqualSymbol( fullName ) ){
             break;
         }