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

* beter line info for conditionals

Browse Source
This commit is contained in:
peter 1998-10-21 20:16:04 +00:00
parent 99b31c91bc
commit 8e363906e2
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/scandir.inc
View File

@ -276,9 +276,12 @@ const
mac : pmacrosym; mac : pmacrosym;
found : boolean; found : boolean;
state : char; state : char;
oldaktfilepos : tfileposinfo;
begin begin
oldaktfilepos:=aktfilepos;
while true do while true do
begin begin
current_scanner^.gettokenpos;
case t of case t of
_DIR_ENDIF : begin _DIR_ENDIF : begin
current_scanner^.poppreprocstack; current_scanner^.poppreprocstack;
@ -324,14 +327,17 @@ const
break break
else else
begin begin
current_scanner^.gettokenpos;
Message(scan_c_skipping_until); Message(scan_c_skipping_until);
repeat repeat
current_scanner^.skipuntildirective; current_scanner^.skipuntildirective;
t:=Get_Directive(current_scanner^.readid); t:=Get_Directive(current_scanner^.readid);
until is_conditional(t); until is_conditional(t);
current_scanner^.gettokenpos;
Message1(scan_d_handling_switch,'$'+directive[t]); Message1(scan_d_handling_switch,'$'+directive[t]);
end; end;
end; end;
oldaktfilepos:=aktfilepos;
end; end;
@ -944,7 +950,10 @@ const
{ {
$Log$ $Log$
Revision 1.39 1998-10-13 16:50:21 pierre Revision 1.40 1998-10-21 20:16:04 peter
* beter line info for conditionals
Revision 1.39 1998/10/13 16:50:21 pierre
* undid some changes of Peter that made the compiler wrong * undid some changes of Peter that made the compiler wrong
for m68k (I had to reinsert some ifdefs) for m68k (I had to reinsert some ifdefs)
* removed several memory leaks under m68k * removed several memory leaks under m68k

12
compiler/scanner.pas
View File

@ -554,10 +554,11 @@ implementation
procedure tscannerfile.poppreprocstack; procedure tscannerfile.poppreprocstack;
var var
hp : ppreprocstack; hp : ppreprocstack;
begin begin
if assigned(preprocstack) then if assigned(preprocstack) then
begin begin
Message1(scan_c_endif_found,preprocstack^.name);
hp:=preprocstack^.next; hp:=preprocstack^.next;
dispose(preprocstack,done); dispose(preprocstack,done);
preprocstack:=hp; preprocstack:=hp;
@ -921,8 +922,10 @@ implementation
m : longint; m : longint;
mac : pmacrosym; mac : pmacrosym;
asciinr : string[3]; asciinr : string[3];
{$ifdef new__is_keyword}
encoded : longint; encoded : longint;
p:^byte; p : ^byte;
{$endif}
label label
exit_label; exit_label;
begin begin
@ -1515,7 +1518,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.63 1998-10-16 14:20:57 daniel Revision 1.64 1998-10-21 20:16:05 peter
* beter line info for conditionals
Revision 1.63 1998/10/16 14:20:57 daniel
* Faster keyword scanning. * Faster keyword scanning.
* Import library and smartlink library in one file. * Import library and smartlink library in one file.