Changeset 558 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp

Timestamp:

May 5, 2008, 10:41:25 AM (16 years ago)

Author:

dai_9181

Message:

Overrideメソッド内で発生したエラーのエラーメッセージ表示処理は呼び出し元で行うようにした。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp

@@ -185 +185 @@
 }
 
-void CClass::Implements( const CClass &interfaceClass, const Types &actualTypeParameters, int nowLine )
+void CClass::Implements( const CClass &interfaceClass, const Types &actualTypeParameters, std::vector<DynamicMethod::OverrideResult> &overrideResults )
 {
     ::Interface *pDestInterface = new ::Interface( &interfaceClass, actualTypeParameters );
@@ -197 +197 @@
     BOOST_FOREACH( CMethod *pMethod, GetDynamicMethods() )
     {
-        CMethod *pMethodForOverride = pDestInterface->GetDynamicMethods().FindForOverride( pDestInterface->GetActualTypeParameters(), &pMethod->GetUserProc() );
+        DynamicMethod *pMethodForOverride = pDestInterface->GetDynamicMethods().FindForOverride( pDestInterface->GetActualTypeParameters(), &pMethod->GetUserProc() );
         if( pMethodForOverride )
         {
-            pMethodForOverride->Override( &pMethod->GetUserProc(), pMethod->GetAccessibility(), false );
+            DynamicMethod::OverrideResult result;
+            result.enumType = pMethodForOverride->Override( &pMethod->GetUserProc(), pMethod->GetAccessibility(), false );
+            result.pMethod = pMethod;
+            overrideResults.push_back( result );
 
             // 実装元になるメソッドは呼び出し不可にしておく（オーバーロードの解決から除外する）