Changeset 194 in dev for trunk/jenga

Timestamp:

Jun 26, 2007, 1:48:03 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/jenga

Files:

• include/smoothie/Namespace.h (modified) (2 diffs)
• include/smoothie/Smoothie.h (modified) (1 diff)
• src/smoothie/Namespace.cpp (modified) (2 diffs)
• src/smoothie/Smoothie.cpp (modified) (1 diff)

trunk/jenga/include/smoothie/Namespace.h

@@ -69 +69 @@
         return true;
     }
-
-    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;
 };
 
@@ -114 +103 @@
 
     void SplitNamespace( const char *fullName, char *namespaceStr, char *simpleName ) const;
-
-    static bool CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection );
 };

trunk/jenga/include/smoothie/Smoothie.h

@@ -27 +27 @@
     class Temp{
     public:
-        // 現在の名前空間
-        static NamespaceScopes liveingNamespaceScopes;
-
-        // 現在インポートされている名前空間
-        static NamespaceScopesCollection importedNamespaces;
-
         // コンパイル中のクラス
         static const CClass *pCompilingClass;

trunk/jenga/src/smoothie/Namespace.cpp

@@ -25 +25 @@
     }
 }
-
-bool NamespaceScopes::IsLiving() const
-{
-    if( IsBelong( *this, Smoothie::Temp::liveingNamespaceScopes ) ){
-        return true;
-    }
-    return false;
-}
-
-// 包括しているかをチェック
-// 例:
-// this =   "Discoversoft.ActiveBasic"
-// living = "Discoversoft.ActiveBasic"
-// name =   "ActiveBasic"
-// この場合、living は name を包括している。
-bool NamespaceScopes::IsCoverd( const string &name ) const
-{
-    if( IsEqual( name ) ){
-        return true;
-    }
-
-    string thisStr = ToString();
-
-    NamespaceScopes tempLivingNamespaceScopes = Smoothie::Temp::liveingNamespaceScopes;
-
-    while( tempLivingNamespaceScopes.size() ){
-        NamespaceScopes tempNamespaceScopes = tempLivingNamespaceScopes;
-
-        string tempStr = tempNamespaceScopes.ToString() + "." + name;
-        if( thisStr == tempStr ){
-            return true;
-        }
-
-        tempLivingNamespaceScopes.pop_back();
-    }
-    return false;
-}
-bool NamespaceScopes::IsCoverd( const NamespaceScopes &namespaceScopes ) const
-{
-    return IsCoverd( namespaceScopes.ToString() );
-}
-
 
 void NamespaceScopesCollection::SplitNamespace( const char *fullName, char *namespaceStr, char *simpleName ) const
@@ -95 +53 @@
     lstrcpy( simpleName, fullName + lstrlen( namespaceStr ) + dotLength );
 }
-bool NamespaceScopesCollection::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection )
-{
-    int i, i2;
-    char temporary[1024];
 
-    bool isSuccessful = true;
-
-    // 名前空間管理
-    NamespaceScopes namespaceScopes;
-
-    for(i=0;;i++){
-        if(source[i]=='\0') break;
-
-        if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
-            }
-            namespaceScopes.push_back( temporary );
-
-            if( !namespaceScopesCollection.IsExist( namespaceScopes ) ){
-                namespaceScopesCollection.push_back( namespaceScopes );
-            }
-
-            continue;
-        }
-        else if( source[i] == 1 && source[i+1] == ESC_ENDNAMESPACE ){
-            if( namespaceScopes.size() <= 0 ){
-                SmoothieException::Throw( 12, "End Namespace", i );
-                isSuccessful = false;
-            }
-            else{
-                namespaceScopes.pop_back();
-            }
-
-            i += 2;
-            continue;
-        }
-    }
-
-    if( namespaceScopes.size() > 0 ){
-        SmoothieException::Throw( 63 );
-        isSuccessful = false;
-    }
-
-    return isSuccessful;
-}

trunk/jenga/src/smoothie/Smoothie.cpp

@@ -3 +3 @@
 bool Smoothie::isUnicode = false;
 BasicSource Smoothie::Lexical::source;
-NamespaceScopes Smoothie::Temp::liveingNamespaceScopes;
 
-NamespaceScopesCollection Smoothie::Temp::importedNamespaces;
 const CClass *Smoothie::Temp::pCompilingClass = NULL;