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

Timestamp:

Aug 1, 2007, 11:19:01 PM (17 years ago)

Author:

dai_9181

Message:

MetaImplを廃止し、Metaにした。
ObjectModuleクラス、Linkerクラスを用意。

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• BoostSerializationSupport.cpp (modified) (4 diffs)
• Class.cpp (modified) (11 diffs)
• Compiler.cpp (modified) (5 diffs)
• Const.cpp (modified) (3 diffs)
• DataTable.cpp (modified) (2 diffs)
• LexicalScope.cpp (modified) (2 diffs)
• NamespaceSupporter.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp

@@ -17 +17 @@
 #include <BoostSerializationSupport.h>
 
-#include <MetaImpl.h>
-#include <logger.h>
-
 #include <windows.h>
 
@@ -119 +116 @@
 }
 
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadBinaly( const string &filePath, bool isShowExceptionMessage )
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadBinary( const string &filePath, bool isShowExceptionMessage )
 {
     // 入力アーカイブの作成
@@ -157 +154 @@
     return true;
 }
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteBinaly( const string &filePath, bool isShowExceptionMessage ) const
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteBinary( const string &filePath, bool isShowExceptionMessage ) const
 {
     // 出力アーカイブの作成
@@ -301 +298 @@
 
 
-template class Jenga::Common::BoostSerializationSupport<MetaImpl>;
+#include <Compiler.h>
+#include <logger.h>
+
+template class Jenga::Common::BoostSerializationSupport<ObjectModule>;
 template class Jenga::Common::BoostSerializationSupport<LoggerSetting>;

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -189 +189 @@
 
         //継承元クラスを取得
-        const CClass *pInheritsClass = compiler.GetMeta().GetClasses().Find(temporary);
+        const CClass *pInheritsClass = compiler.objectModule.meta.GetClasses().Find(temporary);
         if( !pInheritsClass ){
             SmoothieException::Throw(106,temporary,nowLine);
@@ -219 +219 @@
     if( !isInheritsClass ){
         // クラスを一つも継承していないとき
-        const CClass *pObjectClass = compiler.GetMeta().GetClasses().Find("Object");
+        const CClass *pObjectClass = compiler.objectModule.meta.GetClasses().Find("Object");
         if( !pObjectClass ){
             SmoothieException::Throw(106,"Object",i);
@@ -243 +243 @@
 
         //継承元クラスを取得
-        const CClass *pInheritsClass = compiler.GetMeta().GetClasses().Find(temporary);
+        const CClass *pInheritsClass = compiler.objectModule.meta.GetClasses().Find(temporary);
         if( !pInheritsClass ){
             SmoothieException::Throw(106,temporary,nowLine);
@@ -282 +282 @@
         //継承先が読み取られていないとき
         pobj_LoopRefCheck->add(this->GetName().c_str());
-        compiler.GetMeta().GetClasses().GetClass_recur(inheritsClass.GetName().c_str());
+        compiler.objectModule.meta.GetClasses().GetClass_recur(inheritsClass.GetName().c_str());
         pobj_LoopRefCheck->del(this->GetName().c_str());
     }
@@ -344 +344 @@
         //継承先が読み取られていないとき
         pobj_LoopRefCheck->add(this->GetName().c_str());
-        compiler.GetMeta().GetClasses().GetClass_recur(inheritsInterface.GetName().c_str());
+        compiler.objectModule.meta.GetClasses().GetClass_recur(inheritsInterface.GetName().c_str());
         pobj_LoopRefCheck->del(this->GetName().c_str());
     }
@@ -427 +427 @@
 
     //関数ハッシュへ登録
-    UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Add( NamespaceScopes(), NamespaceScopesCollection(), buffer,nowLine,isVirtual,pobj_c, (bStatic!=0) );
+    UserProc *pUserProc = compiler.objectModule.meta.GetUserProcs().Add( NamespaceScopes(), NamespaceScopesCollection(), buffer,nowLine,isVirtual,pobj_c, (bStatic!=0) );
     if(!pUserProc) return;
 
@@ -716 +716 @@
     }
 
-    vtbl_offset=compiler.GetDataTable().AddBinary((void *)ppsi,GetVtblNum()*sizeof(LONG_PTR));
+    vtbl_offset=compiler.objectModule.dataTable.AddBinary((void *)ppsi,GetVtblNum()*sizeof(LONG_PTR));
 
     for( int i=0; i < GetVtblNum(); i++ ){
@@ -730 +730 @@
 
     LONG_PTR *pVtbl;
-    pVtbl=(LONG_PTR *)((char *)compiler.GetDataTable().GetPtr()+vtbl_offset);
+    pVtbl=(LONG_PTR *)((char *)compiler.objectModule.dataTable.GetPtr()+vtbl_offset);
 
     int i;
@@ -831 +831 @@
 
     // Blittable型管理オブジェクトを初期化
-    compiler.GetMeta().GetBlittableTypes().clear();
+    compiler.objectModule.meta.GetBlittableTypes().clear();
 
     // 名前空間管理
@@ -951 +951 @@
 
                     // Blittable型として登録
-                    compiler.GetMeta().GetBlittableTypes().push_back( BlittableType( blittableType, pClass ) );
+                    compiler.objectModule.meta.GetBlittableTypes().push_back( BlittableType( blittableType, pClass ) );
                 }
         }
@@ -1656 +1656 @@
 
     // TypeDefも見る
-    int index = compiler.GetMeta().GetTypeDefs().GetIndex( namespaceScopes, name );
+    int index = compiler.objectModule.meta.GetTypeDefs().GetIndex( namespaceScopes, name );
     if( index != -1 ){
-        Type type = compiler.GetMeta().GetTypeDefs()[index].GetBaseType();
+        Type type = compiler.objectModule.meta.GetTypeDefs()[index].GetBaseType();
         if( type.IsObject() ){
             return &type.GetClass();

trunk/abdev/BasicCompiler_Common/src/Compiler.cpp

@@ -16 +16 @@
                 //関数ポインタ（*Function）
                 type.SetBasicType( DEF_PTR_PROC );
-                type.SetIndex( compiler.GetMeta().GetProcPointers().Add( typeName ) );
+                type.SetIndex( compiler.objectModule.meta.GetProcPointers().Add( typeName ) );
                 return true;
         }
@@ -42 +42 @@
     // Object型だったとき
     if( typeName == "Object" ){
-        type.SetType( DEF_OBJECT, compiler.GetMeta().GetClasses().GetObjectClassPtr() );
+        type.SetType( DEF_OBJECT, compiler.objectModule.meta.GetClasses().GetObjectClassPtr() );
         return true;
     }
@@ -48 +48 @@
     // String型だったとき
     if( typeName == "String" ){
-        type.SetType( DEF_OBJECT, compiler.GetMeta().GetClasses().GetStringClassPtr() );
+        type.SetType( DEF_OBJECT, compiler.objectModule.meta.GetClasses().GetStringClassPtr() );
         return true;
     }
@@ -56 +56 @@
     // TypeDefされた型
     ////////////////////
-    int i=compiler.GetMeta().GetTypeDefs().GetIndex( typeName );
+    int i=compiler.objectModule.meta.GetTypeDefs().GetIndex( typeName );
     if(i!=-1){
-        type = compiler.GetMeta().GetTypeDefs()[i].GetBaseType();
+        type = compiler.objectModule.meta.GetTypeDefs()[i].GetBaseType();
         return true;
     }
 
     //クラス
-    const CClass *pobj_c = compiler.GetMeta().GetClasses().Find( typeName );
+    const CClass *pobj_c = compiler.objectModule.meta.GetClasses().Find( typeName );
     if(pobj_c){
         type.SetClassPtr( pobj_c );
@@ -104 +104 @@
         }
         else{
-            if( compiler.GetMeta().GetProcPointers()[type.GetIndex()]->ReturnType().IsNull() ){
+            if( compiler.objectModule.meta.GetProcPointers()[type.GetIndex()]->ReturnType().IsNull() ){
                 return "*Sub";
             }

trunk/abdev/BasicCompiler_Common/src/Const.cpp

@@ -28 +28 @@
 
     //重複チェック
-    if( compiler.GetMeta().GetGlobalConstMacros().IsExist( name )
-        || compiler.GetMeta().GetGlobalConsts().IsExist( name ) )
+    if( compiler.objectModule.meta.GetGlobalConstMacros().IsExist( name )
+        || compiler.objectModule.meta.GetGlobalConsts().IsExist( name ) )
     {
         SetError(15,name,cp);
@@ -38 +38 @@
         //定数マクロ
 
-        compiler.GetMeta().GetGlobalConstMacros().Add( namespaceScopes, name, buffer + i );
+        compiler.objectModule.meta.GetGlobalConstMacros().Add( namespaceScopes, name, buffer + i );
     }
     else{
@@ -44 +44 @@
         char *expression = buffer + i + 1;
 
-        compiler.GetMeta().GetGlobalConsts().Add( namespaceScopes, name, expression );
+        compiler.objectModule.meta.GetGlobalConsts().Add( namespaceScopes, name, expression );
     }
 }

trunk/abdev/BasicCompiler_Common/src/DataTable.cpp

@@ -8 +8 @@
 #include <stdlib.h>
 
-DataTable::DataTable(){
-    pdata = malloc( 1 );
-    size = 0;
-}
-DataTable::~DataTable(){
-    free( pdata );
+void DataTable::Realloc( int size )
+{
+    this->buffer = (char *)realloc( this->buffer, size + 100 );
+    this->size = size;
 }
 
-void DataTable::Init(){
-    free( pdata );
-
-    pdata = malloc( 1 );
-    size = 0;
-}
-
-int DataTable::AddBinary( const void *pdata, int size ){
+int DataTable::AddBinary( const void *buffer, int size ){
     int retSize = this->size;
 
-    this->pdata = realloc( this->pdata, this->size + size );
-    memcpy( (char *)this->pdata + this->size, pdata, size );
-    this->size += size;
+    Realloc( this->size + size );
+    memcpy( (char *)this->buffer + retSize, buffer, size );
 
     return retSize;
@@ -89 +79 @@
 const void *DataTable::GetPtr() const
 {
-    return pdata;
+    return buffer;
 }
 int DataTable::GetSize() const

trunk/abdev/BasicCompiler_Common/src/LexicalScope.cpp

@@ -72 +72 @@
 
     Variables &vars = UserProc::IsGlobalAreaCompiling() ?
-        compiler.GetMeta().GetGlobalVars() :
+        compiler.objectModule.meta.GetGlobalVars() :
         UserProc::CompilingUserProc().GetLocalVars();
 
@@ -98 +98 @@
 
     Variables &vars = UserProc::IsGlobalAreaCompiling() ?
-        compiler.GetMeta().GetGlobalVars() :
+        compiler.objectModule.meta.GetGlobalVars() :
         UserProc::CompilingUserProc().GetLocalVars();
 

trunk/abdev/BasicCompiler_Common/src/NamespaceSupporter.cpp

@@ -9 +9 @@
 {
     NamespaceScopes namespaceScopes( namespaceStr );
-    if( !compiler.GetMeta().GetNamespaces().IsExist( namespaceScopes ) ){
+    if( !compiler.objectModule.meta.GetNamespaces().IsExist( namespaceScopes ) ){
         return false;
     }