Changeset 346 in dev for trunk

Timestamp:

Oct 10, 2007, 4:01:07 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_Object.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Object.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Class.h (modified) (2 diffs)
• BasicCompiler_Common/include/Method.h (modified) (1 diff)
• BasicCompiler_Common/src/Class.cpp (modified) (6 diffs)
• BasicCompiler_Common/src/Method.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_Object.cpp

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

trunk/abdev/BasicCompiler64/Compile_Object.cpp

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

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -98 +98 @@
     }
 };
-typedef std::vector<Interface> Interfaces;
+typedef std::vector<Interface *> Interfaces;
 
 class CClass: public ClassPrototype, public Jenga::Common::ObjectInHashmap<CClass>
@@ -215 +215 @@
     {
         // 動的メンバ
-        BOOST_FOREACH( CMember *member, dynamicMembers ){
+        BOOST_FOREACH( CMember *member, dynamicMembers )
+        {
             delete member;
         }
 
         // 静的メンバ
-        BOOST_FOREACH( CMember *member, staticMembers ){
+        BOOST_FOREACH( CMember *member, staticMembers )
+        {
             delete member;
+        }
+
+        // インターフェイス
+        BOOST_FOREACH( ::Interface *pInterface, interfaces )
+        {
+            delete pInterface;
         }
     }

trunk/abdev/BasicCompiler_Common/include/Method.h

@@ -197 +197 @@
     void AddStatic(UserProc *pUserProc,Prototype::Accessibility accessibility);
 
+    // オーバーライド
+    bool Override( UserProc *pUserProc, Prototype::Accessibility accessibility );
+
     const CMethod *GetMethodPtr( const UserProc *pUserProc ) const;
     bool IsExist( const char *name ) const;

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -198 +198 @@
 bool CClass::IsInheritsInterface( const CClass *pInterfaceClass ) const
 {
-    BOOST_FOREACH( const ::Interface &objInterface, interfaces ){
-        if( pInterfaceClass == &objInterface.GetClass() ){
+    BOOST_FOREACH( const ::Interface *pInterface, interfaces ){
+        if( pInterfaceClass == &pInterface->GetClass() ){
             return true;
         }
@@ -447 +447 @@
     }
 
-    interfaces.push_back( ::Interface( &interfaceClass ) );
+    interfaces.push_back( new ::Interface( &interfaceClass ) );
 
     return true;
@@ -587 +587 @@
     if( isAbstract ) pUserProc->CompleteCompile();
 
-    //メソッドのオーバーライド
-    BOOST_FOREACH( CMethod *pMethod, pobj_c->GetDynamicMethods() ){
-        if( pMethod->GetUserProc().GetName() == temporary ){
-            if( pMethod->GetUserProc().Params().Equals( pUserProc->Params() )
-                && pMethod->GetUserProc().ReturnType().Equals( pUserProc->ReturnType() ) )
+    // メソッドのオーバーライド
+    if( pobj_c->GetDynamicMethods().Override( pUserProc, accessibility ) )
+    {
+        // オーバーライドが行われた場合
+        if( !isOverride )
+        {
+            SetError(127,NULL,nowLine);
+        }
+        return;
+    }
+    else
+    {
+        // インターフェイス メソッドのオーバーライド
+        BOOST_FOREACH( ::Interface *pInterface, pobj_c->GetInterfaces() )
+        {
+            if( pInterface->GetDynamicMethods().Override( pUserProc, accessibility ) )
             {
-                //メンバ関数を上書き
-                pMethod->SetUserProcPtr( pUserProc );
-                pMethod->Override();
-
-                if( !pMethod->IsVirtual() )
-                {
-                    // オーバーライドミス
-                    SetError(136,NULL,cp);
-                }
+                // オーバーライドが行われた場合
                 if( !isOverride )
                 {
                     SetError(127,NULL,nowLine);
                 }
-                if(pMethod->GetAccessibility() != accessibility )
-                {
-                    SetError(128,NULL,nowLine);
-                }
-
-                pUserProc->SetMethod( pMethod );
                 return;
             }
@@ -802 +799 @@
     }
 
-    BOOST_FOREACH( const ::Interface &objInterface, interfaces )
+    BOOST_FOREACH( const ::Interface *pInterface, interfaces )
     {
         index++;
 
-        BOOST_FOREACH( const CMethod *pMethod, objInterface.GetClass().GetDynamicMethods() ){
+        BOOST_FOREACH( const CMethod *pMethod, pInterface->GetClass().GetDynamicMethods() ){
             if( &pMethod->GetUserProc() == pUserProc )
             {
@@ -902 +899 @@
 
     // インターフェイスのvtblを生成
-    BOOST_FOREACH( const ::Interface &objInterface, interfaces )
+    BOOST_FOREACH( const ::Interface *pInterface, interfaces )
     {
         long tempVtblOffset;
-        objInterface.GetClass().GenerateVTablePart( tempVtblOffset );
+        pInterface->GetClass().GenerateVTablePart( tempVtblOffset );
         vtblMasterList.push_back( tempVtblOffset );
 
-        objInterface.SetVtblOffset( tempVtblOffset );
+        pInterface->SetVtblOffset( tempVtblOffset );
     }
 
@@ -947 +944 @@
 
     // インターフェイスのvtbl
-    BOOST_FOREACH( const ::Interface &objInterface, interfaces )
-    {
-        LONG_PTR *pVtbl = (LONG_PTR *)((char *)compiler.GetObjectModule().dataTable.GetPtr() + objInterface.GetClass().vtbl_offset);
-
-        for( int i=0; i<objInterface.GetClass().GetVtblNum(); i++ ){
+    BOOST_FOREACH( const ::Interface *pInterface, interfaces )
+    {
+        LONG_PTR *pVtbl = (LONG_PTR *)((char *)compiler.GetObjectModule().dataTable.GetPtr() + pInterface->GetClass().vtbl_offset);
+
+        for( int i=0; i<pInterface->GetClass().GetVtblNum(); i++ ){
             const UserProc *pUserProc = (UserProc *)pVtbl[i];
             if(!pUserProc) continue;

trunk/abdev/BasicCompiler_Common/src/Method.cpp

@@ -24 +24 @@
     this->push_back( pMethod );
     pUserProc->SetMethod( pMethod );
+}
+
+bool Methods::Override( UserProc *pUserProc, Prototype::Accessibility accessibility )
+{
+    //メソッドのオーバーライド
+    Methods &methods = *this;
+    BOOST_FOREACH( CMethod *pMethod, methods )
+    {
+        if( pMethod->GetUserProc().GetName() == pUserProc->GetName() )
+        {
+            if( pMethod->GetUserProc().Params().Equals( pUserProc->Params() )
+                && pMethod->GetUserProc().ReturnType().Equals( pUserProc->ReturnType() ) )
+            {
+                //メンバ関数を上書き
+                pMethod->SetUserProcPtr( pUserProc );
+                pMethod->Override();
+
+                if( !pMethod->IsVirtual() )
+                {
+                    // オーバーライドミス
+                    SetError(136,NULL,cp);
+                }
+                if(pMethod->GetAccessibility() != accessibility )
+                {
+                    SetError(128,NULL,cp);
+                }
+
+                pUserProc->SetMethod( pMethod );
+                return true;
+            }
+        }
+    }
+    return false;
 }