Changeset 108 in dev for BasicCompiler_Common/Class.cpp

Timestamp:

May 6, 2007, 6:52:10 PM (17 years ago)

Author:

dai_9181

Message:

関数、クラスメソッドにImports機構を適用。

File:

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

BasicCompiler_Common/Class.cpp

@@ -148 +148 @@
 
 
-CClass::CClass( const NamespaceScopes &namespaceScopes, const char *name ):
-    namespaceScopes( namespaceScopes ),
-    ConstructorMemberSubIndex( 0 ),
-    DestructorMemberSubIndex( 0 ),
-    classType( Class ),
-    isUsing( false ),
-    pobj_InheritsClass( NULL ),
-    ppobj_Member( NULL ),
-    iMemberNum( 0 ),
-    vtbl_num( 0 ),
-    iAlign( 0 ),
-    vtbl_offset( -1 ),
-    isCompilingConstructor( false ),
-    isCompilingDestructor( false ),
-    pobj_NextClass( NULL )
+CClass::CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name )
+    : namespaceScopes( namespaceScopes )
+    , importedNamespaces( importedNamespaces )
+    , ConstructorMemberSubIndex( 0 )
+    , DestructorMemberSubIndex( 0 )
+    , classType( Class )
+    , isUsing( false )
+    , pobj_InheritsClass( NULL )
+    , ppobj_Member( NULL )
+    , iMemberNum( 0 )
+    , vtbl_num( 0 )
+    , iAlign( 0 )
+    , vtbl_offset( -1 )
+    , isCompilingConstructor( false )
+    , isCompilingDestructor( false )
+    , pobj_NextClass( NULL )
 {
     this->name=(char *)HeapAlloc(hHeap,0,lstrlen(name)+1);
@@ -854 +855 @@
 }
 
-CClass *CDBClass::AddClass( const NamespaceScopes &namespaceScopes, const char *name,int nowLine){
+CClass *CDBClass::AddClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name,int nowLine){
     //////////////////////////////////////////////////////////////////////////
     // クラスを追加
@@ -861 +862 @@
 
     CClass *pobj_c;
-    pobj_c=new CClass(namespaceScopes, name);
+    pobj_c=new CClass(namespaceScopes, importedNamespaces, name);
 
     if(lstrcmp(name,"String")==0){
@@ -910 +911 @@
     namespaceScopes.clear();
 
+    // Importsされた名前空間の管理
+    NamespaceScopesCollection &importedNamespaces = Smoothie::Meta::importedNamespaces;
+    importedNamespaces.clear();
+
     for(i=0;;i++){
         if(basbuf[i]=='\0') break;
@@ -934 +939 @@
 
             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;
         }
@@ -971 +992 @@
 
                 //クラスを追加
-                CClass *pClass = pobj_DBClass->AddClass(namespaceScopes, temporary,nowLine);
+                CClass *pClass = pobj_DBClass->AddClass(namespaceScopes, importedNamespaces, temporary,nowLine);
                 if( pClass ){
                     if( basbuf[nowLine+1] == ESC_CLASS ){
@@ -1010 +1031 @@
     //関数ハッシュへ登録
     GlobalProc *pUserProc;
-    pUserProc=AddSubData( NamespaceScopes(), buffer,nowLine,bVirtual,pobj_c, (bStatic!=0) );
+    pUserProc=AddSubData( NamespaceScopes(), NamespaceScopesCollection(), buffer,nowLine,bVirtual,pobj_c, (bStatic!=0) );
     if(!pUserProc) return;