diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index cddfdb280..b8b43285e 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 = "2"; - public const string Revision = "3037"; + public const string Revision = "3038"; 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 a739c35c2..21fb95e65 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=8 -%REVISION%=3037 %COREVERSION%=2 +%REVISION%=3038 +%MINOR%=8 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index bcf194409..75ac82615 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.8.2.3037 +3.8.2.3038 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index ab185fbaa..fa6f98699 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.8.2.3037' +!define VERSION '3.8.2.3038' diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas index 015ddde21..658082e61 100644 --- a/bin/Lib/PABCSystem.pas +++ b/bin/Lib/PABCSystem.pas @@ -10988,7 +10988,7 @@ begin end; end; -/// Есть ли элемент в матрице +/// Равны ли матрицы function MatrEqual(Self,b: array[,] of T): boolean; extensionmethod := MatrEqual(Self,b); /// Вывод двумерного массива, w - ширина поля вывода diff --git a/pabcnetc/CommandConsoleCompiler.cs b/pabcnetc/CommandConsoleCompiler.cs index 6aeebd380..5e659986a 100644 --- a/pabcnetc/CommandConsoleCompiler.cs +++ b/pabcnetc/CommandConsoleCompiler.cs @@ -60,7 +60,6 @@ namespace PascalABCCompiler switch (FileOperation) { case SourceFileOperation.GetText: - if (SourceFiles.ContainsKey(fn)) return SourceFiles[fn].Text; string text = getFileText(FileName); @@ -102,7 +101,7 @@ namespace PascalABCCompiler string arg = null; ReadCommand(out command, out arg); - if (command == 182) + if (command == 182) // Error return null; int length = Convert.ToInt32(arg); return readStringFromConsole(length); diff --git a/pabcnetc_clear/ConsoleCompiler.cs b/pabcnetc_clear/ConsoleCompiler.cs index 179b4f433..c2ba45c20 100644 --- a/pabcnetc_clear/ConsoleCompiler.cs +++ b/pabcnetc_clear/ConsoleCompiler.cs @@ -158,7 +158,10 @@ namespace PascalABCCompiler return 2; } - var n1 = args.TakeWhile(a => a[0] == '/').Count(); // количество директив + // /W/a.pas расценивается как директива. Нужен более сложный паттерн: начинается с \буквы: + //var n1 = args.TakeWhile(a => a[0] == '/').Count(); // количество директив + // Поменяем: SSM 14/12/21 + var n1 = args.TakeWhile(a => System.Text.RegularExpressions.Regex.IsMatch(a, @"^/\w+:")).Count(); // количество директив if (n1