mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-14 19:29:39 +02:00
* do nothing for macro's in tempcloseinput,tempopeninput
This commit is contained in:
parent
1a3d62baa3
commit
2ebd9f20b5
@ -1127,6 +1127,8 @@ implementation
|
|||||||
|
|
||||||
function tscannerfile.tempopeninputfile:boolean;
|
function tscannerfile.tempopeninputfile:boolean;
|
||||||
begin
|
begin
|
||||||
|
if inputfile.is_macro then
|
||||||
|
exit;
|
||||||
tempopeninputfile:=inputfile.tempopen;
|
tempopeninputfile:=inputfile.tempopen;
|
||||||
{ reload buffer }
|
{ reload buffer }
|
||||||
inputbuffer:=inputfile.buf;
|
inputbuffer:=inputfile.buf;
|
||||||
@ -1137,7 +1139,7 @@ implementation
|
|||||||
|
|
||||||
procedure tscannerfile.tempcloseinputfile;
|
procedure tscannerfile.tempcloseinputfile;
|
||||||
begin
|
begin
|
||||||
if inputfile.closed then
|
if inputfile.closed or inputfile.is_macro then
|
||||||
exit;
|
exit;
|
||||||
inputfile.setpos(inputstart+(inputpointer-inputbuffer));
|
inputfile.setpos(inputstart+(inputpointer-inputbuffer));
|
||||||
inputfile.tempclose;
|
inputfile.tempclose;
|
||||||
@ -2929,7 +2931,10 @@ exit_label:
|
|||||||
end.
|
end.
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.65 2003-11-10 19:08:59 peter
|
Revision 1.66 2003-11-12 16:57:59 peter
|
||||||
|
* do nothing for macro's in tempcloseinput,tempopeninput
|
||||||
|
|
||||||
|
Revision 1.65 2003/11/10 19:08:59 peter
|
||||||
+ $IF DECLARED() added
|
+ $IF DECLARED() added
|
||||||
|
|
||||||
Revision 1.64 2003/11/10 19:08:32 peter
|
Revision 1.64 2003/11/10 19:08:32 peter
|
||||||
|
Loading…
Reference in New Issue
Block a user