From 0d37232d21ce81d3443ad680b21b865a2b2fe017 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Tue, 27 Feb 2024 19:15:08 +0300 Subject: [PATCH] =?UTF-8?q?School=20-=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=83=D1=81=D1=82?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=B4=D0=B8=D0=B0=D0=BF=D0=B0=D0=B7=D0=BE?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D1=81=D1=82=D1=8B=D1=85=20?= =?UTF-8?q?=D0=B8=20IP-=D0=B0=D0=B4=D1=80=D0=B5=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- Localization/DefaultLang.resources | Bin 101893 -> 101898 bytes Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- TestSuite/CompilationSamples/School.pas | 5 +++-- bin/Lib/School.pas | 5 +++-- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 41e7be36f..79149d498 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 = "9"; public const string Build = "0"; - public const string Revision = "3422"; + public const string Revision = "3425"; 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 d3c8d9271..45f4b88a3 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=0 -%REVISION%=3422 %MINOR%=9 +%REVISION%=3425 +%COREVERSION%=0 %MAJOR%=3 diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources index 48f76c2a172eadf797700b75c248595c3dde7e59..850e535e2aacb7aedf2c97f4f68568b2c377ed98 100644 GIT binary patch delta 65 zcmZpj!`3y2ZNdXawZ?~AA2J5#Fgbfn&&_3&-5!+7_=}y7ZNdXa#m0wQA2J5#FnUbS%Vm_^9-Pbgi+#FZDWmN4oKnX3a8~yAr)7+) F;sAa}6?*^x diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 2f0ff700a..c97a0f8e2 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3422 +3.9.0.3425 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 1d2d8cbc8..db1833a13 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3422' +!define VERSION '3.9.0.3425' diff --git a/TestSuite/CompilationSamples/School.pas b/TestSuite/CompilationSamples/School.pas index dfded24ca..a71145dd8 100644 --- a/TestSuite/CompilationSamples/School.pas +++ b/TestSuite/CompilationSamples/School.pas @@ -1,4 +1,4 @@ -/// Учебный модуль, реализующий базовые алгоритмы информатики (04.11.2023) +/// Учебный модуль, реализующий базовые алгоритмы информатики (27.02.2024) unit School; interface @@ -763,6 +763,7 @@ begin if prime > n then break; if prime >= m then Result.Add(prime) end; + if Result.Count = 0 then exit; m := Result[^1] + 1; if m >= n then exit end; @@ -1440,7 +1441,7 @@ function CalcIP.GenAddr: sequence of Addr32; begin var n := n_hosts; if n > 0 then - for var i := 0 to n_hosts - 1 do + for var i := 1 to n_hosts do yield network32 + i else yield sequence Seq&; end; diff --git a/bin/Lib/School.pas b/bin/Lib/School.pas index dfded24ca..a71145dd8 100644 --- a/bin/Lib/School.pas +++ b/bin/Lib/School.pas @@ -1,4 +1,4 @@ -/// Учебный модуль, реализующий базовые алгоритмы информатики (04.11.2023) +/// Учебный модуль, реализующий базовые алгоритмы информатики (27.02.2024) unit School; interface @@ -763,6 +763,7 @@ begin if prime > n then break; if prime >= m then Result.Add(prime) end; + if Result.Count = 0 then exit; m := Result[^1] + 1; if m >= n then exit end; @@ -1440,7 +1441,7 @@ function CalcIP.GenAddr: sequence of Addr32; begin var n := n_hosts; if n > 0 then - for var i := 0 to n_hosts - 1 do + for var i := 1 to n_hosts do yield network32 + i else yield sequence Seq&; end;