From 28a8fc115d81e01ab3423d73d998f009cfcee79c Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Thu, 12 Mar 2020 00:23:13 +0300 Subject: [PATCH] fix #2168 --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- TestSuite/CompilationSamples/PABCSystem.pas | 4 ++-- TestSuite/IntPtrAsLambdaParam.pas | 4 ++++ TreeConverter/TreeRealization/types.cs | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 TestSuite/IntPtrAsLambdaParam.pas diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 214c46f2b..ea883be91 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 = "6"; public const string Build = "2"; - public const string Revision = "2378"; + public const string Revision = "2379"; 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 54893a750..f4209befd 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=2 -%REVISION%=2378 %MINOR%=6 +%REVISION%=2379 +%COREVERSION%=2 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 3e765b6c5..ec7b1ff54 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.6.2.2378 +3.6.2.2379 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index c78f9a725..5b0afd644 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.6.2.2378' +!define VERSION '3.6.2.2379' diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas index 3b08012c8..7b9ea10fd 100644 --- a/TestSuite/CompilationSamples/PABCSystem.pas +++ b/TestSuite/CompilationSamples/PABCSystem.pas @@ -770,7 +770,7 @@ procedure Read(var x: BigInteger); procedure Readln; ///- function TryRead(var x: число): boolean; -/// Вводит числовое значение x клавиатуры. Возвращает False если при вводе произошла ошибка +/// Вводит числовое значение x с клавиатуры. Возвращает False если при вводе произошла ошибка function TryRead(var x: integer): boolean; ///-- function TryRead(var x: real): boolean; @@ -793,7 +793,7 @@ function TryRead(var x: single): boolean; ///-- function TryRead(var x: BigInteger): boolean; -/// Вводит логическое значение x клавиатуры. Возвращает False если при вводе произошла ошибка +/// Вводит логическое значение x с клавиатуры. Возвращает False если при вводе произошла ошибка function TryRead(var x: boolean): boolean; /// Возвращает значение типа integer, введенное с клавиатуры diff --git a/TestSuite/IntPtrAsLambdaParam.pas b/TestSuite/IntPtrAsLambdaParam.pas new file mode 100644 index 000000000..c05d69e5b --- /dev/null +++ b/TestSuite/IntPtrAsLambdaParam.pas @@ -0,0 +1,4 @@ +begin + var cb: System.Action; + cb := i->exit(); +end. \ No newline at end of file diff --git a/TreeConverter/TreeRealization/types.cs b/TreeConverter/TreeRealization/types.cs index 954ff4fa1..7205d16d5 100644 --- a/TreeConverter/TreeRealization/types.cs +++ b/TreeConverter/TreeRealization/types.cs @@ -382,7 +382,7 @@ namespace PascalABCCompiler.TreeRealization { get { - return name; + return full_name; } }