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

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp (modified) (4 diffs)

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