Changeset 346 in dev for trunk/abdev/BasicCompiler_Common/src/Method.cpp

Timestamp:

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

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/src/Method.cpp (modified) (1 diff)

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;
 }