paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 13:29:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 3509 via svnmerge from

Browse Source 
http://svn.freepascal.org/svn/fpc/trunk

r3509 (florian)
* handle stored false properly when overriding properties

git-svn-id: branches/fixes_2_0@3510 -
This commit is contained in:
florian 2006-05-13 20:27:36 +00:00
parent 85c3e64942
commit babdb0c54f
3 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -6479,6 +6479,7 @@ tests/webtbs/tw4925.pp svneol=native#text/plain
tests/webtbs/tw4950.pp svneol=native#text/plain
tests/webtbs/tw4999.pp svneol=native#text/plain
tests/webtbs/tw5036.pp svneol=native#text/plain
tests/webtbs/tw5082.pp -text svneol=unset#text/plain
tests/webtbs/ub1873.pp svneol=native#text/plain
tests/webtbs/ub1883.pp svneol=native#text/plain
tests/webtbs/uw0555.pp svneol=native#text/plain

5
compiler/pdecvar.pas
View File

@ -479,9 +479,12 @@ implementation
end;
if assigned(aclass) then
begin
include(p.propoptions,ppo_stored);
{ ppo_stored might be not set by an overridden property }
if not(ppo_is_override in p.propoptions) then
include(p.propoptions,ppo_stored);
if try_to_consume(_STORED) then
begin
include(p.propoptions,ppo_stored);
p.storedaccess.clear;
case token of
_ID:

54
tests/webtbs/tw5082.pp Normal file
View File

@ -0,0 +1,54 @@
{ Source provided for Free Pascal Bug Report 5082 }
{ Submitted by "Martin Schreiber" on 2006-05-01 }
{ e-mail: }
program storedfalse;
{$ifdef FPC}{$mode objfpc}{$h+}{$INTERFACES CORBA}{$endif}
{$ifdef mswindows}{$apptype console}{$endif}
uses
{$ifdef FPC}{$ifdef linux}cthreads,{$endif}{$endif}
sysutils,classes;
type
ttestclass1 = class(tcomponent)
private
fprop1: real;
public
property prop1: real read fprop1 write fprop1 stored false;
end;
ttestclass2 = class(ttestclass1)
published
property prop1;
end;
var
testclass2: ttestclass2;
stream1,stream2: tmemorystream;
str1: string;
begin
testclass2:= ttestclass2.create(nil);
testclass2.prop1:= 1;
stream1:= tmemorystream.create;
try
stream1.writecomponent(testclass2);
stream2:= tmemorystream.create;
try
stream1.position:= 0;
objectbinarytotext(stream1,stream2);
stream2.position:= 0;
setlength(str1,stream2.size);
move(stream2.memory^,str1[1],length(str1));
write(str1);
finally
stream2.free;
end;
finally
stream1.free;
end;
if pos('prop1',str1)<>0 then
begin
writeln('error');
halt(1);
end;
end.