Changeset 270 in dev for trunk/abdev/BasicCompiler_Common/src

Timestamp:

Aug 9, 2007, 3:18:40 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• Class.cpp (modified) (7 diffs)
• Compiler.cpp (modified) (1 diff)
• Meta.cpp (added)
• Source.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -758 +758 @@
 }
 
-
-int Classes::GetHashCode(const char *name) const
-{
-    int key;
-
-    for(key=0;*name!='\0';name++){
-        key=((key<<8)+ *name )%MAX_CLASS_HASH;
-    }
-
-    return key;
-}
-
 CClass *Classes::Create( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name){
     return new CClass(namespaceScopes, importedNamespaces, name);
@@ -789 +777 @@
     /////////////////////////////////
 
-    int key;
-    key=GetHashCode( pClass->GetName().c_str() );
-
-    if(pobj_ClassHash[key]){
-        CClass *pobj_c2;
-        pobj_c2=pobj_ClassHash[key];
-        while(1){
-            if( ((const Prototype *)pobj_c2)->IsEqualSymbol( *(const Prototype *)pClass ) ){
-                //名前空間及びクラス名が重複した場合
-                SmoothieException::Throw(15,pClass->GetName());
-                return false;
-            }
-
-            if(pobj_c2->pobj_NextClass==0) break;
-            pobj_c2=pobj_c2->pobj_NextClass;
-        }
-        pobj_c2->pobj_NextClass=pClass;
-    }
-    else{
-        pobj_ClassHash[key]=pClass;
+    if( !Put( pClass ) )
+    {
+        SetError(15,pClass->GetName(), cp);
+        return false;
     }
     return true;
@@ -961 +933 @@
 
 void Classes::ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection){
-    int i;
-    for(i=0;i<MAX_CLASS_HASH;i++){
-        if(pobj_ClassHash[i]){
-            CClass *pobj_c;
-            pobj_c=pobj_ClassHash[i];
-            while(1){
-                pobj_c->ActionVtblSchedule(ImageBase,MemPos_CodeSection);
-
-                if(pobj_c->pobj_NextClass==0) break;
-                pobj_c=pobj_c->pobj_NextClass;
-            }
-        }
+    Iterator_Reset();
+    while( Iterator_HasNext() )
+    {
+        CClass *pClass = Iterator_GetNext();
+        pClass->ActionVtblSchedule(ImageBase,MemPos_CodeSection);
     }
 }
@@ -981 +946 @@
 
     //イテレータをリセット
-    this->Iterator_Reset();
 
     extern int cp;
     int back_cp=cp;
 
+    this->Iterator_Reset();
     while(this->Iterator_HasNext()){
         CClass &objClass = *this->Iterator_GetNext();
@@ -1634 +1599 @@
 const CClass *Classes::Find( const NamespaceScopes &namespaceScopes, const string &name ) const
 {
-    int key;
-    key=GetHashCode(name.c_str());
-
     if( namespaceScopes.size() == 0 && name == "Object" ){
         return GetObjectClassPtr();
@@ -1644 +1606 @@
     }
 
-    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;
-        }
+    const CClass *pClass = GetHashArrayElement( name.c_str() );
+    while( pClass )
+    {
+        if( pClass->IsEqualSymbol( namespaceScopes, name ) ){
+            //名前空間とクラス名が一致した
+            return pClass;
+        }
+        pClass = pClass->GetChainNext();
     }
 
@@ -1711 +1669 @@
     return pObjectClass;
 }
-
-
-//////////////////////
-// イテレータ
-//////////////////////
-
-void Classes::Iterator_Init() const
-{
-    if(ppobj_IteClass) free(ppobj_IteClass);
-
-    iIteMaxNum=0;
-    iIteNextNum=0;
-    ppobj_IteClass=(CClass **)malloc(1);
-
-    int i;
-    for(i=0;i<MAX_CLASS_HASH;i++){
-        if(pobj_ClassHash[i]){
-            CClass *pobj_c;
-            pobj_c=pobj_ClassHash[i];
-            while(1){
-                ppobj_IteClass=(CClass **)realloc(ppobj_IteClass,(iIteMaxNum+1)*sizeof(CClass *));
-                ppobj_IteClass[iIteMaxNum]=pobj_c;
-                iIteMaxNum++;
-
-                if(pobj_c->pobj_NextClass==0) break;
-                pobj_c=pobj_c->pobj_NextClass;
-            }
-        }
-    }
-}
-void Classes::Iterator_Reset() const
-{
-    iIteNextNum = 0;
-}
-BOOL Classes::Iterator_HasNext() const
-{
-    if(iIteNextNum<iIteMaxNum) return 1;
-    return 0;
-}
-CClass *Classes::Iterator_GetNext() const
-{
-    CClass *pobj_c = ppobj_IteClass[iIteNextNum];
-    iIteNextNum++;
-    return pobj_c;
-}
-int Classes::Iterator_GetMaxCount() const
-{
-    return iIteMaxNum;
-}

trunk/abdev/BasicCompiler_Common/src/Compiler.cpp

@@ -7 +7 @@
 
 Compiler compiler;
+
+void Compiler::StaticLink( ObjectModules &staticLibraries )
+{
+    BOOST_FOREACH( ObjectModule *pStaticLibrary, staticLibraries )
+    {
+        // メタ情報
+        pNowObjectModule->meta.StaticLink( pStaticLibrary->meta );
+    }
+}
 
 bool Compiler::StringToType( const string &typeName, Type &type ){

trunk/abdev/BasicCompiler_Common/src/Source.cpp

@@ -821 +821 @@
 
     // basic.sbpをインクルード
-    const char *headCode = "\n";
+    const char *headCode = "#include <basic.sbp>\n";
+    //const char *headCode = "\n";
     Realloc( length + lstrlen(headCode) );
     Text::SlideString( buffer, lstrlen(headCode) );