From 80f8e2601101a0be84a221bb0abd2c8bd2d1bdaa Mon Sep 17 00:00:00 2001 From: Ivan Bondarev Date: Sun, 18 Dec 2022 13:55:26 +0100 Subject: [PATCH] #2758 --- TestSuite/errors/err0515_foreach_func_type.pas | 2 +- TestSuite/errors/err0516_foreach_func_type.pas | 2 +- TreeConverter/TreeConversion/SyntaxTreeVisitorNodes/Foreach.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TestSuite/errors/err0515_foreach_func_type.pas b/TestSuite/errors/err0515_foreach_func_type.pas index 1ac5f175e..e1f7d4352 100644 --- a/TestSuite/errors/err0515_foreach_func_type.pas +++ b/TestSuite/errors/err0515_foreach_func_type.pas @@ -1,4 +1,4 @@ -//!Нельзя преобразовать тип integer к Func +//!Нельзя преобразовать тип Func к integer procedure p1(a: array of ()->T; v: T) := a[0] := ()->v; begin diff --git a/TestSuite/errors/err0516_foreach_func_type.pas b/TestSuite/errors/err0516_foreach_func_type.pas index da06f030f..d972888ee 100644 --- a/TestSuite/errors/err0516_foreach_func_type.pas +++ b/TestSuite/errors/err0516_foreach_func_type.pas @@ -1,4 +1,4 @@ -//!Нельзя преобразовать тип integer к Func +//!Нельзя преобразовать тип Func к integer procedure p1(a: array of ()->T; v: T) := a[0] := ()->v; begin diff --git a/TreeConverter/TreeConversion/SyntaxTreeVisitorNodes/Foreach.cs b/TreeConverter/TreeConversion/SyntaxTreeVisitorNodes/Foreach.cs index 464be2ac3..799136f63 100644 --- a/TreeConverter/TreeConversion/SyntaxTreeVisitorNodes/Foreach.cs +++ b/TreeConverter/TreeConversion/SyntaxTreeVisitorNodes/Foreach.cs @@ -184,7 +184,7 @@ namespace PascalABCCompiler.TreeConverter convertion_data_and_alghoritms.check_convert_type_with_inheritance(elem_type, foreachVariable.type, get_location(_foreach_stmt.identifier)); if (elem_type.IsDelegate && !foreachVariable.type.IsDelegate) - AddError(new CanNotConvertTypes(null, foreachVariable.type, elem_type, get_location(_foreach_stmt.identifier))); + AddError(new CanNotConvertTypes(null, elem_type, foreachVariable.type, get_location(_foreach_stmt.identifier))); return foreachVariable; }