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

Fix compilation of compiler with -dPREPROCWRITE

Browse Source 
git-svn-id: trunk@42084 -
This commit is contained in:
pierre 2019-05-16 12:17:32 +00:00
parent e35110b68c
commit 8d4588e1b2
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
compiler/parser.pas
View File

@ -225,31 +225,35 @@ implementation
var
i : longint;
begin
new(preprocfile,init('pre'));
preprocfile:=tpreprocfile.create('pre_'+filename);
{ initialize a module }
set_current_module(new(pmodule,init(filename,false)));
set_current_module(tppumodule.create(nil,'',filename,false));
macrosymtablestack:=TSymtablestack.create;
macrosymtablestack:= initialmacrosymtable;
current_scanner:=tscannerfile.Create(filename);
current_scanner.firstfile;
current_module.scanner:=current_scanner;
{ init macros before anything in the file is parsed.}
current_module.localmacrosymtable:= tmacrosymtable.create(false);
current_module.localmacrosymtable.next:= initialmacrosymtable;
macrosymtablestack:= current_module.localmacrosymtable;
macrosymtablestack.push(initialmacrosymtable);
macrosymtablestack.push(current_module.localmacrosymtable);
{ read the first token }
// current_scanner.readtoken(false);
main_module:=current_module;
{ startup scanner, and save in current_module }
current_scanner:=new(pscannerfile,Init(filename));
current_module.scanner:=current_scanner;
{ loop until EOF is found }
repeat
current_scanner^.readtoken(true);
preprocfile^.AddSpace;
current_scanner.readtoken(true);
preprocfile.AddSpace;
case token of
_ID :
begin
preprocfile^.Add(orgpattern);
preprocfile.Add(orgpattern);
end;
_REALNUMBER,
_INTCONST :
preprocfile^.Add(pattern);
preprocfile.Add(pattern);
_CSTRING :
begin
i:=0;
@ -262,7 +266,7 @@ implementation
inc(i);
end;
end;
preprocfile^.Add(''''+cstringpattern+'''');
preprocfile.Add(''''+cstringpattern+'''');
end;
_CCHAR :
begin
@ -278,19 +282,19 @@ implementation
else
pattern:=''''+pattern[1]+'''';
end;
preprocfile^.Add(pattern);
preprocfile.Add(pattern);
end;
_EOF :
break;
else
preprocfile^.Add(tokeninfo^[token].str)
preprocfile.Add(tokeninfo^[token].str)
end;
until false;
{ free scanner }
dispose(current_scanner,done);
current_scanner.destroy;
current_scanner:=nil;
{ close }
dispose(preprocfile,done);
preprocfile.destroy;
end;
{$endif PREPROCWRITE}

14
compiler/scanner.pas
View File

@ -234,7 +234,7 @@ interface
spacefound,
eolfound : boolean;
constructor create(const fn:string);
destructor destroy;
destructor destroy; override;
procedure Add(const s:string);
procedure AddSpace;
end;
@ -2572,6 +2572,7 @@ type
{$ifdef PREPROCWRITE}
constructor tpreprocfile.create(const fn:string);
begin
inherited create;
{ open outputfile }
assign(f,fn);
{$push}{$I-}
@ -3947,11 +3948,14 @@ type
{$ifdef PREPROCWRITE}
if parapreprocess then
begin
t:=Get_Directive(hs);
if not(is_conditional(t) or (t=_DIR_DEFINE) or (t=_DIR_UNDEF)) then
if not (m_mac in current_settings.modeswitches) then
t:=tdirectiveitem(turbo_scannerdirectives.Find(hs))
else
t:=tdirectiveitem(mac_scannerdirectives.Find(hs));
if assigned(t) and not(t.is_conditional) then
begin
preprocfile^.AddSpace;
preprocfile^.Add('{$'+hs+current_scanner.readcomment+'}');
preprocfile.AddSpace;
preprocfile.Add('{$'+hs+current_scanner.readcomment+'}');
exit;
end;
end;