+ compiler checks now if a goto leaves an exception block

compiler/cg386flw.pas

@@ -1,6 +1,6 @@
 {
     $Id$
-    Copyright (c) 1993-98 by Florian Klaempfl
+    Copyright (c) 1993-99 by Florian Klaempfl
 
     Generate i386 assembler for nodes that influence the flow
 
@@ -40,7 +40,6 @@ interface
     procedure secondon(var p : ptree);
     procedure secondfail(var p : ptree);
 
-
 implementation
 
     uses
@@ -48,7 +47,7 @@ implementation
       symconst,symtable,aasm,types,
       hcodegen,temp_gen,pass_2,
       cpubase,cpuasm,
-      cgai386,tgeni386;
+      cgai386,tgeni386,tcflw;
 
 {*****************************************************************************
                          Second_While_RepeatN
@@ -521,6 +520,8 @@ do_jmp:
 
        begin
          emitjmp(C_None,p^.labelnr);
+         if aktexceptblock<>ptree(p^.labsym^.code)^.exceptionblock then
+           CGMessage(cg_e_goto_inout_of_exception_block);
        end;
 
 
@@ -596,6 +597,7 @@ do_jmp:
       var
          exceptlabel,doexceptlabel,oldendexceptlabel,
          lastonlabel : pasmlabel;
+         oldexceptblock : ptree;
 
       begin
          { this can be called recursivly }
@@ -616,7 +618,10 @@ do_jmp:
          emitjmp(C_NE,exceptlabel);
 
          { try code }
+         oldexceptblock:=aktexceptblock;
+         aktexceptblock:=p^.left;
          secondpass(p^.left);
+         aktexceptblock:=oldexceptblock;
          if codegenerror then
            exit;
 
@@ -628,7 +633,12 @@ do_jmp:
          emitlab(doexceptlabel);
 
          if assigned(p^.right) then
-           secondpass(p^.right);
+           begin
+              oldexceptblock:=aktexceptblock;
+              aktexceptblock:=p^.right;
+              secondpass(p^.right);
+              aktexceptblock:=oldexceptblock;
+           end;
 
          emitlab(lastonlabel);
          { default handling }
@@ -639,8 +649,14 @@ do_jmp:
               }
               push_int (-1);
               emitcall('FPC_CATCHES');
-              maybe_loadesi;
-              secondpass(p^.t1);
+              if assigned(p^.t1) then
+                begin
+                   maybe_loadesi;
+                   oldexceptblock:=aktexceptblock;
+                   aktexceptblock:=p^.t1;
+                   secondpass(p^.t1);
+                   aktexceptblock:=oldexceptblock;
+                end;
               emitcall('FPC_POPOBJECTSTACK');
               maybe_loadesi;
            end
@@ -661,6 +677,7 @@ do_jmp:
       var
          nextonlabel : pasmlabel;
          ref : treference;
+         oldexceptblock : ptree;
 
       begin
          getlabel(nextonlabel);
@@ -683,9 +700,12 @@ do_jmp:
 
          if assigned(p^.right) then
            begin
-             { esi is destroyed by FPC_CATCHES }
-             maybe_loadesi;
-             secondpass(p^.right);
+              { esi is destroyed by FPC_CATCHES }
+              maybe_loadesi;
+              oldexceptblock:=aktexceptblock;
+              aktexceptblock:=p^.right;
+              secondpass(p^.right);
+              aktexceptblock:=oldexceptblock;
            end;
 
 
@@ -713,6 +733,7 @@ do_jmp:
          finallylabel,noreraiselabel : pasmlabel;
          oldaktexitlabel,exitfinallylabel : pasmlabel;
          oldaktexit2label : pasmlabel;
+         oldexceptblock : ptree;
 
       begin
          { we modify EAX }
@@ -734,14 +755,23 @@ do_jmp:
          emitjmp(C_NE,finallylabel);
 
          { try code }
-         secondpass(p^.left);
-         if codegenerror then
-           exit;
+         if assigned(p^.left) then
+           begin
+              oldexceptblock:=aktexceptblock;
+              aktexceptblock:=p^.left;
+              secondpass(p^.left);
+              if codegenerror then
+                exit;
+              aktexceptblock:=oldexceptblock;
+           end;
 
          emitlab(finallylabel);
          emitcall('FPC_POPADDRSTACK');
          { finally code }
+         oldexceptblock:=aktexceptblock;
+         aktexceptblock:=p^.right;
          secondpass(p^.right);
+         aktexceptblock:=oldexceptblock;
          if codegenerror then
            exit;
          emit_reg(A_POP,S_L,R_EAX);
@@ -776,7 +806,10 @@ do_jmp:
 end.
 {
   $Log$
-  Revision 1.60  1999-12-01 12:36:23  peter
+  Revision 1.61  1999-12-14 09:58:41  florian
+    + compiler checks now if a goto leaves an exception block
+
+  Revision 1.60  1999/12/01 12:36:23  peter
     * fixed selfpointer after destroyexception
 
   Revision 1.59  1999/11/30 10:40:42  peter

compiler/errore.msg

@@ -1198,6 +1198,22 @@ cg_e_cannot_call_cons_dest_inside_with=E_Constructors or destructors can not be
 cg_e_cannot_call_message_direct=E_Cannot call message handler method directly
 % A message method handler method can't be called directly if it contains an
 % explicit self argument
+cg_e_goto_inout_of_exception_block=E_Jump in or outside of an exception block
+% It isn't allowed to jump in or outside of an exception block like \var{try..finally..end;}:
+% \begin{verbatim}
+% label 1;
+%
+% ...
+%
+% try
+%    if not(final) then
+%      goto 1;   // this line will cause an error
+% finally
+%   ...
+% end;
+% 1:
+% ...
+% \end{verbatim}
 % \end{description}
 # EndOfTeX
 

compiler/msgidx.inc

@@ -326,6 +326,7 @@ type tmsgconst=(
   cg_e_include_not_implemented,
   cg_e_cannot_call_cons_dest_inside_with,
   cg_e_cannot_call_message_direct,
+  cg_e_goto_inout_of_exception_block,
   asmr_d_start_reading,
   asmr_d_finish_reading,
   asmr_e_none_label_contain_at,

compiler/msgtxt.inc

@@ -176,115 +176,115 @@ const msgtxt : array[0..000106,1..240] of char=(
   'U_Parsing interface of unit $1'#000+
   'U_Parsin','g implementation of $1'#000+
   'D_Compiling $1 for the second time'#000+
-  'E_Array properties aren'#039't allowed at this point'#000+
+  'E_Array properties aren'#039't allowed here'#000+
   'E_No property found to override'#000+
   'E_Only one default property is allowed, found inherited default proper'+
   'ty in class $1'#000+
-  'E_The default pro','perty must be an array property'#000+
+  'E_The default property mus','t be an array property'#000+
   'E_Virtual constructors are only supported in class object model'#000+
   'E_No default property available'#000+
   'E_The class can'#039't have a published section, use the {$M+} switch'#000+
-  'E_Forward declaration of class $1 must be resol','ved here to use the c'+
+  'E_Forward declaration of class $1 must be resolved here ','to use the c'+
   'lass as ancestor'#000+
   'E_Local operators not supported'#000+
   'E_Procedure directive $1 not allowed in interface section'#000+
   'E_Procedure directive $1 not allowed in implementation section'#000+
-  'E_Procedure directive $1 not allowed in procvar d','eclaration'#000+
+  'E_Procedure directive $1 not allowed in procvar declaratio','n'#000+
   'E_Function is already declared Public/Forward $1'#000+
   'E_Can'#039't use both EXPORT and EXTERNAL'#000+
   'E_NAME keyword expected'#000+
   'W_$1 not yet supported inside inline procedure/function'#000+
   'W_Inlining disabled'#000+
   'I_Writing Browser log $1'#000+
-  'H_may be pointer d','ereference is missing'#000+
+  'H_may be pointer dereferenc','e is missing'#000+
   'F_Selected assembler reader not supported'#000+
   'E_Procedure directive $1 has conflicts with other directives'#000+
   'E_Calling convention doesn'#039't match forward'#000+
   'E_Register calling (fastcall) not supported'#000+
-  'E_Property can'#039't have a defa','ult value'#000+
+  'E_Property can'#039't have a default value',#000+
   'E_The default value of a property must be constant'#000+
   'E_Symbol can'#039't be published, can be only a class'#000+
   'E_That kind of property can'#039't be published'#000+
   'W_Empty import name specified'#000+
-  'W_Empty import name specified'#000+
-  'E_Function internal name ch','anged after use of function'#000+
+  'W_An import name is required'#000+
+  'E_Function internal name changed afte','r use of function'#000+
   'E_Division by zero'#000+
   'E_Invalid floating point operation'#000+
   'E_Upper bound of range is less than lower bound'#000+
   'E_string length is larger than array of char length'#000+
   'E_Illegal expression after message directive'#000+
-  'E_Message han','dlers can take only one call by ref. parameter'#000+
+  'E_Message handlers can ','take only one call by ref. parameter'#000+
   'E_Duplicate message label: $1'#000+
   'E_Self can be only an explicit parameter in message handlers'#000+
   'E_Threadvars can be only static or global'#000+
   'F_Direct assembler not supported for binary output format'#000+
-  'W_','Don'#039't load OBJPAS unit manual, use {$mode objfpc} or {$mode de'+
+  'W_Don'#039't load',' OBJPAS unit manual, use {$mode objfpc} or {$mode de'+
   'lphi} instead'#000+
   'E_OVERRIDE can'#039't be used in objects'#000+
   'E_Data types which requires initialization/finalization can'#039't be u'+
   'sed in variant records'#000+
-  'E_Resourcestrings can be only static or',' global'#000+
-  'E_Exit with argument can'#039't be used here'#000+
+  'E_Resourcestrings can be only static or global'#000+
+  'E_','Exit with argument can'#039't be used here'#000+
   'E_The type of the storage symbol must be boolean'#000+
   'E_This symbol isn'#039't allowed as storage symbol'#000+
   'E_Only class which are compiled in $M+ mode can be published'#000+
   'E_Procedure directive expected'#000+
-  'E_The',' value for a property index must be of an ordinal type'#000+
+  'E_The value for',' a property index must be of an ordinal type'#000+
   'E_Procedure name to short to be exported'#000+
   'E_No DEFFILE entry can be generated for unit global vars'#000+
   'E_Compile without -WD option'#000+
   'E_Type mismatch'#000+
-  'E_Incompatible types: got "$1" expected "$','2"'#000+
-  'E_Type mismatch between $1 and $2'#000+
+  'E_Incompatible types: got "$1" expected "$2"'#000+
+  'E_Type ','mismatch between $1 and $2'#000+
   'E_Type identifier expected'#000+
   'E_Variable identifier expected'#000+
   'E_Integer expression expected, but got "$1"'#000+
   'E_Boolean expression expected, but got "$1"'#000+
   'E_Ordinal expression expected'#000+
-  'E_pointer type expected, bu','t got "$1"'#000+
+  'E_pointer type expected, but got "$1"',#000+
   'E_class type expected, but got "$1"'#000+
   'E_Variable or type indentifier expected'#000+
   'E_Can'#039't evaluate constant expression'#000+
   'E_Set elements are not compatible'#000+
   'E_Operation not implemented for sets'#000+
-  'W_Automatic type conversion from floating typ','e to COMP which is an i'+
+  'W_Automatic type conversion from floating type to COMP ','which is an i'+
   'nteger type'#000+
   'H_use DIV instead to get an integer result'#000+
   'E_string types doesn'#039't match, because of $V+ mode'#000+
   'E_succ or pred on enums with assignments not possible'#000+
   'E_Can'#039't read or write variables of this type'#000+
-  'E_Type confli','ct between set elements'#000+
+  'E_Type conflict between',' set elements'#000+
   'W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
   'E_Integer or real expression expected'#000+
   'E_Wrong type $1 in array constructor'#000+
   'E_Incompatible type for arg no. $1: Got $2, expected $3'#000+
-  'E_Method (variable) and Proce','dure (variable) are not compatible'#000+
+  'E_Method (variable) and Procedure (vari','able) are not compatible'#000+
   'E_Illegal constant passed to internal math function'#000+
   'E_Can'#039't get the address of constants'#000+
   'E_Argument can'#039't be assigned to'#000+
   'E_Can'#039't assign local procedure/function to procedure variable'#000+
-  'E_Can'#039't assign values ','to an address'#000+
+  'E_Can'#039't assign values to an addr','ess'#000+
   'E_Can'#039't assign values to const variable'#000+
   'E_Identifier not found $1'#000+
   'F_Internal Error in SymTableStack()'#000+
   'E_Duplicate identifier $1'#000+
   'H_Identifier already defined in $1 at line $2'#000+
   'E_Unknown identifier $1'#000+
-  'E_Forward declaration not so','lved $1'#000+
-  'F_Identifier type already defined as type'#000+
+  'E_Forward declaration not solved $1'#000+
+  'F_','Identifier type already defined as type'#000+
   'E_Error in type definition'#000+
   'E_Type identifier not defined'#000+
   'E_Forward type not resolved $1'#000+
   'E_Only static variables can be used in static methods or outside metho'+
   'ds'#000+
-  'E_Invalid call to tvarsym.man','gledname()'#000+
+  'E_Invalid call to tvarsym.mangledname()',#000+
   'F_record or class type expected'#000+
   'E_Instances of classes or objects with an abstract method are not allo'+
   'wed'#000+
   'W_Label not defined $1'#000+
   'E_Label used but not defined $1'#000+
   'E_Illegal label declaration'#000+
-  'E_GOTO and LABEL are not supported (use ','switch -Sg)'#000+
+  'E_GOTO and LABEL are not supported (use switch -Sg',')'#000+
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
@@ -292,20 +292,20 @@ const msgtxt : array[0..000106,1..240] of char=(
   'E_Forward class definition not resolved $1'#000+
   'H_Parameter $1 not used'#000+
   'N_Local variable $1 not used'#000+
-  'H_Value parameter $1',' is assigned but never used'#000+
+  'H_Value parameter $1 is assign','ed but never used'#000+
   'N_Local variable $1 is assigned but never used'#000+
   'H_Local $1 $2 is not used'#000+
   'N_Private field $1.$2 is never used'#000+
   'N_Private field $1.$2 is assigned but never used'#000+
   'N_Private method $1.$2 never used'#000+
-  'E_Set type expected'#000,
-  'W_Function result does not seem to be set'#000+
+  'E_Set type expected'#000+
+  'W_Function',' result does not seem to be set'#000+
   'E_Unknown record field identifier $1'#000+
   'W_Local variable $1 does not seem to be initialized'#000+
   'W_Variable $1 does not seem to be initialized'#000+
   'E_identifier idents no member $1'#000+
   'B_Found declaration: $1'#000+
-  'E_Data',' segment too large (max. 2GB)'#000+
+  'E_Data segment t','oo large (max. 2GB)'#000+
   'E_BREAK not allowed'#000+
   'E_CONTINUE not allowed'#000+
   'E_Expression too complicated - FPU stack overflow'#000+
@@ -313,161 +313,161 @@ const msgtxt : array[0..000106,1..240] of char=(
   'E_Invalid integer expression'#000+
   'E_Illegal qualifier'#000+
   'E_High range limit < low range limit'#000+
-  'E_Illegal ','counter variable'#000+
+  'E_Illegal counter va','riable'#000+
   'E_Can'#039't determine which overloaded function to call'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
   'D_Conversion between ordinals and pointers is not portable across plat'+
   'forms'#000+
-  'E_File types must be var pa','rameters'#000+
-  'E_The use of a far pointer isn'#039't allowed there'#000+
+  'E_File types must be var parameters'#000+
+  'E','_The use of a far pointer isn'#039't allowed there'#000+
   'E_illegal call by reference parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
   'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
   'h to this context)'#000+
-  'N_Inefficient co','de'#000+
-  'W_unreachable code'#000+
+  'N_Inefficient code'#000+
+  'W_unrea','chable code'#000+
   'E_procedure call with stackframe ESP/SP'#000+
   'E_Abstract methods can'#039't be called directly'#000+
   'F_Internal Error in getfloatreg(), allocation failure'#000+
   'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
-  'F_Extended cg68k not supp','orted'#000+
-  'F_32-bit unsigned not supported in MC68000 mode'#000+
+  'F_Extended cg68k not supported'#000+
+  'F_32','-bit unsigned not supported in MC68000 mode'#000+
   'F_Internal Error in secondinline()'#000+
   'D_Register $1 weight $2 $3'#000+
   'E_Stack limit excedeed in local routine'#000+
   'D_Stack frame is omitted'#000+
   'E_Object or class methods can'#039't be inline.'#000+
-  'E_Procvar calls ','can'#039't be inline.'#000+
+  'E_Procvar calls can'#039't be i','nline.'#000+
   'E_No code for inline procedure stored'#000+
   'E_Direct call of interrupt procedure $1 is not possible'#000+
   'E_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+
   'se (set)length instead'#000+
-  'E_Include and exclude not implemented in',' this case'#000+
+  'E_Include and exclude not implemented in this case',#000+
   'E_Constructors or destructors can not be called inside a '#039'with'#039+
   ' clause'#000+
   'E_Cannot call message handler method directly'#000+
+  'E_Jump in or outside of an exception block'#000+
   'D_Starting $1 styled assembler parsing'#000+
   'D_Finished $1 styled assembler parsing'#000+
-  'E_Non-label pattern contains @'#000+
-  'W_O','verride operator not supported'#000+
+  'E','_Non-label pattern contains @'#000+
+  'W_Override operator not supported'#000+
   'E_Error building record offset'#000+
   'E_OFFSET used without identifier'#000+
   'E_TYPE used without identifier'#000+
   'E_Cannot use local variable or parameters here'#000+
   'E_need to use OFFSET here'#000+
-  'E_Cannot use multiple relocatable symbols',#000+
+  'E_Cannot',' use multiple relocatable symbols'#000+
   'E_Relocatable symbol can only be added'#000+
   'E_Invalid constant expression'#000+
   'E_Relocatable symbol is not allowed'#000+
   'E_Invalid reference syntax'#000+
   'E_Local symbols/labels aren'#039't allowed as references'#000+
-  'E_Invalid base and index register usage'#000+
-  'E_Wrong scale f','actor specified'#000+
+  'E_Invalid base and ind','ex register usage'#000+
+  'E_Wrong scale factor specified'#000+
   'E_Multiple index register usage'#000+
   'E_Invalid operand type'#000+
   'E_Invalid string as opcode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
   'E_Null label references are not allowed'#000+
-  'F_Divide by zero in asm evaluator'#000+
-  'F_Evaluator stack overfl','ow'#000+
+  'F_Divide by zero in asm e','valuator'#000+
+  'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
   'F_Invalid numeric format in asm evaluator'#000+
   'F_Invalid Operator in asm evaluator'#000+
   'E_escape sequence ignored: $1'#000+
   'E_Invalid symbol reference'#000+
-  'W_Fwait can cause emulation problems with emu387'#000+
-  'W_Calling an overload fun','ction in assembler'#000+
+  'W_Fwait can cause emulation problems with',' emu387'#000+
+  'W_Calling an overload function in assembler'#000+
   'E_Unsupported symbol type for operand'#000+
   'E_Constant value out of bounds'#000+
   'E_Error converting decimal $1'#000+
   'E_Error converting octal $1'#000+
   'E_Error converting binary $1'#000+
-  'E_Error converting hexadecimal $1'#000+
+  'E_Error converting hexadecimal $','1'#000+
   'H_$1 translated to $2'#000+
-  'W_$1 is a','ssociated to an overloaded function'#000+
+  'W_$1 is associated to an overloaded function'#000+
   'E_Cannot use SELF outside a method'#000+
   'E_Cannot use OLDEBP outside a nested procedure'#000+
-  'W_Functions with void return value can'#039't return any value in asm c'+
-  'ode'#000+
+  'W_Procedures can'#039't return any value in asm code'#000+
   'E_SEG not supported'#000+
-  'E_Size suffix and destination or',' source size do not match'#000+
+  'E_Size suffix and des','tination or source size do not match'#000+
   'W_Size suffix and destination or source size do not match'#000+
   'E_Assembler syntax error'#000+
   'E_Invalid combination of opcode and operands'#000+
   'E_Assemler syntax error in operand'#000+
   'E_Assemler syntax error in constant'#000+
-  'E_Invalid Strin','g expression'#000+
+  'E_In','valid String expression'#000+
   '32bit constant created for address'#000+
   'E_Invalid or missing opcode'#000+
   'E_Invalid combination of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
   'E_Too many operands on line'#000+
   'W_NEAR ignored'#000+
-  'W_FAR ignored'#000+
-  'E_Duplicate',' local symbol $1'#000+
+  'W_FAR ignored'#000,
+  'E_Duplicate local symbol $1'#000+
   'E_Undefined local symbol $1'#000+
   'E_Unknown label identifier $1'#000+
   'E_Invalid floating point register name'#000+
   'E_NOR not supported'#000+
   'W_Modulo not supported'#000+
   'E_Invalid floating point constant $1'#000+
-  'E_Invalid floating point expression'#000+
-  'E_Wrong sy','mbol type'#000+
+  'E_Invalid floating point expression',#000+
+  'E_Wrong symbol type'#000+
   'E_Cannot index a local var or parameter with a register'#000+
   'E_Invalid segment override expression'#000+
   'W_Identifier $1 supposed external'#000+
   'E_Strings not allowed as constants'#000+
   'No type of variable specified'#000+
-  'E_assembler code not returned to text',' section'#000+
+  'E_assembler code not retur','ned to text section'#000+
   'E_Not a directive or local symbol $1'#000+
   'E_Using a defined name as a local label'#000+
   'E_Dollar token is used without an identifier'#000+
   'W_32bit constant created for address'#000+
   'N_.align is target specific, use .balign or .p2align'#000+
-  'E_Can'#039't access fiel','ds directly for parameters'#000+
+  'E_Can'#039't ','access fields directly for parameters'#000+
   'E_Can'#039't access fields of objects/classes directly'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
   'F_Comp not supported'#000+
   'F_Direct not support for binary writers'#000+
-  'E_Allocating of data is only allo','wed in bss section'#000+
+  'E_Allocating of data i','s only allowed in bss section'#000+
   'F_No binary writer selected'#000+
   'E_Asm: Opcode $1 not in table'#000+
   'E_Asm: $1 invalid combination of opcode and operands'#000+
   'E_Asm: 16 Bit references not supported'#000+
   'E_Asm: Invalid effective address'#000+
-  'E_Asm: Immediate or reference expected',#000+
+  'E_Asm: Immediate or referen','ce expected'#000+
   'E_Asm: $1 value exceeds bounds $2'#000+
   'E_Asm: Short jump is out of range $1'#000+
   'W_Source operating system redefined'#000+
   'I_Assembling (pipe) $1'#000+
   'E_Can'#039't create assember file $1'#000+
   'W_Assembler $1 not found, switching to external assembling'#000+
-  'T_Using assembler:',' $1'#000+
+  'T_Using',' assembler: $1'#000+
   'W_Error while assembling exitcode $1'#000+
   'W_Can'#039't call the assembler, error $1 switching to external assembl'+
   'ing'#000+
   'I_Assembling $1'#000+
   'I_Assembling smartlink $1'#000+
   'W_Object $1 not found, Linking may fail !'#000+
-  'W_Library $1 not found, Linking may fail !'#000+
-  'W_','Error while linking'#000+
+  'W_Library $1 not found, Linking ma','y fail !'#000+
+  'W_Error while linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
   'W_Util $1 not found, switching to external linking'#000+
   'T_Using util $1'#000+
   'E_Creation of Executables not supported'#000+
-  'E_Creation of Dynamic/Shared Libraries not su','pported'#000+
+  'E_Creation of Dynamic/Shared Libra','ries not supported'#000+
   'I_Closing script $1'#000+
   'W_resource compiler not found, switching to external mode'#000+
   'I_Compiling resource $1'#000+
   'F_Can'#039't post process executable $1'#000+
   'F_Can'#039't open executable $1'#000+
   'X_Size of Code: $1 bytes'#000+
-  'X_Size of initialized data: $1 bytes'#000+
-  'X_Size',' of uninitialized data: $1 bytes'#000+
+  'X_Size of initialized data: $1 b','ytes'#000+
+  'X_Size of uninitialized data: $1 bytes'#000+
   'X_Stack space reserved: $1 bytes'#000+
   'X_Stack space commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
@@ -477,81 +477,81 @@ const msgtxt : array[0..000106,1..240] of char=(
   'U_PPU Crc: $1'#000+
   'U_PPU Time: $1'#000+
   'U_PPU File too short'#000+
-  'U_PPU Invalid Header (no P','PU at the begin)'#000+
+  'U_PPU Invalid H','eader (no PPU at the begin)'#000+
   'U_PPU Invalid Version $1'#000+
   'U_PPU is compiled for an other processor'#000+
   'U_PPU is compiled for an other target'#000+
   'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
-  'F_reading PPU-File'#000+
+  'F_Error reading PPU-File'#000+
   'F_unexpected end of PPU-File'#000+
-  'F_Invalid PPU-File',' entry: $1'#000+
+  'F','_Invalid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
   'F_Circular unit reference between $1 and $2'#000+
   'F_Can'#039't compile unit $1, no sources available'#000+
   'F_Can'#039't find unit $1'#000+
-  'W_Unit $1 was not found but $2 exists'#000+
-  'F_Unit $1 searc','hed but $2 found'#000+
+  'W_Unit $1 was not found but $2 exist','s'#000+
+  'F_Unit $1 searched but $2 found'#000+
   'W_Compiling the system unit requires the -Us switch'#000+
   'F_There were $1 errors compiling module, stopping'#000+
   'U_Load from $1 ($2) unit $3'#000+
   'U_Recompiling $1, checksum changed for $2'#000+
-  'U_Recompiling $1, source found only'#000+
-  'U_Recompiling u','nit, static lib is older than ppufile'#000+
+  'U_Recompiling $1, source found onl','y'#000+
+  'U_Recompiling unit, static lib is older than ppufile'#000+
   'U_Recompiling unit, shared lib is older than ppufile'#000+
   'U_Recompiling unit, obj and asm are older than ppufile'#000+
   'U_Recompiling unit, obj is older than asm'#000+
   'U_Parsing interface of $1'#000+
-  'U_Parsing implementation o','f $1'#000+
+  'U_Parsing',' implementation of $1'#000+
   'U_Second load for unit $1'#000+
   'U_PPU Check file $1 time $2'#000+
   '$1 [options] <inputfile> [options]'#000+
   'W_Only one source file supported'#000+
   'W_DEF file can be created only for OS/2'#000+
   'E_nested response files are not supported'#000+
-  'F_No source file name in comman','d line'#000+
+  'F_No source fi','le name in command line'#000+
   'E_Illegal parameter: $1'#000+
   'H_-? writes help pages'#000+
   'F_Too many config files nested'#000+
   'F_Unable to open file $1'#000+
   'N_Reading further options from $1'#000+
   'W_Target is already set to: $1'#000+
-  'W_Shared libs not supported on DOS platform, reverting to static'#000,
+  'W_Shared libs not supported on DOS platform, rev','erting to static'#000+
   'F_too many IF(N)DEFs'#000+
   'F_too many ENDIFs'#000+
   'F_open conditional at the end of the file'#000+
   'W_Debug information generation is not supported by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
   'E_You are using the obsolete switch $1'#000+
-  'E_You are using the obso','lete switch $1, please use $2'#000+
+  'E_You a','re using the obsolete switch $1, please use $2'#000+
   'N_Switching assembler to default source writing assembler'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
   'Copyright (c) 1993-1999 by Florian Klaempfl'#000+
-  'Free Pascal Compiler version $FPCVER'#000+
+  'Free Pascal Compiler version',' $FPCVER'#000+
   #000+
-  'Compile','r Date  : $FPCDATE'#000+
+  'Compiler Date  : $FPCDATE'#000+
   'Compiler Target: $FPCTARGET'#000+
   #000+
   'This program comes under the GNU General Public Licence'#000+
   'For more information read COPYING.FPC'#000+
   #000+
   'Report bugs,suggestions etc to:'#000+
-  '                 [email protected]'#000+
-  '**0*_put + aft','er a boolean switch option to enable it, - to disable '+
-  'it'#000+
+  '                 [email protected].','hu'#000+
+  '**0*_put + after a boolean switch option to enable it, - to disable it'+
+  #000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
-  '**2ar_list register allocation/release info in assembler file'#000+
-  '**2at_list te','mp allocation/release info in assembler file'#000+
+  '**2ar_list register allocation/release info in assembler f','ile'#000+
+  '**2at_list temp allocation/release info in assembler file'#000+
   '**1b_generate browser info'#000+
   '**2bl_generate local symbol info'#000+
   '**1B_build all modules'#000+
   '**1C<x>_code generation options:'#000+
   '3*2CD_create dynamic library'#000+
-  '**2Ch<n>_<n> bytes heap (between 1023 and 67107840',')'#000+
+  '**2Ch<n>_<n> bytes heap (between ','1023 and 67107840)'#000+
   '**2Ci_IO-checking'#000+
   '**2Cn_omit linking stage'#000+
   '**2Co_check overflow of integer operations'#000+
@@ -559,7 +559,7 @@ const msgtxt : array[0..000106,1..240] of char=(
   '**2Cs<n>_set stack size to <n>'#000+
   '**2Ct_stack checking'#000+
   '**2CD_create also dynamic library (* doesn'#039't work yet *)'#000+
-  '**2CX_create also smar','tlinked library'#000+
+  '**2CX','_create also smartlinked library'#000+
   '**1d<x>_defines the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
@@ -567,21 +567,21 @@ const msgtxt : array[0..000106,1..240] of char=(
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F<x>_set file names and paths:'#000+
-  '**2FD<x>_sets the directory where',' to search for compiler utilities'#000+
+  '**2FD<x>_sets th','e directory where to search for compiler utilities'#000+
   '**2Fe<x>_redirect error output to <x>'#000+
   '**2FE<x>_set exe/unit output path to <x>'#000+
   '**2Fi<x>_adds <x> to include path'#000+
   '**2Fl<x>_adds <x> to library path'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
-  '**2Fo<x>_adds <x> to ob','ject path'#000+
+  '**2Fo<','x>_adds <x> to object path'#000+
   '**2Fr<x>_load error message file <x>'#000+
   '**2Fu<x>_adds <x> to unit path'#000+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g<x>_generate debugger information:'#000+
   '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
-  '*g2gh_use heap trace unit'#000+
-  '*g2gc_generate c','hecks for pointers'#000+
+  '*g2gh_use heap trace unit',#000+
+  '*g2gc_generate checks for pointers'#000+
   '**1i_information'#000+
   '**2iD_return compiler date'#000+
   '**2iV_return compiler version'#000+
@@ -589,101 +589,101 @@ const msgtxt : array[0..000106,1..240] of char=(
   '**2iSP_return compiler processor'#000+
   '**2iTO_return target OS'#000+
   '**2iTP_return target processor'#000+
-  '**1I<x>_adds <x> to include path'#000,
+  '**1I<x>_adds <x>',' to include path'#000+
   '**1k<x>_Pass <x> to the linker'#000+
   '**1l_write logo'#000+
   '**1n_don'#039't read the default config file'#000+
   '**1o<x>_change the name of the executable produced to <x>'#000+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#000+
-  '*L1P_use pipes instead of creating ','temporary assembler files'#000+
+  '*L1P_use pipes ins','tead of creating temporary assembler files'#000+
   '**1S<x>_syntax options:'#000+
   '**2S2_switch some Delphi 2 extensions on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#000+
-  '**2Se<x>_compiler stops after the <x> errors (default is 1)'#000+
-  '**2','Sg_allow LABEL and GOTO'#000+
+  '**2Se<x>_compiler stops after the <x> errors (','default is 1)'#000+
+  '**2Sg_allow LABEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
   '**2Si_support C++ styled INLINE'#000+
   '**2Sm_support macros like C (global)'#000+
   '**2So_tries to be TP/BP 7.0 compatible'#000+
   '**2Sp_tries to be gpc compatible'#000+
-  '**2Ss_constructor name must be init (destructor must ','be done)'#000+
+  '**2Ss_constructor name must be init ','(destructor must be done)'#000+
   '**2St_allow static keyword in objects'#000+
   '**1s_don'#039't call assembler and linker (only with -a)'#000+
   '**1u<x>_undefines the symbol <x>'#000+
   '**1U_unit options:'#000+
   '**2Un_don'#039't check the unit name'#000+
   '**2Us_compile a system unit'#000+
-  '**1v<x>_Be verbose. <x> is a ','combination of the following letters:'#000+
+  '**1v<x>_Be v','erbose. <x> is a combination of the following letters:'#000+
   '**2*_e : Show errors (default)       d : Show debug info'#000+
   '**2*_w : Show warnings               u : Show unit info'#000+
   '**2*_n : Show notes                  t : Show tried/used files'#000+
-  '**2*_h : Show hints       ','           m : Show defined macros'#000+
+  '**2*_h : ','Show hints                  m : Show defined macros'#000+
   '**2*_i : Show general info           p : Show compiled procedures'#000+
   '**2*_l : Show linenumbers            c : Show conditionals'#000+
-  '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
-  '**2*_b : S','how all procedure          r : Rhide/GCC compatibility mod'+
-  'e'#000+
+  '**2*_a : Show everything             0 : Show nothing (except e','rrors'+
+  ')'#000+
+  '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#000+
   '**2*_    occurs'#000+
   '**1X_executable options:'#000+
   '*L2Xc_link with the c library'#000+
-  '**2Xs_strip all symbols from executable',#000+
+  '**2Xs_strip all symbol','s from executable'#000+
   '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#000+
   '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#000+
   '**2XX_try to link smart            (defines FPC_LINK_SMART)'#000+
   '**0*_Processor specific options:'#000+
-  '3*1A<x>_output format:'#000,
+  '3*1A<x','>_output format:'#000+
   '3*2Aas_assemble using GNU AS'#000+
   '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#000+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#000+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#000+
   '3*2Anasmobj_obj file using Nasm'#000+
-  '3*2Amasm_obj file using Masm (Microsoft)'#000+
-  '3*','2Atasm_obj file using Tasm (Borland)'#000+
+  '3*2Amasm_obj file using Ma','sm (Microsoft)'#000+
+  '3*2Atasm_obj file using Tasm (Borland)'#000+
   '3*2Acoff_coff (Go32v2) using internal writer'#000+
   '3*2Apecoff_pecoff (Win32) using internal writer'#000+
   '3*1R<x>_assembler reading style:'#000+
   '3*2Ratt_read AT&T style assembler'#000+
-  '3*2Rintel_read Intel style assembler'#000+
-  '3*2Rdi','rect_copy assembler text directly to assembler file'#000+
+  '3*2Rintel_read Intel style',' assembler'#000+
+  '3*2Rdirect_copy assembler text directly to assembler file'#000+
   '3*1O<x>_optimizations:'#000+
   '3*2Og_generate smaller code'#000+
   '3*2OG_generate faster code (default)'#000+
   '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
-  '3*2Ou_enable uncertain optimizations (see',' docs)'#000+
+  '3*2Ou_enable uncertain o','ptimizations (see docs)'#000+
   '3*2O1_level 1 optimizations (quick optimizations)'#000+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
   '3*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op<x>_target processor:'#000+
-  '3*3Op1_set target processor to 386/486'#000+
-  '3*3Op2_set target',' processor to Pentium/PentiumMMX (tm)'#000+
+  '3*3Op1_set target processor to 386/486'#000,
+  '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
   '3*1T<x>_Target operating system:'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
-  '3*2TLINUX_Linux'#000+
-  '3*2','TOS2_OS/2 2.x'#000+
+  '3*','2TLINUX_Linux'#000+
+  '3*2TOS2_OS/2 2.x'#000+
   '3*2TWin32_Windows 32 Bit'#000+
   '3*2WB<x> Set Image base to Hexadecimal <x> value'#000+
   '3*2WC Specify console type application'#000+
   '3*2WD Use DEFFILE to export functions of DLL or EXE'#000+
   '3*2WG Specify graphic type application'#000+
-  '3*2WN Do not generate ','relocation code (necessary for debugging)'#000+
+  '3*2WN',' Do not generate relocation code (necessary for debugging)'#000+
   '3*2WR Generate relocation code'#000+
   '6*1A<x>_output format'#000+
   '6*2Aas_Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
   '6*2Amit_MIT Syntax (old GAS)'#000+
-  '6*2Amot_Standard Motorola assembler'#000+
-  '6*1O_optimization','s:'#000+
+  '6*2Amot_Standard Motorola assembler'#000,
+  '6*1O_optimizations:'#000+
   '6*2Oa_turn on the optimizer'#000+
   '6*2Og_generate smaller code'#000+
   '6*2OG_generate faster code (default)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
   '6*2O2_set target processor to a MC68020+'#000+
   '6*1R<x>_assembler reading style:'#000+
-  '6*2RMOT_read motorola style as','sembler'#000+
+  '6*2RMOT_read ','motorola style assembler'#000+
   '6*1T<x>_Target operating system:'#000+
   '6*2TAMIGA_Commodore Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+

compiler/pass_1.pas

@@ -362,6 +362,7 @@ implementation
 
     function do_firstpass(var p : ptree) : boolean;
       begin
+         aktexceptblock:=nil;
          codegenerror:=false;
          firstpass(p);
          do_firstpass:=codegenerror;
@@ -371,7 +372,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.110  1999-11-30 10:40:44  peter
+  Revision 1.111  1999-12-14 09:58:42  florian
+    + compiler checks now if a goto leaves an exception block
+
+  Revision 1.110  1999/11/30 10:40:44  peter
     + ttype, tsymlist
 
   Revision 1.109  1999/11/18 15:34:47  pierre

compiler/pass_2.pas

@@ -1,6 +1,6 @@
 {
     $Id$
-    Copyright (c) 1993-98 by Florian Klaempfl
+    Copyright (c) 1993-99 by Florian Klaempfl
 
     This unit handles the codegeneration pass
 
@@ -45,6 +45,9 @@ implementation
      cobjects,comphook,verbose,globals,files,
      symconst,symtable,types,aasm,scanner,
      pass_1,hcodegen,temp_gen,cpubase,cpuasm
+{$ifndef newcg}
+     ,tcflw
+{$endif newcg}
 {$ifdef GDB}
      ,gdb
 {$endif}
@@ -430,7 +433,7 @@ implementation
          { clear register count }
          clearregistercount;
          use_esp_stackframe:=false;
-
+         aktexceptblock:=nil;
          if not(do_firstpass(p)) then
            begin
               { max. optimizations     }
@@ -697,7 +700,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.44  1999-11-30 10:40:44  peter
+  Revision 1.45  1999-12-14 09:58:42  florian
+    + compiler checks now if a goto leaves an exception block
+
+  Revision 1.44  1999/11/30 10:40:44  peter
     + ttype, tsymlist
 
   Revision 1.43  1999/11/18 15:34:47  pierre

compiler/pstatmnt.pas

@@ -1029,6 +1029,7 @@ unit pstatmnt;
          code : ptree;
          labelnr : pasmlabel;
          filepos : tfileposinfo;
+         sr : plabelsym;
 
       label
          ready;
@@ -1057,6 +1058,7 @@ unit pstatmnt;
                             else
                               begin
                                 code:=genlabelnode(goton,plabelsym(srsym)^.lab);
+                                code^.labsym:=plabelsym(srsym);
                                 { set flag that this label is used }
                                 plabelsym(srsym)^.used:=true;
                               end;
@@ -1107,17 +1109,20 @@ unit pstatmnt;
                      begin
                         consume(token);
                         consume(_COLON);
-                        if plabelsym(srsym)^.defined then
+                        { we must preserve srsym to set code later }
+                        sr:=plabelsym(srsym);
+                        if sr^.defined then
                           Message(sym_e_label_already_defined);
-                        plabelsym(srsym)^.defined:=true;
+                        sr^.defined:=true;
 
                         { statement modifies srsym }
-                        labelnr:=plabelsym(srsym)^.lab;
+                        labelnr:=sr^.lab;
                         lastsymknown:=false;
                         { the pointer to the following instruction }
                         { isn't a very clean way                   }
                         code:=gensinglenode(labeln,statement{$ifndef tp}(){$endif});
                         code^.labelnr:=labelnr;
+                        sr^.code:=code;
                         { sorry, but there is a jump the easiest way }
                         goto ready;
                      end;
@@ -1323,7 +1328,10 @@ unit pstatmnt;
 end.
 {
   $Log$
-  Revision 1.115  1999-12-01 22:43:17  peter
+  Revision 1.116  1999-12-14 09:58:42  florian
+    + compiler checks now if a goto leaves an exception block
+
+  Revision 1.115  1999/12/01 22:43:17  peter
     * fixed sigsegv with casedef=nil
 
   Revision 1.114  1999/12/01 12:42:32  peter

compiler/symsym.inc

@@ -213,6 +213,7 @@
          lab:=l;
          used:=false;
          defined:=false;
+         code:=nil;
       end;
 
     constructor tlabelsym.load;
@@ -223,6 +224,7 @@
          { this is all dummy
            it is only used for local browsing }
          lab:=nil;
+         code:=nil;
          used:=false;
          defined:=true;
       end;
@@ -2123,7 +2125,10 @@
 
 {
   $Log$
-  Revision 1.132  1999-12-01 12:42:33  peter
+  Revision 1.133  1999-12-14 09:58:42  florian
+    + compiler checks now if a goto leaves an exception block
+
+  Revision 1.132  1999/12/01 12:42:33  peter
     * fixed bug 698
     * removed some notes about unused vars
 

compiler/symsymh.inc

@@ -60,6 +60,7 @@
           lab     : pasmlabel;
           used,
           defined : boolean;
+          code : pointer; { should be ptree! }
           constructor init(const n : string; l : pasmlabel);
           destructor done;virtual;
           constructor load;
@@ -311,7 +312,10 @@
 
 {
   $Log$
-  Revision 1.42  1999-11-30 10:40:56  peter
+  Revision 1.43  1999-12-14 09:58:42  florian
+    + compiler checks now if a goto leaves an exception block
+
+  Revision 1.42  1999/11/30 10:40:56  peter
     + ttype, tsymlist
 
   Revision 1.41  1999/11/26 00:19:12  peter

compiler/tcflw.pas

@@ -38,6 +38,10 @@ interface
     procedure firsttryfinally(var p : ptree);
     procedure firston(var p : ptree);
 
+var
+   { the block node of the current exception block to check gotos }
+   aktexceptblock : ptree;
+
 
 implementation
 
@@ -378,6 +382,7 @@ implementation
     procedure firstlabel(var p : ptree);
       begin
          cleartempgen;
+         p^.exceptionblock:=aktexceptblock;
          firstpass(p^.left);
          p^.registers32:=p^.left^.registers32;
          p^.registersfpu:=p^.left^.registersfpu;
@@ -429,15 +434,24 @@ implementation
 *****************************************************************************}
 
     procedure firsttryexcept(var p : ptree);
+
+      var
+         oldexceptblock : ptree;
+
       begin
          cleartempgen;
+         oldexceptblock:=aktexceptblock;
+         aktexceptblock:=p^.left;
          firstpass(p^.left);
-
+         aktexceptblock:=oldexceptblock;
          { on statements }
          if assigned(p^.right) then
            begin
               cleartempgen;
+              oldexceptblock:=aktexceptblock;
+              aktexceptblock:=p^.right;
               firstpass(p^.right);
+              aktexceptblock:=oldexceptblock;
               p^.registers32:=max(p^.registers32,p^.right^.registers32);
               p^.registersfpu:=max(p^.registersfpu,p^.right^.registersfpu);
 {$ifdef SUPPORT_MMX}
@@ -447,7 +461,10 @@ implementation
          { else block }
          if assigned(p^.t1) then
            begin
+              oldexceptblock:=aktexceptblock;
+              aktexceptblock:=p^.t1;
               firstpass(p^.t1);
+              aktexceptblock:=oldexceptblock;
               p^.registers32:=max(p^.registers32,p^.t1^.registers32);
               p^.registersfpu:=max(p^.registersfpu,p^.t1^.registersfpu);
 {$ifdef SUPPORT_MMX}
@@ -462,14 +479,24 @@ implementation
 *****************************************************************************}
 
     procedure firsttryfinally(var p : ptree);
+
+      var
+         oldexceptblock : ptree;
+
       begin
          p^.resulttype:=voiddef;
          cleartempgen;
+         oldexceptblock:=aktexceptblock;
+         aktexceptblock:=p^.left;
          firstpass(p^.left);
+         aktexceptblock:=oldexceptblock;
          set_varstate(p^.left,true);
 
          cleartempgen;
+         oldexceptblock:=aktexceptblock;
+         aktexceptblock:=p^.right;
          firstpass(p^.right);
+         aktexceptblock:=oldexceptblock;
          set_varstate(p^.right,true);
          if codegenerror then
            exit;
@@ -482,6 +509,10 @@ implementation
 *****************************************************************************}
 
     procedure firston(var p : ptree);
+
+      var
+         oldexceptblock : ptree;
+
       begin
          { that's really an example procedure for a firstpass :) }
          cleartempgen;
@@ -504,7 +535,10 @@ implementation
          cleartempgen;
          if assigned(p^.right) then
            begin
+              oldexceptblock:=aktexceptblock;
+              aktexceptblock:=p^.right;
               firstpass(p^.right);
+              aktexceptblock:=oldexceptblock;
               p^.registers32:=max(p^.registers32,p^.right^.registers32);
               p^.registersfpu:=max(p^.registersfpu,p^.right^.registersfpu);
 {$ifdef SUPPORT_MMX}
@@ -517,7 +551,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.30  1999-12-13 11:21:24  peter
+  Revision 1.31  1999-12-14 09:58:42  florian
+    + compiler checks now if a goto leaves an exception block
+
+  Revision 1.30  1999/12/13 11:21:24  peter
     * better position for for counter errors
 
   Revision 1.29  1999/12/09 23:18:05  pierre

compiler/tree.pas

@@ -239,7 +239,7 @@ unit tree;
              loopn : (t1,t2 : ptree;backward : boolean);
              asmn : (p_asm : paasmoutput;object_preserved : boolean);
              casen : (nodes : pcaserecord;elseblock : ptree);
-             labeln,goton : (labelnr : pasmlabel);
+             labeln,goton : (labelnr : pasmlabel;exceptionblock : ptree;labsym : plabelsym);
              withn : (withsymtable : pwithsymtable;tablecount : longint;withreference:preference;islocal:boolean);
              onn : (exceptsymtable : psymtable;excepttype : pobjectdef);
              arrayconstructn : (cargs,cargswap,forcevaria,novariaallowed: boolean;constructdef:pdef);
@@ -1233,6 +1233,7 @@ unit tree;
          { for security }
          { nr^.is_used:=true;}
          p^.labelnr:=nr;
+         p^.exceptionblock:=nil;
          genlabelnode:=p;
       end;
 
@@ -1897,7 +1898,10 @@ unit tree;
 end.
 {
   $Log$
-  Revision 1.104  1999-11-30 10:40:59  peter
+  Revision 1.105  1999-12-14 09:58:42  florian
+    + compiler checks now if a goto leaves an exception block
+
+  Revision 1.104  1999/11/30 10:40:59  peter
     + ttype, tsymlist
 
   Revision 1.103  1999/11/18 15:34:51  pierre