From de395b01067a36ada9b1a778e8e013a5bc5d9703 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Tue, 21 May 2019 21:31:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=B0=D1=82=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=D1=8B=20Kotov=D0=B0=20-=20?= =?UTF-8?q?=D0=B8=D0=B7-=D0=B7=D0=B0=20=D0=BD=D0=B8=D1=85=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=20=D0=BD=D0=B5=20=D1=81=D0=BE=D0=B7?= =?UTF-8?q?=D0=B4=D0=B0=D0=B2=D0=B0=D0=BB=20=D0=B8=D0=BD=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=BB=D0=BB=D1=8F=D1=82=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 2 +- .../ParserTools/DefaultLanguageInformation.cs | 21 ------------------- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- 4 files changed, 3 insertions(+), 24 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 21c02b3f7..3fb4d8a5b 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 = "2064"; + public const string Revision = "2066"; 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 94c9af9b2..b0aed5294 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %COREVERSION%=2 -%REVISION%=2064 +%REVISION%=2066 %MINOR%=4 %MAJOR%=3 diff --git a/ParserTools/ParserTools/DefaultLanguageInformation.cs b/ParserTools/ParserTools/DefaultLanguageInformation.cs index 1eeb5fce4..0692e4d82 100644 --- a/ParserTools/ParserTools/DefaultLanguageInformation.cs +++ b/ParserTools/ParserTools/DefaultLanguageInformation.cs @@ -518,25 +518,9 @@ namespace PascalABCCompiler.Parsers return sb.ToString(); } - private bool enum_out_of_order(FieldInfo[] fields) //возвращает true, если значения полей этого enum'а идут не по порядку или не с нуля (IDE issue #117) - { - for (int i = 0; i < fields.Length; i++) - { - if (fields[i].Name != "value__") - { - if (i - 1 != (int)fields[i].GetRawConstantValue()) - { - return true; - } - } - } - return false; - } - private string get_enum_constants(Type t) { FieldInfo[] fields = t.GetFields(BindingFlags.Public|BindingFlags.NonPublic|BindingFlags.Instance|BindingFlags.Static); - bool outoforder = enum_out_of_order(fields); StringBuilder sb = new StringBuilder(); sb.AppendLine("("); for (int i = 0; i < fields.Length; i++) @@ -545,11 +529,6 @@ namespace PascalABCCompiler.Parsers { sb.Append(' ', 4); sb.Append(fields[i].Name); - if (outoforder) - { - sb.Append(" = "); - sb.Append(fields[i].GetRawConstantValue()); - } if (i < fields.Length - 1) sb.AppendLine(","); else diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index d1adba2f6..eb6bace27 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.4.2.2064' +!define VERSION '3.4.2.2066'