From 9aad3c7d3f1d3d6a36dca4ecc91514b57c0cc8f6 Mon Sep 17 00:00:00 2001 From: miks1965 Date: Sun, 7 Oct 2018 13:55:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BF=D0=BE=20exit,=20break?= 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 86068 -> 86133 bytes PABCNetHelp/LangGuide/Operators/break.html | 7 +++---- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- TestSuite/typed_var_init1.pas | 7 +++++++ 6 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 TestSuite/typed_var_init1.pas diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 3494717db..6c9405e5e 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 = "4"; public const string Build = "2"; - public const string Revision = "1822"; + public const string Revision = "1825"; 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 558fefe7a..176037c68 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=4 -%REVISION%=1822 %COREVERSION%=2 +%REVISION%=1825 +%MINOR%=4 %MAJOR%=3 diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources index c0357059ffe39ec458f46a2ca8d1425ffdac507b..eb97a7a262589a62098f9d8afea77e760416636e 100644 GIT binary patch delta 64 zcmV-G0KfmVpau1y1(4tYk+I?IW+O>XR7FxoK|@7fLqSeXPgGw*MPETxR8Kv~?egXD W^yTUC`;%^s7zAN;bZ@iEXKCoS(;qGX delta 19 bcmeymfOX3P)(H<712#TJBmD&cWOfP> diff --git a/PABCNetHelp/LangGuide/Operators/break.html b/PABCNetHelp/LangGuide/Operators/break.html index 961143e72..ae2cbb3bc 100644 --- a/PABCNetHelp/LangGuide/Operators/break.html +++ b/PABCNetHelp/LangGuide/Operators/break.html @@ -51,10 +51,9 @@ exit

Вызов exit в разделе операторов основной программы приводит к ее немедленному завершению.

-

Следует отметить, что в -PascalABC.NET (в отличие от Borland Pascal и -Borland Delphi) break, continueexit являются не процедурами, а именно операторами.

+

Более точно, break, continueexit в +PascalABC.NET являются операторами вызова специальных внутренних процедур.

diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 17290a697..f6b32d424 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.4.2.1822' +!define VERSION '3.4.2.1825' diff --git a/TestSuite/typed_var_init1.pas b/TestSuite/typed_var_init1.pas new file mode 100644 index 000000000..2711f07d4 --- /dev/null +++ b/TestSuite/typed_var_init1.pas @@ -0,0 +1,7 @@ +п»їvar c: string := '123'[1:3]; +var c1: string := '123'[1]; + +begin + Assert(c='12'); + Assert(c1='1') +end. \ No newline at end of file