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

fix #1474

Browse source
This commit is contained in:
miks1965 2018-11-09 21:13:13 +03:00
parent 7eedbbcb75
commit 04e8c601a6
6 changed files with 10 additions and 9 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 = "1859";
public const string Revision = "1861";
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%=1859
%REVISION%=1861
%MINOR%=4
%MAJOR%=3

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.4.2.1859'
!define VERSION '3.4.2.1861'

2
SyntaxTreeConverters/StandardSyntaxConverter.cs
View file

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

3
SyntaxVisitors/YieldVisitors/ProcessYieldsCapturedVars.cs
View file

@ -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<declarations>().InsertBefore(pd, helper);

8
TestSuite/CompilationSamples/ABCDatabases.pas
View file

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