diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index e5cb10302..794689682 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 = "2"; public const string Build = "0"; - public const string Revision = "1488"; + public const string Revision = "1492"; 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 a454bae23..de64b317a 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %MINOR%=2 -%REVISION%=1488 +%REVISION%=1492 %COREVERSION%=0 %MAJOR%=3 diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources index 64c0639b7..48027b085 100644 Binary files a/Localization/DefaultLang.resources and b/Localization/DefaultLang.resources differ diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 2bc2ac08f..8c8e67b5e 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.2.0.1488' +!define VERSION '3.2.0.1492' diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas index a167be39a..420509543 100644 --- a/TestSuite/CompilationSamples/PABCSystem.pas +++ b/TestSuite/CompilationSamples/PABCSystem.pas @@ -3264,15 +3264,25 @@ end; /// Повторяет символ c n раз function char.operator*(c: char; n: integer): string; begin + if n<=0 then + begin + Result := ''; + exit; + end; var sb := new StringBuilder(n,n); loop n do sb.Append(c); - result := sb.ToString; + Result := sb.ToString; end; /// Повторяет символ c n раз function char.operator*(n: integer; c: char): string; begin + if n<=0 then + begin + Result := ''; + exit; + end; var sb := new StringBuilder(n,n); loop n do sb.Append(c); diff --git a/bin/Lib/PABCRtl.dll b/bin/Lib/PABCRtl.dll index 4487a1ad0..c69994c61 100644 Binary files a/bin/Lib/PABCRtl.dll and b/bin/Lib/PABCRtl.dll differ diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas index a167be39a..420509543 100644 --- a/bin/Lib/PABCSystem.pas +++ b/bin/Lib/PABCSystem.pas @@ -3264,15 +3264,25 @@ end; /// Повторяет символ c n раз function char.operator*(c: char; n: integer): string; begin + if n<=0 then + begin + Result := ''; + exit; + end; var sb := new StringBuilder(n,n); loop n do sb.Append(c); - result := sb.ToString; + Result := sb.ToString; end; /// Повторяет символ c n раз function char.operator*(n: integer; c: char): string; begin + if n<=0 then + begin + Result := ''; + exit; + end; var sb := new StringBuilder(n,n); loop n do sb.Append(c); diff --git a/bin/PascalABCNET.chm b/bin/PascalABCNET.chm index 27798eed4..fe4c7c4dd 100644 Binary files a/bin/PascalABCNET.chm and b/bin/PascalABCNET.chm differ