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

* germanism fixed (aktexceptblock -> current_exceptblock)

Browse Source 
git-svn-id: trunk@11410 -
This commit is contained in:
florian 2008-07-19 17:06:16 +00:00
parent 7a34d3ccca
commit 19e723c869
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/globals.pas
View File

@ -246,7 +246,7 @@ interface
compile_level : word; compile_level : word;
resolving_forward : boolean; { used to add forward reference as second ref } resolving_forward : boolean; { used to add forward reference as second ref }
exceptblockcounter : integer; { each except block gets a unique number check gotos } exceptblockcounter : integer; { each except block gets a unique number check gotos }
aktexceptblock : integer; { the exceptblock number of the current block (0 if none) } current_exceptblock : integer; { the exceptblock number of the current block (0 if none) }
LinkLibraryAliases : TLinkStrMap; LinkLibraryAliases : TLinkStrMap;
LinkLibraryOrder : TLinkStrMap; LinkLibraryOrder : TLinkStrMap;

4
compiler/nflw.pas
View File

@ -942,7 +942,7 @@ implementation
constructor tgotonode.create(p : tlabelsym); constructor tgotonode.create(p : tlabelsym);
begin begin
inherited create(goton); inherited create(goton);
exceptionblock:=aktexceptblock; exceptionblock:=current_exceptblock;
labelnode:=nil; labelnode:=nil;
labelsym:=p; labelsym:=p;
end; end;
@ -1043,7 +1043,7 @@ implementation
constructor tlabelnode.create(l:tnode;alabsym:tlabelsym); constructor tlabelnode.create(l:tnode;alabsym:tlabelsym);
begin begin
inherited create(labeln,l); inherited create(labeln,l);
exceptionblock:=aktexceptblock; exceptionblock:=current_exceptblock;
labsym:=alabsym; labsym:=alabsym;
{ Register labelnode in labelsym } { Register labelnode in labelsym }
labsym.code:=self; labsym.code:=self;

4
compiler/parser.pas
View File

@ -333,7 +333,7 @@ implementation
macrosymtablestack:=TSymtablestack.create; macrosymtablestack:=TSymtablestack.create;
systemunit:=nil; systemunit:=nil;
current_settings.defproccall:=init_settings.defproccall; current_settings.defproccall:=init_settings.defproccall;
aktexceptblock:=0; current_exceptblock:=0;
exceptblockcounter:=0; exceptblockcounter:=0;
current_settings.maxfpuregisters:=-1; current_settings.maxfpuregisters:=-1;
{ reset the unit or create a new program } { reset the unit or create a new program }
@ -462,7 +462,7 @@ implementation
current_procinfo:=oldcurrent_procinfo; current_procinfo:=oldcurrent_procinfo;
current_filepos:=oldcurrent_filepos; current_filepos:=oldcurrent_filepos;
current_settings:=old_settings; current_settings:=old_settings;
aktexceptblock:=0; current_exceptblock:=0;
exceptblockcounter:=0; exceptblockcounter:=0;
end; end;
{ Shut down things when the last file is compiled succesfull } { Shut down things when the last file is compiled succesfull }

16
compiler/pstatmnt.pas
View File

@ -646,10 +646,8 @@ implementation
function raise_statement : tnode; function raise_statement : tnode;
var var
p,pobj,paddr,pframe : tnode; p,pobj,paddr,pframe : tnode;
begin begin
pobj:=nil; pobj:=nil;
paddr:=nil; paddr:=nil;
@ -677,7 +675,6 @@ implementation
function try_statement : tnode; function try_statement : tnode;
var var
p_try_block,p_finally_block,first,last, p_try_block,p_finally_block,first,last,
p_default,p_specific,hp : tnode; p_default,p_specific,hp : tnode;
@ -688,8 +685,7 @@ implementation
objname,objrealname : TIDString; objname,objrealname : TIDString;
srsym : tsym; srsym : tsym;
srsymtable : TSymtable; srsymtable : TSymtable;
oldaktexceptblock: integer; oldcurrent_exceptblock: integer;
begin begin
include(current_procinfo.flags,pi_uses_exceptions); include(current_procinfo.flags,pi_uses_exceptions);
@ -700,8 +696,8 @@ implementation
consume(_TRY); consume(_TRY);
first:=nil; first:=nil;
inc(exceptblockcounter); inc(exceptblockcounter);
oldaktexceptblock := aktexceptblock; oldcurrent_exceptblock := current_exceptblock;
aktexceptblock := exceptblockcounter; current_exceptblock := exceptblockcounter;
while (token<>_FINALLY) and (token<>_EXCEPT) do while (token<>_FINALLY) and (token<>_EXCEPT) do
begin begin
@ -724,7 +720,7 @@ implementation
if try_to_consume(_FINALLY) then if try_to_consume(_FINALLY) then
begin begin
inc(exceptblockcounter); inc(exceptblockcounter);
aktexceptblock := exceptblockcounter; current_exceptblock := exceptblockcounter;
p_finally_block:=statements_til_end; p_finally_block:=statements_til_end;
try_statement:=ctryfinallynode.create(p_try_block,p_finally_block); try_statement:=ctryfinallynode.create(p_try_block,p_finally_block);
end end
@ -734,7 +730,7 @@ implementation
old_block_type:=block_type; old_block_type:=block_type;
block_type:=bt_except; block_type:=bt_except;
inc(exceptblockcounter); inc(exceptblockcounter);
aktexceptblock := exceptblockcounter; current_exceptblock := exceptblockcounter;
ot:=generrordef; ot:=generrordef;
p_specific:=nil; p_specific:=nil;
if (idtoken=_ON) then if (idtoken=_ON) then
@ -864,7 +860,7 @@ implementation
block_type:=old_block_type; block_type:=old_block_type;
try_statement:=ctryexceptnode.create(p_try_block,p_specific,p_default); try_statement:=ctryexceptnode.create(p_try_block,p_specific,p_default);
end; end;
aktexceptblock := oldaktexceptblock; current_exceptblock := oldcurrent_exceptblock;
end; end;