Changeset 193 in dev for trunk/abdev/BasicCompiler_Common/src/ClassImpl.cpp

Timestamp:

Jun 26, 2007, 5:04:50 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/src/ClassImpl.cpp (modified) (15 diffs)

trunk/abdev/BasicCompiler_Common/src/ClassImpl.cpp

@@ -76 +76 @@
 
 
+bool ClassImpl::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
+{
+    if( GetName() != name ){
+        return false;
+    }
+
+    return compiler.IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
+}
+
 bool ClassImpl::Inherits( const char *inheritNames, int nowLine ){
     int i = 0;
@@ -91 +100 @@
 
         //継承元クラスを取得
-        const CClass *pInheritsClass = Smoothie::GetMeta().GetClasses().Find(temporary);
+        const CClass *pInheritsClass = compiler.GetMeta().GetClasses().Find(temporary);
         if( !pInheritsClass ){
             SmoothieException::Throw(106,temporary,nowLine);
@@ -121 +130 @@
     if( !isInheritsClass ){
         // クラスを一つも継承していないとき
-        const CClass *pObjectClass = Smoothie::GetMeta().GetClasses().Find("Object");
+        const CClass *pObjectClass = compiler.GetMeta().GetClasses().Find("Object");
         if( !pObjectClass ){
             SmoothieException::Throw(106,"Object",i);
@@ -145 +154 @@
 
         //継承元クラスを取得
-        const CClass *pInheritsClass = Smoothie::GetMeta().GetClasses().Find(temporary);
+        const CClass *pInheritsClass = compiler.GetMeta().GetClasses().Find(temporary);
         if( !pInheritsClass ){
             SmoothieException::Throw(106,temporary,nowLine);
@@ -184 +193 @@
         //継承先が読み取られていないとき
         pobj_LoopRefCheck->add(this->GetName().c_str());
-        Smoothie::GetMeta().GetClasses().GetClass_recur(inheritsClass.GetName().c_str());
+        compiler.GetMeta().GetClasses().GetClass_recur(inheritsClass.GetName().c_str());
         pobj_LoopRefCheck->del(this->GetName().c_str());
     }
@@ -246 +255 @@
         //継承先が読み取られていないとき
         pobj_LoopRefCheck->add(this->GetName().c_str());
-        Smoothie::GetMeta().GetClasses().GetClass_recur(inheritsInterface.GetName().c_str());
+        compiler.GetMeta().GetClasses().GetClass_recur(inheritsInterface.GetName().c_str());
         pobj_LoopRefCheck->del(this->GetName().c_str());
     }
@@ -470 +479 @@
     }
 
-    vtbl_offset=Compiler::GetNativeCode().GetDataTable().AddBinary((void *)ppsi,GetVtblNum()*sizeof(LONG_PTR));
+    vtbl_offset=compiler.GetNativeCode().GetDataTable().AddBinary((void *)ppsi,GetVtblNum()*sizeof(LONG_PTR));
 
     for( int i=0; i < GetVtblNum(); i++ ){
@@ -484 +493 @@
 
     LONG_PTR *pVtbl;
-    pVtbl=(LONG_PTR *)((char *)Compiler::GetNativeCode().GetDataTable().GetPtr()+vtbl_offset);
+    pVtbl=(LONG_PTR *)((char *)compiler.GetNativeCode().GetDataTable().GetPtr()+vtbl_offset);
 
     int i;
@@ -505 +514 @@
 
     // Blittable型管理オブジェクトを初期化
-    Smoothie::GetMeta().blittableTypes.clear();
+    compiler.GetMeta().GetBlittableTypes().clear();
 
     // 名前空間管理
@@ -512 +521 @@
 
     // Importsされた名前空間の管理
-    NamespaceScopesCollection &importedNamespaces = Smoothie::Temp::importedNamespaces;
+    NamespaceScopesCollection &importedNamespaces = compiler.GetImportedNamespaces();
     importedNamespaces.clear();
 
@@ -549 +558 @@
                 temporary[i2]=source[i];
             }
-            if( !importedNamespaces.Imports( temporary ) )
+            if( !compiler.ImportsNamespace( temporary ) )
             {
                 SmoothieException::Throw(64,temporary,i );
@@ -580 +589 @@
                     i+=10;
                     i+=GetStringInPare_RemovePare(temporary,source.GetBuffer()+i)+1;
-                    Type::StringToType( temporary, blittableType );
+                    Compiler::StringToType( temporary, blittableType );
                 }
 
@@ -625 +634 @@
 
                     // Blittable型として登録
-                    Smoothie::GetMeta().blittableTypes.push_back( BlittableType( blittableType, pClass ) );
+                    compiler.GetMeta().GetBlittableTypes().push_back( BlittableType( blittableType, pClass ) );
                 }
         }
@@ -783 +792 @@
 
                 //継承元クラスを取得
-                const CClass *pInheritsClass = Find(temporary);
+                const Classes &classes = *this;
+                const CClass *pInheritsClass = classes.Find(temporary);
                 if( !pInheritsClass ){
                     SetError(106,temporary,i);
@@ -1283 +1293 @@
     }*/
 }
+
+const CClass *ClassesImpl::Find( const NamespaceScopes &namespaceScopes, const string &name ) const
+{
+    int key;
+    key=GetHashCode(name.c_str());
+
+    if( namespaceScopes.size() == 0 && name == "Object" ){
+        return GetObjectClassPtr();
+    }
+    else if( namespaceScopes.size() == 0 && name == "String" ){
+        return GetStringClassPtr();
+    }
+
+    if(pobj_ClassHash[key]){
+        CClass *pobj_c;
+        pobj_c=pobj_ClassHash[key];
+        while(1){
+            if( pobj_c->IsEqualSymbol( namespaceScopes, name ) ){
+                //名前空間とクラス名が一致した
+                return pobj_c;
+            }
+
+            if(pobj_c->pobj_NextClass==0) break;
+            pobj_c=pobj_c->pobj_NextClass;
+        }
+    }
+
+    // TypeDefも見る
+    int index = compiler.GetMeta().GetTypeDefs().GetIndex( namespaceScopes, name );
+    if( index != -1 ){
+        Type type = compiler.GetMeta().GetTypeDefs()[index].GetBaseType();
+        if( type.IsObject() ){
+            return &type.GetClass();
+        }
+    }
+
+    return NULL;
+}