administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Откатил коммиты Kotovа - из-за них проект не создавал инсталлятор

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2019-05-21 21:31:54 +03:00
parent 5e27f78412
commit de395b0106
4 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -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;

2
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=2
%REVISION%=2064
%REVISION%=2066
%MINOR%=4
%MAJOR%=3

21
ParserTools/ParserTools/DefaultLanguageInformation.cs
View file

@ -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

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.4.2.2064'
!define VERSION '3.4.2.2066'