Changeset 101 in dev for BasicCompiler_Common/Class.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• BasicCompiler_Common/Class.cpp (modified) (6 diffs)

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 ){