paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-06 15:47:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

* only allow field names in record/object typed constant declarations (mantis #16234)

Browse Source 
* improved error recovery after encountering invalid field name in record/object typed constant
    declaration

git-svn-id: trunk@15150 -
This commit is contained in:
Jonas Maebe 2010-04-18 07:55:42 +00:00
parent 1c2e134a5b
commit 72758864e4
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -9664,6 +9664,7 @@ tests/webtbf/tw1599.pp svneol=native#text/plain
tests/webtbf/tw1599b.pp svneol=native#text/plain
tests/webtbf/tw16022.pp svneol=native#text/plain
tests/webtbf/tw16203.pp svneol=native#text/plain
tests/webtbf/tw16234.pp svneol=native#text/plain
tests/webtbf/tw1633.pp svneol=native#text/plain
tests/webtbf/tw1642.pp svneol=native#text/plain
tests/webtbf/tw1655.pp svneol=native#text/plain

11
compiler/ptconst.pas
View File

@ -1307,10 +1307,15 @@ implementation
st:=nil;
end;
if srsym=nil then
if (srsym=nil) or
(srsym.typ<>fieldvarsym) then
begin
Message1(sym_e_id_not_found,sorg);
consume_all_until(_SEMICOLON);
if (srsym=nil) then
Message1(sym_e_id_not_found,sorg)
else
Message1(sym_e_illegal_field,sorg);
consume_all_until(_RKLAMMER);
break;
end
else
with tfieldvarsym(srsym) do

18
tests/webtbf/tw16234.pp Normal file
View File

@ -0,0 +1,18 @@
{ %fail }
type
MyObjType = object
Field1 : String;
Field2 : String;
Field3 : String;
property Prop3:String read Field3;
end;
var // or const
Obj: MyObjType = (Prop3:'prop3';Field3:'field3'); // actually sets Field1 ?!
begin
writeln(Obj.Field1); // prints 'prop3' ?!
writeln(Obj.Field3); // prints 'field3'
writeln(Obj.Prop3); // prints 'field3'
end.