peter 26 years ago
parent
commit
b4a852e74b

+ 7 - 7
compiler/cgai386.pas

@@ -3054,20 +3054,20 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
 end.
 {
   $Log$
-  Revision 1.12  1999-07-05 20:13:13  peter
+  Revision 1.13  1999-07-05 20:25:22  peter
+    * merged
+
+  Revision 1.12  1999/07/05 20:13:13  peter
     * removed temp defines
 
   Revision 1.11  1999/07/05 11:56:56  jonas
     * merged
 
-  Revision 1.5.2.4  1999/07/04 23:55:52  jonas
-    * changed {$ifdef jmpfix} to {$ifndef nojmpfix}
-
-  Revision 1.10  1999/07/04 21:59:30  jonas
-    * merged
+  Revision 1.5.2.5  1999/07/05 20:03:31  peter
+    * removed warning/notes
 
   Revision 1.5.2.3  1999/07/04 21:50:17  jonas
-    * everything between {$ifdef jmpfix}:
+    * everything between $ifdef jmpfix:
       * when a jxx instruction is disposed, decrease the refcount of the label
         it referenced
       * for jmp instructions to a label, set is_jmp also to true (was only done

+ 6 - 4
compiler/errord.msg

@@ -863,6 +863,12 @@ type_e_wrong_parameter_type=E_Inkompatible Typen f
 type_e_no_method_and_procedure_not_compatible=E_Methode (Variable) und Prozedur (Variable) sind nicht Kompatibel
 % You can't assign a method to a procedure variable or a procedure to a
 % method pointer.
+type_e_wrong_math_argument=E_Illegal constant passed to internal math function
+% The constant argument passed to a ln or sqrt function is out of
+% the definition range of these functions.
+type_e_no_addr_of_constant=E_Can't get the address of constants
+% It's not possible to get the address of a constant, because they
+% aren't stored in memory, you can try making it a typed constant.
 % \end{description}
 #
 # Symtable
@@ -1088,10 +1094,6 @@ cg_e_include_not_implemented=E_Include und Exclude sind f
 % \var{include} and \var{exclude} are only partially
 % implemented for \var{i386} processors
 % and not at all for \var{m68k} processors.
-cg_w_may_wrong_math_argument=W_M”glicherweise unzul„ssige Konstante wurde an interne Algebra-Funktion �bergeben
-% The constant argument passed to a ln or sqrt function is out of
-% the definition range of these functions, you may get unexpected
-% results when running the program
 cg_e_cannot_call_cons_dest_inside_with=E_Constructoren und Destruktoren k”nnen in diesem Kontext nicht aufgerufen wenrden
 % Inside a \var{With} clause you cannot call a constructor or destructor for the
 % object you have in the \var{with} clause.

+ 6 - 5
compiler/errores.msg

@@ -863,7 +863,12 @@ type_e_wrong_parameter_type=E_Tipo incompatible para el arg. num. $1: Cogi
 type_e_no_method_and_procedure_not_compatible=E_M‚todo (variable) y Procedure (variable) no son compatibles
 % You can't assign a method to a procedure variable or a procedure to a
 % method pointer.
-
+type_e_wrong_math_argument=E_Illegal constant passed to internal math function
+% The constant argument passed to a ln or sqrt function is out of
+% the definition range of these functions.
+type_e_no_addr_of_constant=E_Can't get the address of constants
+% It's not possible to get the address of a constant, because they
+% aren't stored in memory, you can try making it a typed constant.
 #
 # Symtable
 #
@@ -1088,10 +1093,6 @@ cg_e_include_not_implemented=E_Include or exclude not implemented in this case
 % \var{include} and \var{exclude} are only partially
 % implemented for \var{i386} processors
 % and not at all for \var{m68k} processors.
-cg_w_may_wrong_math_argument=W_Probable constante ilegal pasada a funci¢n matem tica interna
-% The constant argument passed to a ln or sqrt function is out of
-% the definition range of these functions, you may get unexpected
-% results when running the program
 cg_e_cannot_call_cons_dest_inside_with=E_Constructores o destructores no pueden ser llamados aqu¡ dentro
 cg_e_cannot_call_message_direct=E_No se puede llamar al m‚todo manejador de mensaje directamente
 % A message method handler method can't be called directly if it contains an

+ 6 - 4
compiler/errorf.msg

@@ -849,6 +849,12 @@ type_e_wrong_parameter_type=E_Incompatible type for arg #$1: Got $2, expected $3
 type_e_no_method_and_procedure_not_compatible=E_Method (variable) and Procedure (variable) are not compatible
 % You can't assign a method to a procedure variable or a procedure to a
 % method pointer.
+type_e_wrong_math_argument=E_Illegal constant passed to internal math function
+% The constant argument passed to a ln or sqrt function is out of
+% the definition range of these functions.
+type_e_no_addr_of_constant=E_Can't get the address of constants
+% It's not possible to get the address of a constant, because they
+% aren't stored in memory, you can try making it a typed constant.
 % \end{description}
 #
 # Symtable
@@ -1085,10 +1091,6 @@ cg_e_include_not_implemented=E_Include and exclude not implemented in this case
 % \var{include} and \var{exclude} are only partially
 % implemented for \var{i386} processors
 % and not at all for \var{m68k} processors.
-cg_w_may_wrong_math_argument=W_Probably illegal constant passed to internal math function
-% The constant argument passed to a ln or sqrt function is out of
-% the definition range of these functions, you may get unexpected
-% results when running the program
 cg_e_cannot_call_cons_dest_inside_with=E_Constructors or destructors can not be called inside a 'with' clause
 % Inside a \var{With} clause you cannot call a constructor or destructor for the
 % object you have in the \var{with} clause.

+ 7 - 5
compiler/errorn.msg

@@ -3,7 +3,7 @@
 #   This file is part of the Free Pascal Compiler
 #   Copyright (c) 1998 by the Free Pascal Development team
 #
-#   English (default) Language File for Free Pascal
+#   Dutch Language File for Free Pascal
 #
 #   See the file COPYING.FPC, included in this distribution,
 #   for details about the copyright.
@@ -861,6 +861,12 @@ type_e_wrong_parameter_type=E_Incompatibel type voor arg #$1: kreeg $2, verwacht
 type_e_no_method_and_procedure_not_compatible=E_Method (variable) and Procedure (variable) are not compatible
 % You can't assign a method to a procedure variable or a procedure to a
 % method pointer.
+type_e_wrong_math_argument=E_Illegal constant passed to internal math function
+% The constant argument passed to a ln or sqrt function is out of
+% the definition range of these functions.
+type_e_no_addr_of_constant=E_Can't get the address of constants
+% It's not possible to get the address of a constant, because they
+% aren't stored in memory, you can try making it a typed constant.
 % \end{description}
 #
 # Symtable
@@ -1086,10 +1092,6 @@ cg_e_include_not_implemented=E_Include en exclude niet ondersteund in dit geval
 % \var{include} and \var{exclude} are only partially
 % implemented for \var{i386} processors
 % and not at all for \var{m68k} processors.
-cg_w_may_wrong_math_argument=W_Waarschijnlijk ongeldige constante doorgegeven aan interne routine
-% The constant argument passed to a ln or sqrt function is out of
-% the definition range of these functions, you may get unexpected
-% results when running the program
 cg_e_cannot_call_cons_dest_inside_with=E_Constructors of destructors kunnen niet aangeroepen worden binnen een 'with' clausule
 % Inside a \var{With} clause you cannot call a constructor or destructor for the
 % object you have in the \var{with} clause.

+ 9 - 2
compiler/errorr.msg

@@ -436,6 +436,8 @@ type_w_maybe_wrong_hi_lo=W_lo/hi(longint/dword) 
 type_e_integer_or_real_expr_expected=E_ަ¨¤ ¥âáï ¢ëp ¦¥­¨¥ ⨯  Integer ¨«¨ Real
 type_e_wrong_type_in_array_constructor=E_H¥¢¥p­ë© ⨯ ¢ ¬ áᨢ¥ ª®­áâpyªâ®p®¢
 type_e_wrong_parameter_type=E_H¥á®¢¬¥á⨬®áâì ⨯®¢ ¢  p£y¬¥­â å
+type_e_wrong_math_argument=E_Illegal constant passed to internal math function
+type_e_no_addr_of_constant=E_Can't get the address of constants
 
 #
 # Symtable
@@ -516,7 +518,6 @@ cg_e_unable_inline_procvar=E_
 cg_e_no_code_for_inline_stored=E_H¥â ª®¤  ¢ inline
 cg_e_can_access_element_zero=E_Hy«¥¢®© í«¥¬¥­â ansi/wide- ¨«¨ ¤«¨­­®© áâp®ª¨ ­¥¤®áây¯¥­, ¨á¯®«ì§y©â¥ ¢¬¥áâ® í⮣® (set)length
 cg_e_include_not_implemented=E_‚ª«î祭¨ï ¨ ¨áª«î祭¨ï ­¥ ¯®¤¤¥p¦¨¢ îâáï ¢ case
-cg_w_may_wrong_math_argument=W_‚¥p®ïâ­® ­¥¯p ¢¨«ì­ ï ª®­áâ ­â  ¯p®è«  ª ¢­yâp¥­­¥© ¬ â¥¬ â¨ç¥áª®© äy­ªæ¨¨
 cg_e_cannot_call_cons_dest_inside_with=E_Š®­áâpyªâ®pë ¨«¨ ¤¥áâpyªâ®pë ­¥ ¬®£yâ ¢ë§ë¢ âìáï ¢­yâp¨ 'with' ¯p¥¤«®¦¥­¨©
 cg_e_cannot_call_message_direct=E_H¥«ì§ï ¢ë§ë¢ âì ¬¥â®¤ ®¡p ¡®â稪  ᮡë⨩ ­¥¯®áp¥¤á⢥­­®
 
@@ -892,9 +893,15 @@ ol_end=**1h_
 
 #
 # $Log$
-# Revision 1.4  1999-06-14 17:47:56  peter
+# Revision 1.5  1999-07-05 20:25:31  peter
 #   * merged
 #
+# Revision 1.4  1999/06/14 17:47:56  peter
+#   * merged
+#
+# Revision 1.3.2.2  1999/07/05 20:06:36  peter
+#   * give error instead of warning for ln(0) and sqrt(0)
+#
 # Revision 1.3.2.1  1999/06/14 17:29:17  peter
 #   * updated helppages for -A<x> and -gc
 #

+ 9 - 3
compiler/i386asm.pas

@@ -1524,17 +1524,23 @@ end;
 end.
 {
   $Log$
-  Revision 1.15  1999-07-05 11:56:55  jonas
+  Revision 1.16  1999-07-05 20:25:32  peter
     * merged
 
+  Revision 1.15  1999/07/05 11:56:55  jonas
+    * merged
+
+  Revision 1.12.2.4  1999/07/05 20:03:30  peter
+    * removed warning/notes
+
   Revision 1.12.2.3  1999/07/04 23:55:50  jonas
-    * changed {$ifdef jmpfix} to {$ifndef nojmpfix}
+    * changed $ifdef jmpfix to $ifndef nojmpfix
 
   Revision 1.14  1999/07/04 21:59:31  jonas
     * merged
 
   Revision 1.12.2.2  1999/07/04 21:50:16  jonas
-    * everything between {$ifdef jmpfix}:
+    * everything between $ifdef jmpfix:
       * when a jxx instruction is disposed, decrease the refcount of the label
         it referenced
       * for jmp instructions to a label, set is_jmp also to true (was only done

+ 2 - 1
compiler/msgidx.inc

@@ -224,6 +224,8 @@ type tmsgconst=(
   type_e_wrong_type_in_array_constructor,
   type_e_wrong_parameter_type,
   type_e_no_method_and_procedure_not_compatible,
+  type_e_wrong_math_argument,
+  type_e_no_addr_of_constant,
   sym_e_id_not_found,
   sym_f_internal_error_in_symtablestack,
   sym_e_duplicate_id,
@@ -290,7 +292,6 @@ type tmsgconst=(
   cg_e_no_code_for_inline_stored,
   cg_e_can_access_element_zero,
   cg_e_include_not_implemented,
-  cg_w_may_wrong_math_argument,
   cg_e_cannot_call_cons_dest_inside_with,
   cg_e_cannot_call_message_direct,
   asmr_d_start_reading,

+ 111 - 110
compiler/msgtxt.inc

@@ -238,136 +238,137 @@ const msgtxt : array[0..000097,1..240] of char=(
   'E_Wrong type in array constructor'#000+
   'E_Incompatible type for arg no. $1: Got $2, expected $3'#000+
   'E_Method (variable) and Procedure (variable) are not compatible'#000+
-  'E_Identifier not fo','und $1'#000+
+  'E_Illegal constant ','passed to internal math function'#000+
+  'E_Can'#039't get the address of constants'#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 solved $1'#000+
+  'E_Forward de','claration not solved $1'#000+
   'F_Identifier type already defined as type'#000+
-  'E_Error in type definit','ion'#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.mangledname()'#000+
+  'E_Invalid cal','l to tvarsym.mangledname()'#000+
   'F_record or class type expected'#000+
-  'E_Instances of classes or obje','cts with an abstract method are not al'+
-  'lowed'#000+
+  'E_Instances of classes or objects with an abstract method are not allo'+
+  'wed'#000+
   'W_Label not defined $1'#000+
   'E_Illegal label declaration'#000+
   'E_GOTO and LABEL are not supported (use switch -Sg)'#000+
-  'E_Label not found'#000+
+  'E_La','bel not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
-  'E_illegal type declarati','on of set elements'#000+
+  'E_illegal type declaration of set elements'#000+
   'E_Forward class definition not resolved $1'#000+
   'H_Parameter not used $1'#000+
   'N_Local variable not used $1'#000+
   'E_Set type expected'#000+
-  'W_Function result does not seem to be set'#000+
+  'W_Function resul','t does not seem to be set'#000+
   'E_Unknown record field identifier $1'#000+
-  'W_Local variable $1 does n','ot seem to be initialized'#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_BREAK not allowed'#000+
-  'E_CONTINUE not allowed'#000+
+  'E_','CONTINUE not allowed'#000+
   'E_Expression too complicated - FPU stack overflow'#000+
-  'E_Illegal expressi','on'#000+
+  'E_Illegal expression'#000+
   'E_Invalid integer expression'#000+
   'E_Illegal qualifier'#000+
   'E_High range limit < low range limit'#000+
   'E_Illegal counter variable'#000+
-  'E_Can'#039't determine which overloaded function to call'#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_Co','nversion between ordinals and pointers is not portable across pl'+
-  'atforms'#000+
+  'D_Conversion between ordinals and pointers is not portable across plat'+
+  'forms'#000+
   'E_File types must be var parameters'#000+
-  'E_The use of a far pointer isn'#039't allowed there'#000+
+  'E_The use of a far pointer isn'#039't allowed th','ere'#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 ma'+
-  'tch to this context)'#000+
+  'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
+  'h to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
-  'E_procedure call with stackframe ESP/SP'#000+
+  'E_procedure call with stackfra','me ESP/SP'#000+
   'E_Abstract methods can'#039't be called directly'#000+
-  'F_Internal Error in getfloatreg(), ','allocation failure'#000+
+  'F_Internal Error in getfloatreg(), allocation failure'#000+
   'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
   'F_Extended cg68k not supported'#000+
-  'F_32-bit unsigned not supported in MC68000 mode'#000+
+  'F_32-bit unsigned not supported in MC68000 mod','e'#000+
   'F_Internal Error in secondinline()'#000+
   'D_Register $1 weight $2 $3'#000+
-  'E_Stack limit excedeed in',' local routine'#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_No code for inline procedure stored'#000+
+  'E_No code for inline procedure stor','ed'#000+
   'E_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+
-  'se (set)length inste','ad'#000+
+  'se (set)length instead'#000+
   'E_Include and exclude not implemented in this case'#000+
-  'W_Probably illegal constant passed to internal math function'#000+
   'E_Constructors or destructors can not be called inside a '#039'with'#039+
   ' clause'#000+
-  'E_Cannot call message handler method directly'#000+
-  'D_Starti','ng $1 styled assembler parsing'#000+
+  'E_Cannot call message hand','ler method directly'#000+
+  'D_Starting $1 styled assembler parsing'#000+
   'D_Finished $1 styled assembler parsing'#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_Cannot use local variable or parameters',' here'#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_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 not allowed as ref','erences'#000+
+  'E_Loca','l symbols not allowed as references'#000+
   'E_Invalid base and index 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 all','owed'#000+
+  'E_Null ','label references are not allowed'#000+
   'F_Divide by zero in asm evaluator'#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+
+  'E_Invalid ','symbol reference'#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_E','rror converting binary $1'#000+
+  'E_Error converting hexadecimal $1'#000+
   'H_$1 translated to $2'#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 i','n asm'+
+  'W_Functions with void return va','lue 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+
   '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_Invalid combination of opcode and oper','ands'#000+
+  'E_Assemler syntax error in operand'#000+
   'E_Assemler syntax error in constant'#000+
   'E_Invalid 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+
+  'E_Invalid combination of o','verride 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+
@@ -375,64 +376,64 @@ const msgtxt : array[0..000097,1..240] of char=(
   '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 p','oint constant $1'#000+
+  'W_Modulo not su','pported'#000+
+  'E_Invalid floating point constant $1'#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 t','ype of variable specified'#000+
+  'E_Strings n','ot allowed as constants'#000+
+  'No type of variable specified'#000+
   'E_assembler code not returned to text section'#000+
   'E_Not a directive or local symbol $1'#000+
   'E_Using a defined name as a local label'#000+
   'F_Too many assembler files'#000+
-  'F_Selected assembler output not supported'#000+
+  'F_Selected assembler output not supp','orted'#000+
   'F_Comp not supported'#000+
-  'F','_Direct not support for binary writers'#000+
+  'F_Direct not support for binary writers'#000+
   'E_Allocating of data is 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: 16 ','Bit references not supported'#000+
   'E_Asm: Invalid effective address'#000+
   'E_Asm: Immediate or reference 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_Ass','embler $1 not found, switching to external assembling'#000+
+  'E_Can'#039't c','reate assember file $1'#000+
+  'W_Assembler $1 not found, switching to external assembling'#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+
-  'W_Linker $1 not found, switching to exter','nal linking'#000+
+  'W_Linker $1 n','ot found, switching to external linking'#000+
   'T_Using linker: $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_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
-  'W_binder not found, switching to e','xternal binding'#000+
+  'W_bind','er not found, switching to external binding'#000+
   'W_ar not found, switching to external ar'#000+
   'E_Dynamic Libraries 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+
+  'F_Can'#039't post proces','s 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_Stack space reserved: $1 bytes'#000+
   'X_Stack space commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
-  'T_PPU Loading $1'#000+
+  'T_PPU Loading',' $1'#000+
   'U_PPU Name: $1'#000+
-  'U_PPU Fla','gs: $1'#000+
+  'U_PPU Flags: $1'#000+
   'U_PPU Crc: $1'#000+
   'U_PPU Time: $1'#000+
   'U_PPU File too short'#000+
@@ -440,9 +441,9 @@ const msgtxt : array[0..000097,1..240] of char=(
   '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_PPU So','urce: $1'#000+
   'U_Writing $1'#000+
-  'F_Can'#039,'t Write PPU-File'#000+
+  'F_Can'#039't Write PPU-File'#000+
   'F_reading PPU-File'#000+
   'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
@@ -450,65 +451,65 @@ const msgtxt : array[0..000097,1..240] of char=(
   '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 a','vailable'#000+
+  'F_Can'#039't c','ompile unit $1, no sources available'#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 unit, sta','tic lib is older than ppufile'#000+
+  'U_Recompiling $1, source found ','only'#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 of $1'#000+
-  'U_S','econd load for unit $1'#000+
+  'U_Pars','ing 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 command line'#000+
-  'E','_Illegal parameter: $1'#000+
+  'F_No source',' file 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+
-  'F_too ma','ny IF(N)DEFs'#000+
+  'W_Shared libs not supported on DOS platform, ','reverting 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 obsolete swi','tch $1, please use $2'#000+
+  'E_Yo','u are 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-98 by Florian Klaempfl'#000+
-  'Free Pascal Compiler version $FPCVER'#000+
+  'Free Pascal Compiler versio','n $FPCVER'#000+
   #000+
-  'Compiler 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 + after a boole','an 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 temp allocat','ion/release info in assembler file'#000+
+  '**2ar_list register allocation/release info in assembler ','file'#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+
-  '**2Ci_IO','-checking'#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+
   '**2Cr_range checking'#000+
@@ -516,121 +517,121 @@ const msgtxt : array[0..000097,1..240] of char=(
   '**2Ct_stack checking'#000+
   '3*2CS_create static library'#000+
   '3*2Cx_use smartlinking'#000+
-  '**1d<x>_defines the symbol <x>'#000+
-  '*O1D_ge','nerate a DEF file'#000+
+  '**1d<x>_de','fines the symbol <x>'#000+
+  '*O1D_generate a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
   '*O2Dw_PM application'#000+
   '**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+
-  '**2Fe<x>_redirect er','ror output to <x>'#000+
+  '**2FD<x>_sets the directory where to search for compiler ut','ilities'#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 object path'#000+
-  '**2Fr<x>_load error message file <x>'#000+
-  '**2Fu<x','>_adds <x> to unit path'#000+
+  '**2Fr<x>_load er','ror 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 checks for pointers'#000+
-  '**1i_information'#000+
-  '**2iD_return compi','ler date'#000+
+  '**1i_in','formation'#000+
+  '**2iD_return compiler date'#000+
   '**2iV_return compiler version'#000+
   '**2iSO_return compiler OS'#000+
   '**2iSP_return compiler processor'#000+
   '**2iTO_return target OS'#000+
   '**2iTP_return target processor'#000+
   '**1I<x>_adds <x> to include path'#000+
-  '**1k<x>_Pass <x> to the linker'#000+
+  '**1k<x>_Pass <x> to the li','nker'#000+
   '**1l_write logo'#000+
-  '**1n_do','n'#039't read the default config file'#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'#000+
   '*L1P_use pipes instead of creating temporary assembler files'#000+
-  '**1S<x>_syntax options:'#000+
-  '**2S2_switch some Delphi 2',' extensions on'#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+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
-  '**2Si_support C++ styled INLIN','E'#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+
   '**2St_allow static keyword in objects'#000+
-  '**1s_don'#039't call assembler and',' linker (only with -a)'#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+
-  '**2*_e : Show errors (default)       d',' : Show debug info'#000+
+  '**2*_e : S','how 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*_i : Show general info           p : ','Show compiled procedures'#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 : Show all procedure          r : Rhide/GCC compatibility mode'#000+
-  '**2*_    declara','tions if an error    x : Executable info (Win32 only'+
-  ')'#000+
+  '**2*_b : Show all procedure          r : Rhide/GCC compati','bility mod'+
+  'e'#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+
   '**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
-  '**2Xs_strip all symbols from executable'#000+
-  '**2XS_link wit','h static libraries (defines FPC_LINK_STATIC)'#000+
+  '**2Xs_strip all symbols fr','om executable'#000+
+  '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
   '**0*_Processor specific options:'#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_elf3','2 (Linux) file using Nasm'#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*2Acoff_coff (Go32v2) using internal writer'#000+
-  '3*2Apecoff_pecoff (Win32) using internal writer'#000+
-  '3*1R<x>_a','ssembler reading style:'#000+
+  '3*2Apecoff_pecoff (Win32) usi','ng 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*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*2OG_ge','nerate faster code (default)'#000+
   '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
   '3*2Ou_enable uncertain optimizations (see docs)'#000+
   '3*2O1_level 1 optimizations (quick optimizations)'#000+
-  '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
-  '3*2O3_level 3 optimizatio','ns (same as -O2u)'#000+
+  '3*2O2_level 2 optimizations (-O1 + slower optimization','s)'#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*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
-  '3*1T<x>_Target operating system:'#000+
-  '3*2TGO32V1_ver','sion 1 of DJ Delorie DOS extender'#000+
+  '3*1T<x>_Target oper','ating 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*2TOS2_OS/2 2.x'#000+
   '3*2TWin32_Windows 32 Bit'#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 Syn','tax (old GAS)'#000+
+  '6*2Agas_GNU Motoro','la assembler'#000+
+  '6*2Amit_MIT Syntax (old GAS)'#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 MC680','20+'#000+
+  '6*2O2_set',' target processor to a MC68020+'#000+
   '6*1R<x>_assembler reading style:'#000+
   '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system:'#000+
@@ -639,6 +640,6 @@ const msgtxt : array[0..000097,1..240] of char=(
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
-  '**1?_shows this help'#000+
-  '**1h_sho','ws this help without waiting'#000
+  '*','*1?_shows this help'#000+
+  '**1h_shows this help without waiting'#000
 );

+ 7 - 2
compiler/pdecl.pas

@@ -1121,7 +1121,6 @@ unit pdecl;
          oldparse_only : boolean;
          intmessagetable,strmessagetable,classnamelabel : pasmlabel;
          storetypeforwardsallowed : boolean;
-         pt : ptree;
 
       begin
          {Nowadays aktprocsym may already have a value, so we need to save
@@ -2116,13 +2115,19 @@ unit pdecl;
 end.
 {
   $Log$
-  Revision 1.129  1999-07-02 13:02:26  peter
+  Revision 1.130  1999-07-05 20:25:39  peter
+    * merged
+
+  Revision 1.129  1999/07/02 13:02:26  peter
     * merged
 
   Revision 1.128  1999/06/30 22:16:19  florian
     * use of is_ordinal checked: often a qword/int64 isn't allowed (case/for ...)
     * small qword problems fixed
 
+  Revision 1.127.2.2  1999/07/05 20:03:27  peter
+    * removed warning/notes
+
   Revision 1.127.2.1  1999/07/02 12:59:49  peter
     * fixed parsing of message directive
 

+ 22 - 9
compiler/tcinl.pas

@@ -123,6 +123,7 @@ implementation
          { handle intern constant functions in separate case }
          if p^.inlineconst then
           begin
+            hp:=nil;
             { no parameters? }
             if not assigned(p^.left) then
              begin
@@ -249,14 +250,16 @@ implementation
                      if isreal then
                        begin
                           if vr<0.0 then
-                            message(cg_w_may_wrong_math_argument);
-                          hp:=genrealconstnode(sqrt(vr),bestrealdef^)
+                           CGMessage(type_e_wrong_math_argument)
+                          else
+                           hp:=genrealconstnode(sqrt(vr),bestrealdef^)
                        end
                      else
                        begin
                           if vl<0 then
-                            message(cg_w_may_wrong_math_argument);
-                          hp:=genrealconstnode(sqrt(vl),bestrealdef^);
+                           CGMessage(type_e_wrong_math_argument)
+                          else
+                           hp:=genrealconstnode(sqrt(vl),bestrealdef^);
                        end;
                    end;
                  in_const_arctan :
@@ -292,14 +295,16 @@ implementation
                      if isreal then
                        begin
                           if vr<=0.0 then
-                            message(cg_w_may_wrong_math_argument);
-                          hp:=genrealconstnode(ln(vr),bestrealdef^)
+                           CGMessage(type_e_wrong_math_argument)
+                          else
+                           hp:=genrealconstnode(ln(vr),bestrealdef^)
                        end
                      else
                        begin
                           if vl<=0 then
-                            message(cg_w_may_wrong_math_argument);
-                          hp:=genrealconstnode(ln(vl),bestrealdef^);
+                           CGMessage(type_e_wrong_math_argument)
+                          else
+                           hp:=genrealconstnode(ln(vl),bestrealdef^);
                        end;
                    end;
                  else
@@ -307,6 +312,8 @@ implementation
                end;
              end;
             disposetree(p);
+            if hp=nil then
+             hp:=genzeronode(errorn);
             firstpass(hp);
             p:=hp;
           end
@@ -1116,7 +1123,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.40  1999-07-05 20:13:18  peter
+  Revision 1.41  1999-07-05 20:25:40  peter
+    * merged
+
+  Revision 1.40  1999/07/05 20:13:18  peter
     * removed temp defines
 
   Revision 1.39  1999/07/03 14:14:31  florian
@@ -1133,6 +1143,9 @@ end.
   Revision 1.36  1999/06/15 18:58:36  peter
     * merged
 
+  Revision 1.35.2.2  1999/07/05 20:06:46  peter
+    * give error instead of warning for ln(0) and sqrt(0)
+
   Revision 1.35.2.1  1999/06/15 18:54:54  peter
     * more procvar fixes
 

+ 8 - 2
compiler/tcmem.pas

@@ -268,7 +268,7 @@ implementation
          if is_constnode(p^.left) then
           begin
             aktfilepos:=p^.left^.fileinfo;
-            Comment(V_Error,'can''t get the address of constants')
+	    CGMessage(type_e_no_addr_of_constant);
           end
          else
            begin
@@ -582,9 +582,15 @@ implementation
 end.
 {
   $Log$
-  Revision 1.19  1999-07-05 16:24:17  peter
+  Revision 1.20  1999-07-05 20:25:41  peter
     * merged
 
+  Revision 1.19  1999/07/05 16:24:17  peter
+    * merged
+
+  Revision 1.18.2.3  1999/07/05 20:06:47  peter
+    * give error instead of warning for ln(0) and sqrt(0)
+
   Revision 1.18.2.2  1999/07/05 16:22:56  peter
     * error if @constant
 

+ 12 - 6
rtl/inc/heaptrc.pp

@@ -63,7 +63,7 @@ implementation
 
 type
    plongint = ^longint;
-   
+
 const
   { allows to add custom info in heap_mem_info }
   extra_info_size : longint = 0;
@@ -380,7 +380,7 @@ end;
 procedure TraceFreeMem(var p:pointer;size:longint);
 
   var i,bp, ppsize : longint;
-  pp,pp2 : pheap_mem_info;
+  pp : pheap_mem_info;
 begin
   inc(freemem_size,size);
   inc(freemem8_size,((size+7) div 8)*8);
@@ -493,7 +493,7 @@ var
 
 var
    heap_at_init : pointer;
-   
+
 procedure CheckPointer(p : pointer);[public, alias : 'FPC_CHECKPOINTER'];
 var
   i  : longint;
@@ -533,11 +533,11 @@ begin
 {$endif go32v2}
 
   { I don't know where the stack is in other OS !! }
-  
+
   if p>=heapptr then
     runerror(216);
   { first try valid list faster }
-  
+
 {$ifdef EXTRA}
   pp:=heap_valid_first;
   while pp<>nil do
@@ -755,7 +755,13 @@ begin
 end.
 {
   $Log$
-  Revision 1.16  1999-05-23 00:07:17  pierre
+  Revision 1.17  1999-07-05 20:22:08  peter
+    * merged
+
+  Revision 1.16.2.1  1999/07/05 20:12:27  peter
+    * removed warning
+
+  Revision 1.16  1999/05/23 00:07:17  pierre
     * support for heap allocated before TraceGetMem is used in
       FPC_CHECKPOINTER
     * faster CHECKPOINTER routine (list of valid blocks only !)