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

fix #2126

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2020-05-20 23:35:33 +03:00
parent e4aa121bac
commit 2e47bdd7dd
8 changed files with 52 additions and 12 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 = "6";
public const string Build = "3";
public const string Revision = "2470";
public const string Revision = "2471";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=3
%REVISION%=2470
%MINOR%=6
%REVISION%=2471
%COREVERSION%=3
%MAJOR%=3

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.6.3.2470
3.6.3.2471

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.6.3.2470'
!define VERSION '3.6.3.2471'

6
SyntaxTree/tree/NodesBuilder.cs
View file

@ -214,10 +214,12 @@ namespace PascalABCCompiler.SyntaxTree
}
}
}
if (!HasConstructor)
{
var fnames = names.Select(x => new ident("f" + x.name)).ToList();
var fnames = names.Select(x => new ident("f" + x.name.ToLower())).ToList();
if (fnames.Select(x=>x.name).Distinct().Count() != names.Count) // SSM 20/05/2020 #2126
return; // хак - мы не генерируем конструктор, потому что ошибка одинаковых имен выведется позже
var cm = BuildSimpleConstructorSection(names, fnames, types);
cb.Insert(0,cm);
//cb.class_def_blocks.Insert(0, cm);

32
TestSuite/CompilationSamples/GraphWPF.pas
View file

@ -513,6 +513,13 @@ function TextHeight(text: string): real;
/// Размер текста при выводе
function TextSize(text: string): Size;
/// Ширина текста при выводе заданным шрифтом
function TextWidth(text: string; f: FontOptions): real;
/// Высота текста при выводе заданным шрифтом
function TextHeight(text: string; f: FontOptions): real;
/// Размер текста при выводе заданным шрифтом
function TextSize(text: string; f: FontOptions): Size;
// -----------------------------------------------------
//>> Функции для вывода графиков # GraphWPF graph functions
// -----------------------------------------------------
@ -848,6 +855,9 @@ end;
function TextWidthP(text: string) := FormText(text).Width;
function TextHeightP(text: string) := FormText(text).Height;
function TextWidthPFont(text: string; f: FontOptions) := FormTextFont(text,f).Width;
function TextHeightPFont(text: string; f: FontOptions) := FormTextFont(text,f).Height;
type TextV = auto class
text: string;
function TextWidth := TextWidthP(text);
@ -857,6 +867,13 @@ type TextV = auto class
var ft := FormText(text);
Result := new Size(ft.Width,ft.Height);
end;
function TextWidthFont(f: FontOptions) := TextWidthP(text);
function TextHeightFont(f: FontOptions) := TextHeightP(text);
function TextSizeFont(f: FontOptions): Size;
begin
var ft := FormTextFont(text,f);
Result := new Size(ft.Width,ft.Height);
end;
end;
procedure TextPFull(x,y: real; text: string; angle,x0,y0: real; f: FontOptions);
@ -1220,6 +1237,13 @@ function TextHeight(text: string) := InvokeReal(TextV.Create(text).TextHeight);
/// Размер текста при выводе
function TextSize(text: string): Size := Invoke&<Size>(TextV.Create(text).TextSize);
function TextWidth(text: string; f: FontOptions): real := InvokeReal(()->TextV.Create(text).TextWidthFont(f));
function TextHeight(text: string; f: FontOptions): real := InvokeReal(()->TextV.Create(text).TextHeightFont(f));
function TextSize(text: string; f: FontOptions): Size := Invoke&<Size>(()->TextV.Create(text).TextSizeFont(f));
procedure TextOutHelper(x,y: real; text: string; angle: real; x0,y0: real) := InvokeVisual(DrawTextP,x,y,text,angle,x0,y0);
//procedure TextOut(x,y: real; number: integer) := TextOut(x,y,'' + number);
//procedure TextOut(x,y: real; number: real) := TextOut(x,y,'' + number);
@ -1228,7 +1252,7 @@ procedure TextOutHelper(x,y: real; text: string; angle: real; c: GColor; x0,y0:
//procedure TextOut(x,y: real; number: real; c: GColor) := TextOut(x,y,'' + number,c);
procedure TextOutHelper(x,y: real; text: string; angle: real; x0,y0: real; f: FontOptions) := InvokeVisual(DrawTextPFont,x,y,text,angle,x0,y0,f);
procedure DrawTextHelper(var x, y, x0, y0: real; w, h: real; text: string; align: Alignment := Alignment.Center);
procedure DrawTextHelper(var x, y, x0, y0: real; w, h: real; text: string; align: Alignment := Alignment.Center; f: FontOptions := nil);
begin
if h<0 then
begin
@ -1240,7 +1264,7 @@ begin
w := -w;
x -= w;
end;
var sz := TextSize(text);
var sz := if f=nil then TextSize(text) else TextSize(text,f);
var dw,dh: real;
if CurrentCoordType = StandardCoords then
(dw,dh) := ((w-sz.Width)/2,(h-sz.Height)/2)
@ -1273,8 +1297,6 @@ procedure DrawText(x, y, w, h: real; text: string; align: Alignment; angle: real
begin
var (x0,y0) := (x,y);
DrawTextHelper(x, y, x0, y0, w, h, text, align);
//FillCircle(x0,y0,0.1,Colors.Blue);
//FillCircle(x,y,0.1,Colors.Red);
TextOutHelper(x,y,text,angle,x0,y0)
end;
/// Выводит строку в прямоугольник к координатами левого верхнего угла (x,y)
@ -1309,7 +1331,7 @@ procedure DrawText(r: GRect; number: real; c: GColor; align: Alignment; angle: r
procedure DrawText(x, y, w, h: real; text: string; f: FontOptions; align: Alignment; angle: real);
begin
var (x0,y0) := (x,y);
DrawTextHelper(x, y, x0, y0, w, h, text, align);
DrawTextHelper(x, y, x0, y0, w, h, text, align, f);
TextOutHelper(x,y,text,angle,x0,y0,f)
end;

13
TestSuite/errors/err0362_autoclass_same_varnames.pas Normal file
View file

@ -0,0 +1,13 @@
type
T = auto class
public a1: integer;
procedure p;
begin
end;
public a1: integer;
end;
begin
end.

3
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -3771,6 +3771,9 @@ namespace PascalABCCompiler.TreeConverter
}
SyntaxTreeBuilder.AddMembersForAutoClass(_class_definition,ref names,ref types);
//if (names.Select(s => s.name.ToLower()).Distinct().Count() != names.Count)
// Отдельный цикл по синт поддереву для вылавливания events
foreach (var l in _class_definition.body.class_def_blocks)
{