From 831671ab8b1bc2c65641a1e5638c5d8f6bd49986 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Sun, 16 Dec 2018 21:34:45 +0300 Subject: [PATCH] fix #1600 --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- TestSuite/CompilationSamples/PABCSystem.pas | 7 +++++-- bin/Lib/PABCSystem.pas | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 498c8d3a2..b89a8f235 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 = "1897"; + public const string Revision = "1898"; 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 7889cb93c..ae6c1e25f 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=2 -%REVISION%=1897 %MINOR%=4 +%REVISION%=1898 +%COREVERSION%=2 %MAJOR%=3 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 411337ceb..3c78fd8ab 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.4.2.1897' +!define VERSION '3.4.2.1898' diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas index 8b584ae3f..565ccd67a 100644 --- a/TestSuite/CompilationSamples/PABCSystem.pas +++ b/TestSuite/CompilationSamples/PABCSystem.pas @@ -6358,7 +6358,7 @@ begin else if t.IsEnum then Result := f.br.ReadInt32 else if t.IsValueType then begin - elem := Activator.CreateInstance(t); + elem := Activator.CreateInstance(t,true); fa := t.GetFields(System.Reflection.BindingFlags.GetField or System.Reflection.BindingFlags.Instance or System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.NonPublic); for var i := 0 to fa.Length - 1 do if {not fa[i].IsStatic and} not fa[i].IsLiteral then @@ -6877,7 +6877,10 @@ begin //result:= Convert.ToString(integer(p), 16); if p = nil then result := 'nil' - else result := '$' + integer(p).ToString('X'); + else if Environment.Is64BitProcess then + result := '$' + int64(p).ToString('X') + else + result := '$' + integer(p).ToString('X') end; procedure Exec(filename: string); diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas index d5048cfca..565ccd67a 100644 --- a/bin/Lib/PABCSystem.pas +++ b/bin/Lib/PABCSystem.pas @@ -6358,7 +6358,7 @@ begin else if t.IsEnum then Result := f.br.ReadInt32 else if t.IsValueType then begin - elem := Activator.CreateInstance(t); + elem := Activator.CreateInstance(t,true); fa := t.GetFields(System.Reflection.BindingFlags.GetField or System.Reflection.BindingFlags.Instance or System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.NonPublic); for var i := 0 to fa.Length - 1 do if {not fa[i].IsStatic and} not fa[i].IsLiteral then