From 7debbe702abd79ab495869c42abe30117c6d05f0 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Sat, 21 Sep 2024 14:29:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D1=80=D0=B8=D1=82=D0=B8=D1=87=D0=B5?= =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=B5=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20LightPT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 2 +- Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- TestSuite/CompilationSamples/LightPT.pas | 6 ++++++ TestSuite/CompilationSamples/TasksArr.pas | 14 +++++++------- bin/Lib/LightPT.pas | 6 ++++++ bin/Lib/TasksArr.pas | 14 +++++++------- 8 files changed, 30 insertions(+), 18 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 68f9b0d74..35babc725 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 = "10"; public const string Build = "0"; - public const string Revision = "3544"; + public const string Revision = "3546"; 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 fd9b073ba..787d2479c 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %COREVERSION%=0 -%REVISION%=3544 +%REVISION%=3546 %MINOR%=10 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 3d1a64491..f73410b6e 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.10.0.3544 +3.10.0.3546 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 52d618e21..a6aed0991 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.10.0.3544' +!define VERSION '3.10.0.3546' diff --git a/TestSuite/CompilationSamples/LightPT.pas b/TestSuite/CompilationSamples/LightPT.pas index 03b1ca193..463ffed27 100644 --- a/TestSuite/CompilationSamples/LightPT.pas +++ b/TestSuite/CompilationSamples/LightPT.pas @@ -298,6 +298,9 @@ procedure CheckInitialIOSeqs(input,output: sequence of System.Type); procedure CheckOutputAfterInitial(params arr: array of object); // проверить только то, что после исходного вывода +procedure CheckOutputAfterInitial(a: ObjectList); + + procedure CheckOutputAfterInitialSilent(params arr: array of object); /// Проверить последовательность значений при выводе после начального вывода @@ -666,6 +669,7 @@ type constructor (ServerAddr: string); begin Self.ServerAddr := ServerAddr; + System.Net.ServicePointManager.SecurityProtocol := System.Net.SecurityProtocolType(3072); client := new HttpClient(); client.Timeout := TimeSpan.FromSeconds(10); end; @@ -2379,6 +2383,8 @@ begin CheckOutputHelper(InitialOutputList.Count,arr); end; +procedure CheckOutputAfterInitial(a: ObjectList) := CheckOutputAfterInitialSeq(a); + procedure CheckOutputAfterInitialSilent(params arr: array of object); begin Silent := True; diff --git a/TestSuite/CompilationSamples/TasksArr.pas b/TestSuite/CompilationSamples/TasksArr.pas index ad64067d5..2886b8ad7 100644 --- a/TestSuite/CompilationSamples/TasksArr.pas +++ b/TestSuite/CompilationSamples/TasksArr.pas @@ -109,13 +109,13 @@ begin var cnt4 := a.CountOf(4); var cnt5 := a.CountOf(5); - var lst := ObjectList.New; // Можно без списка. Наверное, думал выводить что то еще - case cnt4.CompareTo(cnt5) of - 1: lst.Add('четвёрок больше'); - 0: lst.Add('одинаково'); - -1: lst.Add('пятёрок больше'); - end; - CheckOutputAfterInitial(lst); + var ans: string := ''; + case cnt4.CompareTo(cnt5) of + 1: ans := 'четвёрок больше'; + 0: ans := 'одинаково'; + -1: ans := 'пятёрок больше'; + end; + CheckOutputAfterInitial(ans); end; 'Arr_Replace1': begin FilterOnlyNumbersAndBools; diff --git a/bin/Lib/LightPT.pas b/bin/Lib/LightPT.pas index 03b1ca193..463ffed27 100644 --- a/bin/Lib/LightPT.pas +++ b/bin/Lib/LightPT.pas @@ -298,6 +298,9 @@ procedure CheckInitialIOSeqs(input,output: sequence of System.Type); procedure CheckOutputAfterInitial(params arr: array of object); // проверить только то, что после исходного вывода +procedure CheckOutputAfterInitial(a: ObjectList); + + procedure CheckOutputAfterInitialSilent(params arr: array of object); /// Проверить последовательность значений при выводе после начального вывода @@ -666,6 +669,7 @@ type constructor (ServerAddr: string); begin Self.ServerAddr := ServerAddr; + System.Net.ServicePointManager.SecurityProtocol := System.Net.SecurityProtocolType(3072); client := new HttpClient(); client.Timeout := TimeSpan.FromSeconds(10); end; @@ -2379,6 +2383,8 @@ begin CheckOutputHelper(InitialOutputList.Count,arr); end; +procedure CheckOutputAfterInitial(a: ObjectList) := CheckOutputAfterInitialSeq(a); + procedure CheckOutputAfterInitialSilent(params arr: array of object); begin Silent := True; diff --git a/bin/Lib/TasksArr.pas b/bin/Lib/TasksArr.pas index ad64067d5..2886b8ad7 100644 --- a/bin/Lib/TasksArr.pas +++ b/bin/Lib/TasksArr.pas @@ -109,13 +109,13 @@ begin var cnt4 := a.CountOf(4); var cnt5 := a.CountOf(5); - var lst := ObjectList.New; // Можно без списка. Наверное, думал выводить что то еще - case cnt4.CompareTo(cnt5) of - 1: lst.Add('четвёрок больше'); - 0: lst.Add('одинаково'); - -1: lst.Add('пятёрок больше'); - end; - CheckOutputAfterInitial(lst); + var ans: string := ''; + case cnt4.CompareTo(cnt5) of + 1: ans := 'четвёрок больше'; + 0: ans := 'одинаково'; + -1: ans := 'пятёрок больше'; + end; + CheckOutputAfterInitial(ans); end; 'Arr_Replace1': begin FilterOnlyNumbersAndBools;