paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 01:59:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix generic as record field name, bug ID #30718

Browse Source 
git-svn-id: trunk@34880 -
This commit is contained in:
michael 2016-11-12 22:07:15 +00:00
parent 5d4f605a39
commit 16d8435fde
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/fcl-passrc/src/pparser.pp
View File

@ -4495,6 +4495,7 @@ begin
else else
ARec.Members.Add(Proc); ARec.Members.Add(Proc);
end; end;
tkGeneric, // Counts as field name
tkIdentifier : tkIdentifier :
begin begin
// If (po_delphi in Scanner.Options) then // If (po_delphi in Scanner.Options) then

11
packages/fcl-passrc/tests/tctypeparser.pas
View File

@ -234,6 +234,7 @@ type
Procedure TestOnePlatformFieldDeprecated; Procedure TestOnePlatformFieldDeprecated;
Procedure TestOnePlatformFieldPlatform; Procedure TestOnePlatformFieldPlatform;
Procedure TestOneConstOneField; Procedure TestOneConstOneField;
Procedure TestOneGenericField;
Procedure TestTwoFields; Procedure TestTwoFields;
procedure TestTwoFieldProtected; procedure TestTwoFieldProtected;
procedure TestTwoFieldStrictPrivate; procedure TestTwoFieldStrictPrivate;
@ -1776,6 +1777,16 @@ begin
AssertField2([]); AssertField2([]);
end; end;
procedure TTestRecordTypeParser.TestOneGenericField;
begin
TestFields(['Generic : Integer;'],'',False);
AssertEquals('Member 1 field type',TPasVariable,TObject(TheRecord.Members[0]).ClassType);
AssertEquals('Field 1 name','Generic',Field1.Name);
AssertNotNull('Have 1 Field type',Field1.VarType);
AssertEquals('Field 1 type',TPasUnresolvedTypeRef,Field1.VarType.ClassType);
AssertEquals('Field 1 type name','Integer',Field1.VarType.Name);
end;
procedure TTestRecordTypeParser.TestTwoFields; procedure TTestRecordTypeParser.TestTwoFields;
begin begin
TestFields(['x : integer;','y : integer'],'',False); TestFields(['x : integer;','y : integer'],'',False);