diff --git a/CodeCompletion/Properties/AssemblyInfo.cs b/CodeCompletion/Properties/AssemblyInfo.cs index 37a11d855..2439ab3e8 100644 --- a/CodeCompletion/Properties/AssemblyInfo.cs +++ b/CodeCompletion/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("CodeCompletion")] -[assembly: AssemblyCopyright("Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich")] +[assembly: AssemblyCopyright("Copyright © 2005-2023 by Ivan Bondarev, Stanislav Mikhalkovich")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 9c523d9a5..a565a6391 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "8"; public const string Build = "3"; - public const string Revision = "3219"; + public const string Revision = "3222"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index bd15ddf6c..a5b811a43 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=8 -%REVISION%=3219 %COREVERSION%=3 +%REVISION%=3222 +%MINOR%=8 %MAJOR%=3 diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources index 00acef96e..81f91a02f 100644 Binary files a/Localization/DefaultLang.resources and b/Localization/DefaultLang.resources differ diff --git a/Localization/Properties/AssemblyInfo.cs b/Localization/Properties/AssemblyInfo.cs index 916773ef2..dfce01597 100644 --- a/Localization/Properties/AssemblyInfo.cs +++ b/Localization/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Localization")] -[assembly: AssemblyCopyright("Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich")] +[assembly: AssemblyCopyright("Copyright © 2005-2023 by Ivan Bondarev, Stanislav Mikhalkovich")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Optimizer/Properties/AssemblyInfo.cs b/Optimizer/Properties/AssemblyInfo.cs index cb74d707f..ddfc090ed 100644 --- a/Optimizer/Properties/AssemblyInfo.cs +++ b/Optimizer/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Optimizer")] -[assembly: AssemblyCopyright("Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich")] +[assembly: AssemblyCopyright("Copyright © 2005-2023 by Ivan Bondarev, Stanislav Mikhalkovich")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Optimizer/SemanticTreeConverter.cs b/Optimizer/SemanticTreeConverter.cs index ecec6097e..0d1193db8 100644 --- a/Optimizer/SemanticTreeConverter.cs +++ b/Optimizer/SemanticTreeConverter.cs @@ -29,7 +29,7 @@ namespace PascalABCCompiler public string Copyright { - get { return "Copyright 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich"; } + get { return "Copyright 2005-2023 by Ivan Bondarev, Stanislav Mikhalkovich"; } } public PascalABCCompiler.SemanticTreeConverters.ConverterType ConverterType diff --git a/Parsers/PascalABCParserNewSaushkin/DocTagsParser/Parser.cs b/Parsers/PascalABCParserNewSaushkin/DocTagsParser/Parser.cs index 1691e80da..d1932684c 100644 --- a/Parsers/PascalABCParserNewSaushkin/DocTagsParser/Parser.cs +++ b/Parsers/PascalABCParserNewSaushkin/DocTagsParser/Parser.cs @@ -193,7 +193,7 @@ namespace PascalABCCompiler.DocTagsParser { get { - return "Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich"; + return "Copyright © 2005-2023 by Ivan Bondarev, Stanislav Mikhalkovich"; } } diff --git a/Parsers/PascalABCParserNewSaushkin/Parser.cs b/Parsers/PascalABCParserNewSaushkin/Parser.cs index fa7dc0503..030bf6e3c 100644 --- a/Parsers/PascalABCParserNewSaushkin/Parser.cs +++ b/Parsers/PascalABCParserNewSaushkin/Parser.cs @@ -114,7 +114,7 @@ namespace PascalABCCompiler.PascalABCNewParser //public Preprocessor2.Preprocessor2 preprocessor2 = new PascalABCCompiler.Preprocessor2.Preprocessor2(null); public PascalABCNewLanguageParser() - : base("PascalABC.NET", "1.2", "Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich", false, new string[] { ".pas" }) + : base("PascalABC.NET", "1.2", "Copyright © 2005-2023 by Ivan Bondarev, Stanislav Mikhalkovich", false, new string[] { ".pas" }) { } diff --git a/Parsers/VBNETParser/AssemblyInfo.cs b/Parsers/VBNETParser/AssemblyInfo.cs index 71fea5fae..57f055ebf 100644 --- a/Parsers/VBNETParser/AssemblyInfo.cs +++ b/Parsers/VBNETParser/AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("VBNETParser")] -[assembly: AssemblyCopyright("Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich")] +[assembly: AssemblyCopyright("Copyright © 2005-2023 by Ivan Bondarev, Stanislav Mikhalkovich")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 45dae437e..61f8fa1a1 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.8.3.3219 +3.8.3.3222 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 63fa0615d..3504ea5aa 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.8.3.3219' +!define VERSION '3.8.3.3222' diff --git a/SyntaxTreeConverters/Properties/AssemblyInfo.cs b/SyntaxTreeConverters/Properties/AssemblyInfo.cs index 4895034ba..0fcc073dd 100644 --- a/SyntaxTreeConverters/Properties/AssemblyInfo.cs +++ b/SyntaxTreeConverters/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SyntaxTreeChanger")] -[assembly: AssemblyCopyright("Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich")] +[assembly: AssemblyCopyright("Copyright © 2005-2023 by Ivan Bondarev, Stanislav Mikhalkovich")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/SyntaxVisitors/Properties/AssemblyInfo.cs b/SyntaxVisitors/Properties/AssemblyInfo.cs index b58549cd6..cdb9fddfd 100644 --- a/SyntaxVisitors/Properties/AssemblyInfo.cs +++ b/SyntaxVisitors/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SyntaxVisitors")] -[assembly: AssemblyCopyright("Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich")] +[assembly: AssemblyCopyright("Copyright © 2005-2023 by Ivan Bondarev, Stanislav Mikhalkovich")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/TreeConverter/TreeRealization/type_table.cs b/TreeConverter/TreeRealization/type_table.cs index 4104a0b96..e71fa4c39 100644 --- a/TreeConverter/TreeRealization/type_table.cs +++ b/TreeConverter/TreeRealization/type_table.cs @@ -575,6 +575,48 @@ namespace PascalABCCompiler.TreeRealization implements = true; break; } + // Тут можно проверить на ковариантность + else if (interf is compiled_generic_instance_type_node cgitn && base_class is compiled_generic_instance_type_node bcgitn) + { + if (cgitn.original_generic != null && cgitn.original_generic == bcgitn.original_generic) + { + var ctcgi = cgitn.original_generic as compiled_type_node; + if (ctcgi != null) + { + // теперь надо проверить параметры на ковариантность - все + var n = bcgitn.instance_params.Count; + var n1 = cgitn.instance_params.Count; + + var impl = true; + if (n != n1) + impl = false; + else + for (int i=0; i "Teacher Control Plugin"; } public string Version { get => "0.1"; } - public string Copyright { get => "Copyright © 2021-2022 by Stanislav Mikhalkovich"; } + public string Copyright { get => "Copyright © 2021-2023 by Stanislav Mikhalkovich"; } public string Login = null; public string Password = null; diff --git a/bin/Lng/Rus/VisualPascalABCNET.dat b/bin/Lng/Rus/VisualPascalABCNET.dat index da6a6bffa..41267d616 100644 --- a/bin/Lng/Rus/VisualPascalABCNET.dat +++ b/bin/Lng/Rus/VisualPascalABCNET.dat @@ -13,7 +13,7 @@ M_SAVE=Сохранить M_SAVEAS=Сохранить как... M_SAVEALL=Сохранить все M_CLOSE=Закрыть -M_CLOSEALLBUTTHIS=Закрыть все, кроме текущего +M_CLOSEALLBUTTHIS=Закрыть все, кроме текущего M_PRINT=Печать... M_RECENTFILES=Последние файлы M_RECENTPROJECTS=Последние проекты diff --git a/pabcnetc/AssemblyInfo.cs b/pabcnetc/AssemblyInfo.cs index 2d91ea0b4..b3417ee3d 100644 --- a/pabcnetc/AssemblyInfo.cs +++ b/pabcnetc/AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich")] +[assembly: AssemblyCopyright("Copyright © 2005-2023 by Ivan Bondarev, Stanislav Mikhalkovich")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/pabcnetc/ConsoleCompiler.cs b/pabcnetc/ConsoleCompiler.cs index dafaa8b6a..9da1e1570 100644 --- a/pabcnetc/ConsoleCompiler.cs +++ b/pabcnetc/ConsoleCompiler.cs @@ -374,7 +374,7 @@ namespace PascalABCCompiler DateTime ldt = DateTime.Now; Compiler = new PascalABCCompiler.Compiler(null,ChangeCompilerState); //GC.Collect(); - WriteColorText(Compiler.Banner + "\nCopyright (c) 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich\n", ConsoleColor.Green); + WriteColorText(Compiler.Banner + "\nCopyright (c) 2005-2023 by Ivan Bondarev, Stanislav Mikhalkovich\n", ConsoleColor.Green); Console.WriteLine("OK {0}ms", (DateTime.Now - ldt).TotalMilliseconds); if (Compiler.SupportedSourceFiles.Length == 0) WriteColorText(StringResourcesGet("ERROR_PARSERS_NOT_FOUND")+Environment.NewLine, ConsoleColor.Red); diff --git a/pabcnetc_clear/AssemblyInfo.cs b/pabcnetc_clear/AssemblyInfo.cs index 3a358d432..850eeeb61 100644 --- a/pabcnetc_clear/AssemblyInfo.cs +++ b/pabcnetc_clear/AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Copyright 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich")] +[assembly: AssemblyCopyright("Copyright 2005-2023 by Ivan Bondarev, Stanislav Mikhalkovich")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")]