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

Timestamp:

Nov 15, 2007, 3:18:41 AM (17 years ago)

Author:

dai_9181

Message:

COM修飾子に対応。COMインターフェイスを呼び出せるようにした

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• Class.cpp (modified) (10 diffs)
• Compiler.cpp (modified) (1 diff)
• DataTable.cpp (modified) (2 diffs)
• Linker.cpp (modified) (2 diffs)
• Method.cpp (modified) (1 diff)
• NativeCode.cpp (modified) (1 diff)
• Type.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -116 +116 @@
     return classType == CClass::Interface;
 }
+bool CClass::IsComInterface() const
+{
+    return classType == CClass::ComInterface;
+}
 bool CClass::IsEnum() const
 {
@@ -241 +245 @@
         }
 
-        if( pInheritsClass->IsInterface() ){
-            // インターフェイスはあとで継承する
-        }
-        else if( pInheritsClass->IsClass() ){
+        if( pInheritsClass->IsClass() ){
             // クラスを継承する
             isInheritsClass = true;
@@ -253 +254 @@
         }
         else{
-            SmoothieException::Throw(135,NULL,nowLine);
+            SetError(135,pInheritsClass->GetFullName().c_str(),nowLine);
             return false;
         }
@@ -268 +269 @@
             return false;
         }
-    }
-
-    i=0;
-    while( true ){
-
-        char temporary[VN_SIZE];
-        for( int i2=0;; i++, i2++ ){
-            if( inheritNames[i] == '\0' || inheritNames[i] == ',' ){
-                temporary[i2] = 0;
-                break;
-            }
-            temporary[i2] = inheritNames[i];
-        }
-
-        char className[VN_SIZE];
-        Jenga::Common::Strings typeParameters;
-        SplitGenericClassInstance( temporary, className, typeParameters );
-
-        //継承元クラスを取得
-        const CClass *pInheritsClass = compiler.GetObjectModule().meta.GetClasses().Find(className);
-        if( !pInheritsClass ){
-            SmoothieException::Throw(106,className,nowLine);
-            return false;
-        }
-
-        if( pInheritsClass->IsInterface() ){
-            // インターフェイスを継承する
-            if( !InheritsInterface( *pInheritsClass, nowLine ) ){
-                return false;
-            }
-        }
-        else if( pInheritsClass->IsClass() ){
-            // クラスはさっき継承した
-        }
-        else{
-            SmoothieException::Throw(135,NULL,nowLine);
-            return false;
-        }
-
-        if( inheritNames[i] == '\0' ){
-            break;
-        }
-        i++;
     }
 
@@ -388 +346 @@
     }
 
+    if( this->IsInterface() && inheritsClass.IsComInterface() )
+    {
+        // COMインターフェイスを継承した場合はCOMインターフェイスにする
+        this->SetClassType( CClass::ComInterface );
+    }
+
     return true;
 }
-bool CClass::InheritsInterface( const CClass &inheritsInterface, int nowLine ){
-
-    //ループ継承でないかをチェック
-    if(pobj_LoopRefCheck->check(inheritsInterface)){
-        SmoothieException::Throw(123,inheritsInterface.GetName(),nowLine);
-        return false;
-    }
-
-    if( !inheritsInterface.IsReady() ){
-        //継承先が読み取られていないとき
-        pobj_LoopRefCheck->add(this->GetName().c_str());
-        compiler.GetObjectModule().meta.GetClasses().GetClass_recur(inheritsInterface.GetName().c_str());
-        pobj_LoopRefCheck->del(this->GetName().c_str());
-    }
-
-    //メソッドをコピー
-    BOOST_FOREACH( const CMethod *pBaseMethod, inheritsInterface.GetDynamicMethods() ){
-        CMethod *pMethod = new DynamicMethod( *pBaseMethod );
-
-        // アクセシビリティ
-        if(pBaseMethod->GetAccessibility() == Prototype::Private){
-            pMethod->SetAccessibility( Prototype::None );
-        }
-        else{
-            pMethod->SetAccessibility( pBaseMethod->GetAccessibility() );
-        }
-
-        //pobj_Inherits
-        // ※継承元のClassIndexをセット（入れ子継承を考慮する）
-        if(pBaseMethod->GetInheritsClassPtr()==0){
-            pMethod->SetInheritsClassPtr( &inheritsInterface );
-        }
-        else{
-            pMethod->SetInheritsClassPtr( pBaseMethod->GetInheritsClassPtr() );
-        }
-
-        GetDynamicMethods().push_back( pMethod );
-    }
-
-    //interfaces.push_back( Interface( &inheritsInterface, vtblNum ) );
-
-    //仮想関数の数
-    AddVtblNum( inheritsInterface.GetVtblNum() );
-
-    return true;
-}
 
 bool CClass::Implements( const CClass &interfaceClass, int nowLine )
 {
-    if( !interfaceClass.IsInterface() )
+    if( !interfaceClass.IsInterface() && !interfaceClass.IsComInterface() )
     {
         // インターフェイスではないとき
@@ -477 +395 @@
     // キャストメソッドを追加（内部コードは自動生成すること）
     /////////////////////////////////////////////////////////////////
+    if( interfaceClass.IsInterface() )
     {
         // Function Operator() As ITest
@@ -793 +712 @@
     int i2;
 
-    //仮想関数が存在する場合は関数リストへのポインタのサイズを追加
-    int offset = IsExistVirtualFunctions() ? PTR_SIZE : 0;
+    //仮想関数が存在する場合はvtbl及びvtblMasterListへのポインタのサイズを追加
+    int offset = IsExistVirtualFunctions() ? PTR_SIZE*2 : 0;
 
     int alignment = 1;
@@ -944 +863 @@
     return 0;
 }
+long CClass::GetComVtblOffset() const
+{
+    return comVtblOffset;
+}
 long CClass::GetVtblMasterListOffset() const
 {
@@ -992 +915 @@
 
         pInterface->SetVtblOffset( tempVtblOffset );
+
+        if( pInterface->GetClass().IsComInterface() )
+        {
+            if( this->comVtblOffset )
+            {
+                SetError();
+            }
+            this->comVtblOffset = tempVtblOffset;
+        }
     }
 
@@ -1445 +1377 @@
             pobj_c->SetConstructorMemberSubIndex( -1 );
             pobj_c->SetDestructorMemberSubIndex( -1 );
+
+            if( memcmp( basbuf+i+1, "__COM", 5 ) == 0 && IsCommandDelimitation( basbuf[i+1+5] ) )
+            {
+                // COMインターフェイス
+                pobj_c->SetClassType( CClass::ComInterface );
+
+                i += 6;
+            }
 
             if(basbuf[i+1]==1&&basbuf[i+2]==ESC_INHERITS){

trunk/abdev/BasicCompiler_Common/src/Compiler.cpp

@@ -36 +36 @@
         if( !pGenericClass )
         {
-            extern int cp;
-            SetError(106, className, cp );
             return false;
         }

trunk/abdev/BasicCompiler_Common/src/DataTable.cpp

@@ -84 +84 @@
     this->lastMadeConstObjectDataTableOffset = dataTableOffset;
 
+    // com_vtblスケジュール
+    this->schedules.push_back( Schedule( Schedule::ComVtbl, &objClass, dataTableOffset ) );
+
     // vtblスケジュール
-    this->schedules.push_back( Schedule( &objClass, dataTableOffset ) );
+    this->schedules.push_back( Schedule( Schedule::Vtbl, &objClass, dataTableOffset + PTR_SIZE ) );
 
     // TypeInfoスケジュール
@@ -235 +238 @@
 
     // スケジューリング
-    this->schedules.push_back( Schedule( &strClass, headOffset ) );
+    this->schedules.push_back( Schedule( Schedule::ComVtbl, &strClass, headOffset ) );
+    this->schedules.push_back( Schedule( Schedule::Vtbl, &strClass, headOffset + PTR_SIZE ) );
     this->schedules.push_back( Schedule( Schedule::TypeInfo, &strClass, headOffset + offsetForTypeInfo ) );
     this->schedules.push_back( Schedule( Schedule::DataTable, headOffset + offsetForChars ) );

trunk/abdev/BasicCompiler_Common/src/Linker.cpp

@@ -165 +165 @@
     BOOST_FOREACH( const Schedule &schedule, nativeCode.GetSchedules() )
     {
+        if( schedule.GetType() == Schedule::ComVtbl )
+        {
+            LONG_PTR vtblOffset = schedule.GetClass().GetComVtblOffset();
+
+            nativeCode.Overwrite(
+                schedule.GetOffset(),
+                static_cast<long>( vtblOffset + imageBase + dataSectionBaseOffset )
+            );
+        }
+
         if( schedule.GetType() == Schedule::Vtbl )
         {
@@ -178 +188 @@
     BOOST_FOREACH( const Schedule &schedule, dataTable.schedules )
     {
+        if( schedule.GetType() == Schedule::ComVtbl )
+        {
+            LONG_PTR vtblOffset = schedule.GetClass().GetComVtblOffset();
+
+#ifdef _WIN64
+            dataTable.OverwriteInt64(
+                schedule.GetOffset(),
+                vtblOffset + imageBase + dataSectionBaseOffset
+            );
+#else
+            dataTable.Overwrite(
+                schedule.GetOffset(),
+                vtblOffset + imageBase + dataSectionBaseOffset
+            );
+#endif
+        }
+
         if( schedule.GetType() == Schedule::Vtbl )
         {

trunk/abdev/BasicCompiler_Common/src/Method.cpp

@@ -155 +155 @@
             if( !pMethod->GetUserProc().IsUsing() )
             {
-                ts((char *)pMethod->GetUserProc().GetFullName().c_str());
+                //ts((char *)pMethod->GetUserProc().GetFullName().c_str());
             }
             pMethod->GetUserProc().Using();

trunk/abdev/BasicCompiler_Common/src/NativeCode.cpp

@@ -95 +95 @@
 }
 
+void NativeCode::PutComVtblSchedule( const CClass *pClass )
+{
+    schedules.push_back( Schedule( Schedule::ComVtbl, pClass, GetSize() ) );
+
+    Put( (long)0 );
+}
+
 void NativeCode::PutVtblSchedule( const CClass *pClass )
 {
-    schedules.push_back( Schedule( pClass, GetSize() ) );
+    schedules.push_back( Schedule( Schedule::Vtbl, pClass, GetSize() ) );
 
     Put( (long)0 );

trunk/abdev/BasicCompiler_Common/src/Type.cpp

@@ -452 +452 @@
 {
     return ( IsObject() && GetClass().IsInterface() );
+}
+bool Type::IsComInterface() const
+{
+    return ( IsObject() && GetClass().IsComInterface() );
 }