Changeset 343 in dev for trunk/abdev

Timestamp:

Oct 9, 2007, 1:51:56 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_Object.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Class.h (modified) (1 diff)
• BasicCompiler_Common/src/Class.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_Object.cpp

@@ -226 +226 @@
         BOOST_FOREACH( const ::Interface &objInterface, classObj.GetInterfaces() )
         {
-            BOOST_FOREACH( const CMethod *pMethod, objInterface.GetClass().GetDynamicMethods() )
+            BOOST_FOREACH( const CMethod *pMethod, objInterface.GetDynamicMethods() )
             {
                 if( pMethod->IsVirtual() )

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -50 +50 @@
     mutable int vtblOffset;
 public:
-    Interface( const CClass *pInterfaceClass )
-        : pInterfaceClass( pInterfaceClass )
-        , vtblOffset( -1 )
-    {
-    }
+    Interface( const CClass *pInterfaceClass );
 
     const CClass &GetClass() const{

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -74 +74 @@
 };
 CLoopRefCheck *pobj_LoopRefCheck;
+
+
+Interface::Interface( const CClass *pInterfaceClass )
+    : pInterfaceClass( pInterfaceClass )
+    , vtblOffset( -1 )
+{
+    //メソッドをコピー
+    BOOST_FOREACH( const CMethod *pBaseMethod, pInterfaceClass->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( pInterfaceClass );
+        }
+        else{
+            pMethod->SetInheritsClassPtr( pBaseMethod->GetInheritsClassPtr() );
+        }
+
+        GetDynamicMethods().push_back( pMethod );
+    }
+}