diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index b7a9941ab..db57d2ada 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 = "1859"; + public const string Revision = "1861"; 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 d46493bbb..a0493d41b 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %COREVERSION%=2 -%REVISION%=1859 +%REVISION%=1861 %MINOR%=4 %MAJOR%=3 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 29dcdf331..fdbd714cf 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.4.2.1859' +!define VERSION '3.4.2.1861' diff --git a/SyntaxTreeConverters/StandardSyntaxConverter.cs b/SyntaxTreeConverters/StandardSyntaxConverter.cs index c37ce721a..8813e71bf 100644 --- a/SyntaxTreeConverters/StandardSyntaxConverter.cs +++ b/SyntaxTreeConverters/StandardSyntaxConverter.cs @@ -73,7 +73,7 @@ namespace PascalABCCompiler.SyntaxTreeConverters /*try { - //root.visit(new SimplePrettyPrinterVisitor(@"d:\\zzz4.txt")); + root.visit(new SimplePrettyPrinterVisitor(@"d:\\zzz4.txt")); } catch(Exception e) { diff --git a/SyntaxVisitors/YieldVisitors/ProcessYieldsCapturedVars.cs b/SyntaxVisitors/YieldVisitors/ProcessYieldsCapturedVars.cs index ffbe1f261..9a546821c 100644 --- a/SyntaxVisitors/YieldVisitors/ProcessYieldsCapturedVars.cs +++ b/SyntaxVisitors/YieldVisitors/ProcessYieldsCapturedVars.cs @@ -609,7 +609,8 @@ namespace SyntaxVisitors // Вставляем предописание метода-хелпера var helperPredefHeader = ObjectCopier.Clone(helper.proc_header); helperPredefHeader.name.class_name = null; - classMembers.First().members.Insert(0, helperPredefHeader); + //classMembers.First().members.Insert(0, helperPredefHeader); + classMembers.First().members.Add(helperPredefHeader); // SSM bug fix #1474 // Вставляем тело метода-хелпера UpperTo().InsertBefore(pd, helper); diff --git a/TestSuite/CompilationSamples/ABCDatabases.pas b/TestSuite/CompilationSamples/ABCDatabases.pas index 81f85be7e..f1caacb31 100644 --- a/TestSuite/CompilationSamples/ABCDatabases.pas +++ b/TestSuite/CompilationSamples/ABCDatabases.pas @@ -32,11 +32,11 @@ type Pupil = auto class _name: string; - _gender: boolean; + _gender: ТипПола; _height: integer; _cls: integer; _inSunSchool: boolean; - function getGender: ТипПола := _gender ? Муж : Жен; + function getGender: ТипПола := _gender; public [PrintAttribute(0, -16)] property Name: string read _name; @@ -61,7 +61,7 @@ type end; -function GenderToBoolean(a: string): boolean := a = 'Муж'; +function GenderToТипПола(a: string): ТипПола := a = 'Муж' ? Муж : Жен; function InSunSchoolToBoolean(a: string): boolean := a = 'Да'; type @@ -255,7 +255,7 @@ begin raise new System.ApplicationException('Не найден массив учеников Databases\Ученики.csv'); Result := ReadLines(fname) .Select(s->s.ToWords(';')) - .Select(w->new Pupil(w[0],GenderToBoolean(w[2]),w[4].ToInteger,w[1].ToInteger, + .Select(w->new Pupil(w[0],GenderToТипПола(w[2]),w[4].ToInteger,w[1].ToInteger, InSunschoolToBoolean(w[3]))).ToArray; end;