Changeset 558 in dev for trunk

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• include/Class.h (modified) (1 diff)
• include/Method.h (modified) (4 diffs)
• src/Class.cpp (modified) (2 diffs)
• src/LexicalAnalyzer_Class.cpp (modified) (4 diffs)
• src/Method.cpp (modified) (4 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/include/Class.h

@@ -316 +316 @@
 
     // インターフェイス実装
-    void Implements( const CClass &interfaceClass, const Types &actualTypeParameters, int nowLine );
+    void Implements( const CClass &interfaceClass, const Types &actualTypeParameters, std::vector<DynamicMethod::OverrideResult> &overrideResults );
 
     //メンバ、メソッドの追加

trunk/ab5.0/abdev/BasicCompiler_Common/include/Method.h

@@ -37 +37 @@
         this->pUserProc = pUserProc;
     }
-
-    virtual bool Override( const UserProc *pUserProc, Prototype::Accessibility accessibility, bool isOverrideModifier ) = 0;
 
     virtual bool IsAbstract() const = 0;
@@ -54 +52 @@
 class DynamicMethod : public CMethod
 {
+public:
+    struct OverrideResult
+    {
+        enum EnumType
+        {
+            Successful = 0,             // オーバーライドに成功
+            NotVirtual,                 // 非Virtualメソッドに対してオーバーライドを行おうとした
+            NotUseOverrideModifier,     // Override修飾子が無い状況で基底クラスの実体メソッドをオーバーライドしようとした
+            DifferentAccesibility,      // オーバーライド元、先のアクセシビリティに相違がある
+        };
+
+        EnumType enumType;
+        const CMethod *pMethod;
+    };
+
+private:
     bool isAbstract;
     bool isVirtual;
@@ -100 +114 @@
     }
 
-    virtual bool Override( const UserProc *pUserProc, Prototype::Accessibility accessibility, bool isOverrideModifier );
+    DynamicMethod::OverrideResult::EnumType Override( const UserProc *pUserProc, Prototype::Accessibility accessibility, bool isOverrideModifier );
 
     virtual bool IsAbstract() const
@@ -250 +264 @@
             pUserProc 照らし合わせる関数
     */
-    CMethod *FindForOverride( const Types &actualTypeParametersForThisMethods, const UserProc *pUserProc );
+    DynamicMethod *FindForOverride( const Types &actualTypeParametersForThisMethods, const UserProc *pUserProc );
 
     const CMethod *GetMethodPtr( const UserProc *pUserProc ) const;

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 );
 
             // 実装元になるメソッドは呼び出し不可にしておく（オーバーロードの解決から除外する）

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

@@ -248 +248 @@
 }
 
+void OverrideErrorCheck( const DynamicMethod::OverrideResult &result )
+{
+    switch( result.enumType )
+    {
+    case DynamicMethod::OverrideResult::Successful:
+        break;
+    case DynamicMethod::OverrideResult::NotVirtual:
+        compiler.errorMessenger.Output(136, result.pMethod->GetUserProc().GetName(), cp);
+        break;
+    case DynamicMethod::OverrideResult::NotUseOverrideModifier:
+        compiler.errorMessenger.Output(127, result.pMethod->GetUserProc().GetName(), cp);
+        break;
+    case DynamicMethod::OverrideResult::DifferentAccesibility:
+        compiler.errorMessenger.Output(128, result.pMethod->GetUserProc().GetName(), cp);
+        break;
+    default:
+        throw;
+    }
+}
+
 void LexicalAnalyzer::AddMethod(CClass *pobj_c, UserProc *pUserProc, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,
     bool isVirtual, bool isOverride, const char *interfaceName, bool isAutoGeneration, int nowLine)
@@ -320 +340 @@
 
     // メソッドのオーバーライド
-    CMethod *pMethodForOverride = pobj_c->GetDynamicMethods().FindForOverride( pobj_c->GetSuperClassActualTypeParameters(), pUserProc );
+    DynamicMethod *pMethodForOverride = pobj_c->GetDynamicMethods().FindForOverride( pobj_c->GetSuperClassActualTypeParameters(), pUserProc );
     if( pMethodForOverride )
     {
-        pMethodForOverride->Override( pUserProc, accessibility, isOverride );
+        DynamicMethod::OverrideResult result;
+        result.enumType = pMethodForOverride->Override( pUserProc, accessibility, isOverride );
+        result.pMethod = pMethodForOverride;
+        OverrideErrorCheck( result );
+
         pUserProc->SetMethod( pMethodForOverride );
         return;
@@ -349 +373 @@
             }
 
-            CMethod *pMethodForOverride = pInterface->GetDynamicMethods().FindForOverride( pInterface->GetActualTypeParameters(), pUserProc );
+            DynamicMethod *pMethodForOverride = pInterface->GetDynamicMethods().FindForOverride( pInterface->GetActualTypeParameters(), pUserProc );
             if( pMethodForOverride )
             {
-                pMethodForOverride->Override( pUserProc, accessibility, isOverride );
+                DynamicMethod::OverrideResult result;
+                result.enumType = pMethodForOverride->Override( pUserProc, accessibility, isOverride );
+                result.pMethod = pMethodForOverride;
+                OverrideErrorCheck( result );
+
                 pUserProc->SetMethod( pMethodForOverride );
                 return;
@@ -512 +540 @@
         {
             // インターフェイスを継承する
-            currentClass.Implements( *pInterfaceClass, actualTypeParameters, nowLine );
+            std::vector<DynamicMethod::OverrideResult> overrideResults;
+            currentClass.Implements( *pInterfaceClass, actualTypeParameters, overrideResults );
+
+            // エラーチェック
+            BOOST_FOREACH( const DynamicMethod::OverrideResult result, overrideResults )
+            {
+                OverrideErrorCheck( result );
+            }
         }
         else

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

@@ -4 +4 @@
 
 
-bool DynamicMethod::Override( const UserProc *pUserProc, Prototype::Accessibility accessibility, bool isOverrideModifier )
+DynamicMethod::OverrideResult::EnumType DynamicMethod::Override( const UserProc *pUserProc, Prototype::Accessibility accessibility, bool isOverrideModifier )
 {
-    if( this->IsVirtual()
-        && !this->IsAbstract()
-        && isOverrideModifier == false )
-    {
-        // Override修飾子が無い状況で基底クラスの実体メソッドをオーバーライドしようとした
-        compiler.errorMessenger.Output(127,NULL,cp);
-    }
+    bool isAbstractBefore = this->IsAbstract();
 
     //メンバ関数を上書き
@@ -18 +12 @@
     this->SetAbstractMark( false );
 
-    if( !this->IsVirtual() )
+    if( this->IsVirtual() )
     {
-        // オーバーライドミス
-        compiler.errorMessenger.Output(136, pUserProc->GetName(), cp);
+        if( !isAbstractBefore && isOverrideModifier == false )
+        {
+            return OverrideResult::NotUseOverrideModifier;
+        }
     }
-    if(this->GetAccessibility() != accessibility )
+    else
     {
-        compiler.errorMessenger.Output(128,NULL,cp);
+        return OverrideResult::NotVirtual;
     }
 
-    return true;
+    if( this->GetAccessibility() != accessibility )
+    {
+        return OverrideResult::DifferentAccesibility;
+    }
+
+    return OverrideResult::Successful;
 }
 
@@ -71 +72 @@
 }
 
-CMethod *Methods::FindForOverride( const Types &actualTypeParametersForThisMethods, const UserProc *pUserProc )
+DynamicMethod *Methods::FindForOverride( const Types &actualTypeParametersForThisMethods, const UserProc *pUserProc )
 {
     //メソッドのオーバーライド
@@ -79 +80 @@
         if( !pMethod->IsNotUse() && pMethod->GetUserProc().IsEqualForOverride( actualTypeParametersForThisMethods, pUserProc ) )
         {
-            return pMethod;
+            return dynamic_cast<DynamicMethod *>(pMethod);
         }
     }