* germanism fixed (aktexceptblock -> current_exceptblock)

git-svn-id: trunk@11410 -

compiler/globals.pas

@@ -246,7 +246,7 @@ interface
        compile_level : word;
        resolving_forward : boolean;      { used to add forward reference as second ref }
        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;
        LinkLibraryOrder   : TLinkStrMap;
 

compiler/nflw.pas

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

compiler/parser.pas

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

compiler/pstatmnt.pas

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