mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-11-18 18:49:32 +01:00
* did not compile for browser
* merge from fixes
This commit is contained in:
parent
040a2cf89f
commit
ba6a341854
@ -357,10 +357,13 @@ unit pmodules;
|
|||||||
begin
|
begin
|
||||||
{ remove the old unit }
|
{ remove the old unit }
|
||||||
loaded_units.remove(hp);
|
loaded_units.remove(hp);
|
||||||
dispose(hp,done);
|
hp^.done;
|
||||||
end;
|
hp^.init(s,true);
|
||||||
|
current_module:=hp;
|
||||||
|
end
|
||||||
|
else
|
||||||
{ generates a new unit info record }
|
{ generates a new unit info record }
|
||||||
current_module:=new(pmodule,init(s,true));
|
current_module:=new(pmodule,init(s,true));
|
||||||
current_ppu:=current_module^.ppufile;
|
current_ppu:=current_module^.ppufile;
|
||||||
{ now we can register the unit }
|
{ now we can register the unit }
|
||||||
loaded_units.insert(current_module);
|
loaded_units.insert(current_module);
|
||||||
@ -979,7 +982,15 @@ unit pmodules;
|
|||||||
end.
|
end.
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.55 1998-09-28 11:04:03 peter
|
Revision 1.56 1998-09-28 11:22:15 pierre
|
||||||
|
* did not compile for browser
|
||||||
|
* merge from fixes
|
||||||
|
|
||||||
|
|
||||||
|
Revision 1.48.2.1 1998/09/28 10:55:16 pierre
|
||||||
|
fix for current_module dispose bug
|
||||||
|
|
||||||
|
Revision 1.55 1998/09/28 11:04:03 peter
|
||||||
* fixed loaddefaultunits which was at the wrong place for programs, so
|
* fixed loaddefaultunits which was at the wrong place for programs, so
|
||||||
the default defs were not loaded when main was initialized
|
the default defs were not loaded when main was initialized
|
||||||
|
|
||||||
|
|||||||
@ -44,6 +44,9 @@ implementation
|
|||||||
{$ifdef m68k}
|
{$ifdef m68k}
|
||||||
,m68k,tgeni386
|
,m68k,tgeni386
|
||||||
{$endif}
|
{$endif}
|
||||||
|
{$ifdef UseBrowser}
|
||||||
|
,browser
|
||||||
|
{$endif UseBrowser}
|
||||||
;
|
;
|
||||||
|
|
||||||
{*****************************************************************************
|
{*****************************************************************************
|
||||||
@ -55,7 +58,7 @@ implementation
|
|||||||
old_array_constructor : boolean;
|
old_array_constructor : boolean;
|
||||||
store_valid : boolean;
|
store_valid : boolean;
|
||||||
oldtype : pdef;
|
oldtype : pdef;
|
||||||
convtyp : tconverttype;
|
{convtyp : tconverttype;}
|
||||||
begin
|
begin
|
||||||
inc(parsing_para_level);
|
inc(parsing_para_level);
|
||||||
if assigned(p^.right) then
|
if assigned(p^.right) then
|
||||||
@ -910,7 +913,11 @@ implementation
|
|||||||
end.
|
end.
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.4 1998-09-27 10:16:24 florian
|
Revision 1.5 1998-09-28 11:22:17 pierre
|
||||||
|
* did not compile for browser
|
||||||
|
* merge from fixes
|
||||||
|
|
||||||
|
Revision 1.4 1998/09/27 10:16:24 florian
|
||||||
* type casts pchar<->ansistring fixed
|
* type casts pchar<->ansistring fixed
|
||||||
* ansistring[..] calls does now an unique call
|
* ansistring[..] calls does now an unique call
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user