This commit is contained in:
Бондарев Иван 2018-09-16 12:11:57 +02:00
parent fe1232eda4
commit 9e9056aa46

View file

@ -12680,11 +12680,15 @@ namespace PascalABCCompiler.TreeConverter
internal void CheckOverrideOrReintroduceExpectedWarning(location loc)
{
common_method_node cmn = context.top_function as common_method_node;
if (!current_converted_method_not_in_class_defined && cmn != null && !cmn.IsReintroduce && cmn.polymorphic_state == SemanticTree.polymorphic_state.ps_common)
if (context.FindMethodToOverride(cmn) != null)
if (!current_converted_method_not_in_class_defined && cmn != null && !cmn.IsReintroduce && cmn.overrided_method == null)
{
function_node fn = context.FindMethodToOverride(cmn);
if (fn != null)
{
WarningsList.Add(new OverrideOrReintroduceExpected(loc));
}
}
}
private procedure_header current_function_header = null;