mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-12 03:30:20 +02:00
* fixed crash with error in child definition (merged)
This commit is contained in:
parent
992275e5d4
commit
c10d4a9846
@ -827,9 +827,11 @@ unit pdecobj;
|
|||||||
consume(_LKLAMMER);
|
consume(_LKLAMMER);
|
||||||
id_type(tt,pattern,false);
|
id_type(tt,pattern,false);
|
||||||
childof:=pobjectdef(tt.def);
|
childof:=pobjectdef(tt.def);
|
||||||
if (childof^.deftype<>objectdef) then
|
if (not assigned(childof)) or
|
||||||
|
(childof^.deftype<>objectdef) then
|
||||||
begin
|
begin
|
||||||
Message1(type_e_class_type_expected,childof^.typename);
|
if assigned(childof) then
|
||||||
|
Message1(type_e_class_type_expected,childof^.typename);
|
||||||
childof:=nil;
|
childof:=nil;
|
||||||
aktclass:=new(pobjectdef,init(n,nil));
|
aktclass:=new(pobjectdef,init(n,nil));
|
||||||
end
|
end
|
||||||
@ -1077,7 +1079,10 @@ unit pdecobj;
|
|||||||
end.
|
end.
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.2 2000-10-21 18:16:11 florian
|
Revision 1.3 2000-10-26 21:54:03 peter
|
||||||
|
* fixed crash with error in child definition (merged)
|
||||||
|
|
||||||
|
Revision 1.2 2000/10/21 18:16:11 florian
|
||||||
* a lot of changes:
|
* a lot of changes:
|
||||||
- basic dyn. array support
|
- basic dyn. array support
|
||||||
- basic C++ support
|
- basic C++ support
|
||||||
|
@ -147,6 +147,7 @@ implementation
|
|||||||
if (ptypesym(srsym)^.restype.def=generrordef) then
|
if (ptypesym(srsym)^.restype.def=generrordef) then
|
||||||
begin
|
begin
|
||||||
Message(sym_e_error_in_type_def);
|
Message(sym_e_error_in_type_def);
|
||||||
|
tt.setdef(generrordef);
|
||||||
exit;
|
exit;
|
||||||
end;
|
end;
|
||||||
{ Only use the definitions for system/current unit, becuase
|
{ Only use the definitions for system/current unit, becuase
|
||||||
@ -582,7 +583,10 @@ implementation
|
|||||||
end.
|
end.
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.11 2000-10-21 18:16:12 florian
|
Revision 1.12 2000-10-26 21:54:03 peter
|
||||||
|
* fixed crash with error in child definition (merged)
|
||||||
|
|
||||||
|
Revision 1.11 2000/10/21 18:16:12 florian
|
||||||
* a lot of changes:
|
* a lot of changes:
|
||||||
- basic dyn. array support
|
- basic dyn. array support
|
||||||
- basic C++ support
|
- basic C++ support
|
||||||
|
Loading…
Reference in New Issue
Block a user