From 9e9056aa46d26a53fe838a7241be51ec50741188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=BE=D0=BD=D0=B4=D0=B0=D1=80=D0=B5=D0=B2=20=D0=98?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD?= Date: Sun, 16 Sep 2018 12:11:57 +0200 Subject: [PATCH] fix #1183 --- TreeConverter/TreeConversion/syntax_tree_visitor.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs index 8ad24a841..e47bb2049 100644 --- a/TreeConverter/TreeConversion/syntax_tree_visitor.cs +++ b/TreeConverter/TreeConversion/syntax_tree_visitor.cs @@ -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;