* merged cdecl and array fixes

compiler/msg/errore.msg

@@ -160,7 +160,7 @@ scan_w_switch_is_global=02010_W_Misplaced global compiler switch
 % the start of the unit or program.
 scan_e_illegal_char_const=02011_E_Illegal char constant
 % This happens when you specify a character with its ASCII code, as in
-% \var{\#96}, but the number is either illegal, or out of range. 
+% \var{\#96}, but the number is either illegal, or out of range.
 scan_f_cannot_open_input=02012_F_Can't open file "$1"
 % \fpc cannot find the program or unit source file you specified on the
 % command line.
@@ -182,7 +182,7 @@ scan_e_error_in_preproc_expr=02019_E_Evaluating a conditional compiling expressi
 % There is an error in the expression following the \var{\{\$if ..\}} compiler
 % directive.
 scan_w_macro_cut_after_255_chars=02020_W_Macro contents are limited to 255 characters in length
-% The contents of macros cannot be longer than 255 characters. 
+% The contents of macros cannot be longer than 255 characters.
 scan_e_endif_without_if=02021_E_ENDIF without IF(N)DEF
 % Your \var{\{\$IFDEF ..\}} and {\{\$ENDIF\}} statements aren't balanced.
 scan_f_user_defined=02022_F_User defined: $1
@@ -277,7 +277,7 @@ scan_w_include_env_not_found=02054_W_Include environment "$1" not found in envir
 scan_e_invalid_maxfpureg_value=02055_E_Illegal value for FPU register limit
 % Valid values for this directive are 0..8 and NORMAL/DEFAULT
 scan_w_only_one_resourcefile_supported=02056_W_Only one resource file is supported for this target
-% The target you are compiling for supports only one resource file. 
+% The target you are compiling for supports only one resource file.
 % The first resource file found is used, the others are discarded.
 scan_w_macro_support_turned_off=02057_W_Macro support has been turned off
 % A macro declaration has been found, but macro support is currently off,
@@ -296,7 +296,7 @@ scan_e_string_exceeds_255_chars=02061_E_Constant strings can't be longer than 25
 #
 # Parser
 #
-# 03188 is the last used one
+# 03191 is the last used one
 #
 % \section{Parser messages}
 % This section lists all parser messages. The parser takes care of the
@@ -511,7 +511,7 @@ parser_e_dont_nest_export=03067_E_EXPORT declared functions can't be nested
 % that was declared as an export procedure.
 parser_e_methods_dont_be_export=03068_E_methods can't be EXPORTed
 % You cannot declare a procedure that is a method for an object as
-% \var{export}ed. 
+% \var{export}ed.
 parser_e_call_by_ref_without_typeconv=03069_E_call by var parameters have to match exactly: Got "$1" expected "$2"
 % When calling a function declared with \var{var} parameters, the variables in
 % the function call must be of exactly the same type. There is no automatic
@@ -587,14 +587,14 @@ parser_e_comparative_operator_return_boolean=03090_E_Comparative operator must r
 % value.
 parser_e_only_virtual_methods_abstract=03091_E_Only virtual methods can be abstract
 % You are declaring a method as abstract, when it is not declared to be
-% virtual. 
+% virtual.
 parser_f_unsupported_feature=03092_F_Use of unsupported feature!
 % You're trying to force the compiler into doing something it cannot do yet.
 parser_e_mix_of_classes_and_objects=03093_E_The mix of different kind of objects (class, object, interface, etc) isn't allowed
 % You cannot derive \var{objects}, \var{classes}, \var{cppclasses} and \var{interfaces} interttwined . E.g.
 % a class cannot have an object as parent and vice versa.
 parser_w_unknown_proc_directive_ignored=03094_W_Unknown procedure directive had to be ignored: "$1"
-% The procedure directive you specified is unknown. 
+% The procedure directive you specified is unknown.
 parser_e_absolute_only_one_var=03095_E_absolute can only be associated to one variable
 % You cannot specify more than one variable before the \var{absolute} directive.
 % Thus, the following construct will provide this error:
@@ -770,7 +770,7 @@ parser_f_direct_assembler_not_allowed=03148_F_Direct assembler not supported for
 parser_w_no_objpas_use_mode=03149_W_Don't load OBJPAS unit manually, use {$mode objfpc} or {$mode delphi} instead
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
-% \var{\{\$mode delphi\}} 
+% \var{\{\$mode delphi\}}
 % directives which load the unit automatically
 parser_e_no_object_override=03150_E_OVERRIDE can't be used in objects
 % Override is not supported for objects, use \var{virtual} instead to override
@@ -890,13 +890,17 @@ parser_h_c_arrays_are_references=03187_H_C arrays are passed by reference
 % Any array passed to a C functions is passed
 % by a pointer (i.e. by reference).
 parser_e_C_array_of_const_must_be_last=03188_E_C array of const must be the last argument
-% You can not add any other argument after an \var{array of const} for 
+% You can not add any other argument after an \var{array of const} for
 % \var{cdecl} functions, as the size pushed on stack for this argument is
 % not known.
 parser_h_type_redef=03189_H_Type "$1" redefinition
 % This is an indicator that a previously declared type is
 % being redefined as something else. This may, or may not
 % be, a cause for errors.
+parser_w_cdecl_has_no_high=03190_W_cdecl'ared functions have no high parameter
+% Functions declared with cdecl modifier do not pass an extra implicit parameter.
+parser_w_cdecl_no_openstring=03191_W_cdecl'ared functions do not support open strings
+% Openstring is not supported for cdecl'ared functions.
 %
 % \end{description}
 #
@@ -1066,10 +1070,10 @@ type_e_array_index_enums_with_assign_not_possible=04038_E_enums with assignments
 % \end{verbatim}
 % you cannot use it as index of an array.
 type_e_classes_not_related=04039_E_Class or Object types "$1" and "$2" are not related
-%  There is a typecast from one class or object to another while the class/object 
+%  There is a typecast from one class or object to another while the class/object
 %  are not related. This will probably lead to errors
 type_w_classes_not_related=04040_W_Class types "$1" and "$2" are not related
-%  There is a typecast from one class or object to another while the class/object 
+%  There is a typecast from one class or object to another while the class/object
 %  are not related. This will probably lead to errors
 type_e_class_or_interface_type_expected=04041_E_Class or interface type expected, but got "$1"
 type_e_type_is_not_completly_defined=04042_E_Type "$1" is not completley defined
@@ -1085,13 +1089,13 @@ type_w_signed_unsigned_always_true=04045_W_Comparison is always true due to rang
 % less than zero. Because of type promotion, the statement will always evaluate to
 % true. Exlicitly typecast the constant to the correct range to avoid this problem.
 type_w_instance_with_abstract=04046_W_Constructing a class "$1" with abstract method "$2"
-% An instance of a class is created which contains non-implemented abstract 
+% An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
 % routine is ever called. All abstract methods should be overriden.
 type_h_in_range_check=04047_H_The left operand of the IN operator should be byte sized
-% The left operand of the \var{in} operator is not an ordinal or enumeration which fits 
-% within 8-bits, this may lead to range check errors. The  \var{in} operator 
-% currently only supports a left operand which fits within a byte. In the case of 
+% The left operand of the \var{in} operator is not an ordinal or enumeration which fits
+% within 8-bits, this may lead to range check errors. The  \var{in} operator
+% currently only supports a left operand which fits within a byte. In the case of
 % enumerations, the size of an element of an enumeration can be controlled with
 % the \var{\{\$PACKENUM\}} or \var{\{\$Zn\}} switches.
 type_w_smaller_possible_range_check=04048_W_Type size mismatch, possible loss of data / range check error
@@ -1217,23 +1221,23 @@ sym_b_param_list=05039_B_Found declaration: $1
 % procedure is not found, then all candidate overloaded procedures are
 % listed, with their parameter lists.
 sym_e_segment_too_large=05040_E_Data element too large
-% You get this when you declare a data element whose size exceeds the 
+% You get this when you declare a data element whose size exceeds the
 % prescribed limit (2 Gb on 80386+/68020+ processors)
 sym_e_no_matching_implementation_found=05042_E_No matching implementation for interface method "$1" found
 % There was no matching method found which could implement the interface
 % method. Check argument types and result type of the methods.
 sym_w_deprecated_symbol=05043_W_Symbol "$1" is deprecated
-% This means that a symbol (a variable, routine, etc...) which is 
-% declared as \var{deprecated} is used. Deprecated symbols may no longer 
+% This means that a symbol (a variable, routine, etc...) which is
+% declared as \var{deprecated} is used. Deprecated symbols may no longer
 % be available in newer versions of the unit / library. Usage of this symbol
 % should be avoided as much as possible.
 sym_w_non_portable_symbol=05044_W_Symbol "$1" is not portable
-% This means that a symbol (a variable, routine, etc...) which is 
+% This means that a symbol (a variable, routine, etc...) which is
 % declared as \var{platform} is used. This symbol's value, usage
 % and availability is platform specific and should not be used
 % if the source code must be portable.
 sym_w_non_implemented_symbol=05055_W_Symbol "$1" is not implemented
-% This means that a symbol (a variable, routine, etc...) which is 
+% This means that a symbol (a variable, routine, etc...) which is
 % declared as \var{unimplemented} is used. This symbol is defined,
 % but is not yet implemented on this specific platform.
 % \end{description}
@@ -1482,13 +1486,13 @@ asmr_e_error_converting_hexadecimal=07038_E_Error converting hexadecimal $1
 asmr_h_direct_global_to_mangled=07039_H_$1 translated to $2
 asmr_w_direct_global_is_overloaded_func=07040_W_$1 is associated to an overloaded function
 asmr_e_cannot_use_SELF_outside_a_method=07041_E_Cannot use SELF outside a method
-% There is a reference to the \var{self} symbol while it is not 
+% There is a reference to the \var{self} symbol while it is not
 % allowed. \var{self} can only be referenced inside methods
 asmr_e_cannot_use_OLDEBP_outside_nested_procedure=07042_E_Cannot use OLDEBP outside a nested procedure
-% There is a reference to the \var{oldebp} symbol while it is not 
+% There is a reference to the \var{oldebp} symbol while it is not
 % allowed. \var{oldebp} can only be referenced inside nested routines
 asmr_e_void_function=07043_W_Procedures can't return any value in asm code
-% Trying to return a value while in a procedure. A procedure 
+% Trying to return a value while in a procedure. A procedure
 % does not have any return value
 asmr_e_SEG_not_supported=07044_E_SEG not supported
 asmr_e_size_suffix_and_dest_dont_match=07045_E_Size suffix and destination or source size do not match
@@ -1505,7 +1509,7 @@ asmr_e_syn_operand=07049_E_Assembler syntax error in operand
 asmr_e_syn_constant=07050_E_Assembler syntax error in constant
 asmr_e_invalid_string_expression=07051_E_Invalid String expression
 asmr_w_const32bit_for_address=07052_W_constant with symbol $1 for address which is not on a pointer
-% A constant expression represents an address which does not fit 
+% A constant expression represents an address which does not fit
 % into a pointer. The address is probably incorrect
 asmr_e_unknown_opcode=07053_E_Unrecognized opcode $1
 % This opcode is not known
@@ -1513,7 +1517,7 @@ asmr_e_invalid_or_missing_opcode=07054_E_Invalid or missing opcode
 asmr_e_invalid_prefix_and_opcode=07055_E_Invalid combination of prefix and opcode: $1
 asmr_e_invalid_override_and_opcode=07056_E_Invalid combination of override and opcode: $1
 asmr_e_too_many_operands=07057_E_Too many operands on line
-% There are too many operands for this opcode. Check your 
+% There are too many operands for this opcode. Check your
 % assembler syntax
 asmr_w_near_ignored=07058_W_NEAR ignored
 asmr_w_far_ignored=07059_W_FAR ignored
@@ -1521,15 +1525,15 @@ asmr_e_dup_local_sym=07060_E_Duplicate local symbol $1
 asmr_e_unknown_local_sym=07061_E_Undefined local symbol $1
 asmr_e_unknown_label_identifier=07062_E_Unknown label identifier $1
 asmr_e_invalid_register=07063_E_Invalid register name
-% There is an unknown register name used as operand. 
+% There is an unknown register name used as operand.
 asmr_e_invalid_fpu_register=07064_E_Invalid floating point register name
-% There is an unknown register name used as operand. 
+% There is an unknown register name used as operand.
 asmr_w_modulo_not_supported=07066_W_Modulo not supported
 asmr_e_invalid_float_const=07067_E_Invalid floating point constant $1
-% The floating point constant declared in an assembler block is 
+% The floating point constant declared in an assembler block is
 % invalid.
 asmr_e_invalid_float_expr=07068_E_Invalid floating point expression
-% The floating point expression declared in an assembler block is 
+% The floating point expression declared in an assembler block is
 % invalid.
 asmr_e_wrong_sym_type=07069_E_Wrong symbol type
 asmr_e_cannot_index_relative_var=07070_E_Cannot index a local var or parameter with a register
@@ -1543,7 +1547,7 @@ asmr_w_id_supposed_external=07072_W_Identifier $1 supposed external
 asmr_e_string_not_allowed_as_const=07073_E_Strings not allowed as constants
 % Character strings are not allowed as constants.
 asmr_e_no_var_type_specified=07074_No type of variable specified
-% The syntax expects a type idenfitifer after the dot, but 
+% The syntax expects a type idenfitifer after the dot, but
 % none was found.
 asmr_w_assembler_code_not_returned_to_text=07075_E_assembler code not returned to text section
 % There was a directive in the assembler block to change sections,
@@ -1556,7 +1560,7 @@ asmr_e_dollar_without_identifier=07078_E_Dollar token is used without an identif
 % A constant expression has an identifier which does not start with
 % the $ symbol.
 asmr_w_32bit_const_for_address=07079_W_32bit constant created for address
-% A constant was used as an address. This is probably an error, 
+% A constant was used as an address. This is probably an error,
 % since using absolute addresses will probably not work.
 asmr_n_align_is_target_specific=07080_N_.align is target specific, use .balign or .p2align
 % Using the .align directive is platform specific, and its meaning will vary
@@ -1656,10 +1660,10 @@ exec_e_cant_call_assembler=09008_E_Can't call the assembler, error $1 switching
 exec_i_assembling=09009_I_Assembling $1
 exec_i_assembling_smart=09010_I_Assembling with smartlinking $1
 exec_w_objfile_not_found=09011_W_Object $1 not found, Linking may fail !
-% One of the object file is missing, and linking will probably fail. 
+% One of the object file is missing, and linking will probably fail.
 % Check your paths.
 exec_w_libfile_not_found=09012_W_Library $1 not found, Linking may fail !
-% One of the library file is missing, and linking will probably fail. 
+% One of the library file is missing, and linking will probably fail.
 % Check your paths.
 exec_e_error_while_linking=09013_E_Error while linking
 % Generic error while linking.
@@ -1741,7 +1745,7 @@ unit_f_ppu_read_error=10014_F_Error reading PPU-File
 % information. Recompilation will be necessary.
 unit_f_ppu_read_unexpected_end=10015_F_unexpected end of PPU-File
 % Unexpected end of file. This may mean that the PPU file is
-% corrupted. 
+% corrupted.
 unit_f_ppu_invalid_entry=10016_F_Invalid PPU-File entry: $1
 % The unit the compiler is trying to read is corrupted, or generated with a
 % newer version of the compiler.
@@ -1957,7 +1961,7 @@ Report bugs,suggestions etc to:
 #
 # Help pages (option -? and -h)
 #
-# The first character on the line indicates who will display this 
+# The first character on the line indicates who will display this
 # line, the current possibilities are :
 #    * = every target
 #    3 = 80x86 targets

compiler/msgidx.inc

@@ -247,6 +247,8 @@ const
   parser_h_c_arrays_are_references=03187;
   parser_e_C_array_of_const_must_be_last=03188;
   parser_h_type_redef=03189;
+  parser_w_cdecl_has_no_high=03190;
+  parser_w_cdecl_no_openstring=03191;
   type_e_mismatch=04000;
   type_e_incompatible_types=04001;
   type_e_not_equal_types=04002;
@@ -602,9 +604,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 33983;
+  MsgTxtSize = 34092;
 
   MsgIdxMax : array[1..20] of longint=(
-    17,62,190,50,56,44,98,19,35,43,
+    17,62,192,50,56,44,98,19,35,43,
     40,1,1,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000141] of string[240]=(
+const msgtxt : array[0..000142] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000141,1..240] of char=(
+const msgtxt : array[0..000142,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -278,553 +278,553 @@ const msgtxt : array[0..000141,1..240] of char=(
   '03187_H_C arrays are passed by reference'#000+
   '03188_E_C array of const must be the last argument'#000+
   '03189_H_Type "$1" redefinition'#000+
+  '03190_W_cdecl'#039'ared functions have no high parame','ter'#000+
+  '03191_W_cdecl'#039'ared functions do not support open strings'#000+
   '04000_E_Type mismatch'#000+
-  '04001_E_Incompatible types',': got "$1" expected "$2"'#000+
+  '04001_E_Incompatible types: got "$1" expected "$2"'#000+
   '04002_E_Type mismatch between "$1" and "$2"'#000+
   '04003_E_Type identifier expected'#000+
-  '04004_E_Variable identifier expected'#000+
+  '04004_E_Variable identifier e','xpected'#000+
   '04005_E_Integer expression expected, but got "$1"'#000+
   '04006_E_Boolean expression expected, but got "$1"'#000+
-  '0','4007_E_Ordinal expression expected'#000+
+  '04007_E_Ordinal expression expected'#000+
   '04008_E_pointer type expected, but got "$1"'#000+
   '04009_E_class type expected, but got "$1"'#000+
-  '04011_E_Can'#039't evaluate constant expression'#000+
+  '04011_E_Ca','n'#039't evaluate constant expression'#000+
   '04012_E_Set elements are not compatible'#000+
-  '04013_E_Operation not implemented fo','r sets'#000+
+  '04013_E_Operation not implemented for sets'#000+
   '04014_W_Automatic type conversion from floating type to COMP which is '+
   'an integer type'#000+
-  '04015_H_use DIV instead to get an integer result'#000+
+  '04015_H_use DIV instead to get an inte','ger result'#000+
   '04016_E_string types doesn'#039't match, because of $V+ mode'#000+
-  '04017_E_succ or pred on enums with assignm','ents not possible'#000+
+  '04017_E_succ or pred on enums with assignments not possible'#000+
   '04018_E_Can'#039't read or write variables of this type'#000+
   '04019_E_Can'#039't use readln or writeln on typed file'#000+
-  '04020_E_Can'#039't use read or write on untyped file.'#000+
+  '04020_E_Can'#039,'t use read or write on untyped file.'#000+
   '04021_E_Type conflict between set elements'#000+
-  '04022_W_lo/hi(dword/qword) re','turns the upper/lower word/dword'#000+
+  '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
   '04023_E_Integer or real expression expected'#000+
   '04024_E_Wrong type "$1" in array constructor'#000+
-  '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+
-  '04026_E_Method (variable) and Procedure (variable) a','re not compatibl'+
-  'e'#000+
+  '04025_E_I','ncompatible type for arg no. $1: Got "$2", expected "$3"'#000+
+  '04026_E_Method (variable) and Procedure (variable) are not compatible'#000+
   '04027_E_Illegal constant passed to internal math function'#000+
   '04028_E_Can'#039't get the address of constants'#000+
-  '04029_E_Argument can'#039't be assigned to'#000+
+  '04029_E_Argu','ment can'#039't be assigned to'#000+
   '04030_E_Can'#039't assign local procedure/function to procedure variabl'+
   'e'#000+
-  '04031_E_Can'#039't a','ssign values to an address'#000+
+  '04031_E_Can'#039't assign values to an address'#000+
   '04032_E_Can'#039't assign values to const variable'#000+
   '04033_E_Array type required'#000+
-  '04034_E_interface type expected, but got "$1"'#000+
+  '04034_E_interface type expecte','d, but got "$1"'#000+
   '04035_W_Mixing signed expressions and longwords gives a 64bit result'#000+
-  '04036_W_Mixing signed ex','pressions and cardinals here may cause a ran'+
-  'ge check error'#000+
+  '04036_W_Mixing signed expressions and cardinals here may cause a range'+
+  ' check error'#000+
   '04037_E_Typecast has different size ($1 -> $2) in assignment'#000+
-  '04038_E_enums with assignments can'#039't be used as array index'#000+
-  '04039_E_Class or Object types "$1" and "$2" are not related'#000,
+  '04038_E_enu','ms with assignments can'#039't be used as array index'#000+
+  '04039_E_Class or Object types "$1" and "$2" are not related'#000+
   '04040_W_Class types "$1" and "$2" are not related'#000+
   '04041_E_Class or interface type expected, but got "$1"'#000+
-  '04042_E_Type "$1" is not completley defined'#000+
+  '04042_E_Type "$1" is not c','ompletley defined'#000+
   '04043_W_String literal has more characters than short string length'#000+
-  '04044_W_Comparison is a','lways false due to range of values'#000+
+  '04044_W_Comparison is always false due to range of values'#000+
   '04045_W_Comparison is always true due to range of values'#000+
-  '04046_W_Constructing a class "$1" with abstract method "$2"'#000+
+  '04046_W_Constructing a class "$1" with ','abstract method "$2"'#000+
   '04047_H_The left operand of the IN operator should be byte sized'#000+
-  '04048_W_Type size misma','tch, possible loss of data / range check erro'+
-  'r'#000+
+  '04048_W_Type size mismatch, possible loss of data / range check error'#000+
   '04049_H_Type size mismatch, possible loss of data / range check error'#000+
-  '05000_E_Identifier not found "$1"'#000+
+  '05000_E_Identi','fier not found "$1"'#000+
   '05001_F_Internal Error in SymTableStack()'#000+
   '05002_E_Duplicate identifier "$1"'#000+
-  '05003_H_Ident','ifier already defined in $1 at line $2'#000+
+  '05003_H_Identifier already defined in $1 at line $2'#000+
   '05004_E_Unknown identifier "$1"'#000+
   '05005_E_Forward declaration not solved "$1"'#000+
-  '05007_E_Error in type definition'#000+
+  '05007_E_Error in',' type definition'#000+
   '05009_E_Forward type not resolved "$1"'#000+
-  '05010_E_Only static variables can be used in static m','ethods or outsi'+
-  'de methods'#000+
+  '05010_E_Only static variables can be used in static methods or outside'+
+  ' methods'#000+
   '05012_F_record or class type expected'#000+
-  '05013_E_Instances of classes or objects with an abstract method are no'+
-  't allowed'#000+
+  '05013_E_Instances of classes or objects with an abstract method are',' '+
+  'not allowed'#000+
   '05014_W_Label not defined "$1"'#000+
   '05015_E_Label used but not defined "$1"'#000+
-  '05016_E_Illegal label dec','laration'#000+
+  '05016_E_Illegal label declaration'#000+
   '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
   '05018_E_Label not found'#000+
   '05019_E_identifier isn'#039't a label'#000+
-  '05020_E_label already defined'#000+
+  '05020_E','_label already defined'#000+
   '05021_E_illegal type declaration of set elements'#000+
-  '05022_E_Forward class definition not ','resolved "$1"'#000+
+  '05022_E_Forward class definition not resolved "$1"'#000+
   '05023_H_Unit "$1" not used in $2'#000+
   '05024_H_Parameter "$1" not used'#000+
   '05025_N_Local variable "$1" not used'#000+
-  '05026_H_Value parameter "$1" is assigned but never used'#000+
+  '05026_H_Value p','arameter "$1" is assigned but never used'#000+
   '05027_N_Local variable "$1" is assigned but never used'#000+
-  '05028_H_Local',' $1 "$2" is not used'#000+
+  '05028_H_Local $1 "$2" is not used'#000+
   '05029_N_Private field "$1.$2" is never used'#000+
   '05030_N_Private field "$1.$2" is assigned but never used'#000+
-  '05031_N_Private method "$1.$2" never used'#000+
+  '05031_N_P','rivate method "$1.$2" never used'#000+
   '05032_E_Set type expected'#000+
   '05033_W_Function result does not seem to be set'#000+
-  '05','034_W_Type "$1" is not aligned correctly in current record for C'#000+
+  '05034_W_Type "$1" is not aligned correctly in current record for C'#000+
   '05035_E_Unknown record field identifier "$1"'#000+
-  '05036_W_Local variable "$1" does not seem to be initialized'#000+
+  '05036_W_Local variabl','e "$1" does not seem to be initialized'#000+
   '05037_W_Variable "$1" does not seem to be initialized'#000+
-  '05038_E_identifi','er idents no member "$1"'#000+
+  '05038_E_identifier idents no member "$1"'#000+
   '05039_B_Found declaration: $1'#000+
   '05040_E_Data element too large'#000+
-  '05042_E_No matching implementation for interface method "$1" found'#000+
+  '05042_E_No matching implementation for interf','ace method "$1" found'#000+
   '05043_W_Symbol "$1" is deprecated'#000+
   '05044_W_Symbol "$1" is not portable'#000+
-  '05055_W_Symbol "$','1" is not implemented'#000+
+  '05055_W_Symbol "$1" is not implemented'#000+
   '06000_E_BREAK not allowed'#000+
   '06001_E_CONTINUE not allowed'#000+
-  '06002_E_Expression too complicated - FPU stack overflow'#000+
+  '06002_E_Expression too complicated - FPU stack overflo','w'#000+
   '06003_E_Illegal expression'#000+
   '06004_E_Invalid integer expression'#000+
   '06005_E_Illegal qualifier'#000+
-  '06006_E_High range ','limit < low range limit'#000+
+  '06006_E_High range limit < low range limit'#000+
   '06007_E_Illegal counter variable'#000+
   '06008_E_Can'#039't determine which overloaded function to call'#000+
-  '06009_E_Parameter list size exceeds 65535 bytes'#000+
+  '06009_E_Paramete','r list size exceeds 65535 bytes'#000+
   '06010_E_Illegal type conversion'#000+
-  '06011_H_Conversion between ordinals and point','ers is not portable'#000+
+  '06011_H_Conversion between ordinals and pointers is not portable'#000+
   '06012_E_File types must be var parameters'#000+
   '06013_E_The use of a far pointer isn'#039't allowed there'#000+
-  '06014_E_illegal call by reference parameters'#000+
+  '06014_E_illegal ','call by reference parameters'#000+
   '06015_E_EXPORT declared functions can'#039't be called'#000+
-  '06016_W_Possible illegal call ','of constructor or destructor'#000+
+  '06016_W_Possible illegal call of constructor or destructor'#000+
   '06017_N_Inefficient code'#000+
   '06018_W_unreachable code'#000+
   '06020_E_Abstract methods can'#039't be called directly'#000+
-  '06027_D_Register $1 weight $2 $3'#000+
+  '06','027_D_Register $1 weight $2 $3'#000+
   '06029_D_Stack frame is omitted'#000+
-  '06031_E_Object or class methods can'#039't be inline','.'#000+
+  '06031_E_Object or class methods can'#039't be inline.'#000+
   '06032_E_Procvar calls cannot be inline.'#000+
   '06033_E_No code for inline procedure stored'#000+
-  '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
-  'sed, use (set)length instead'#000+
-  '06037_E_Constructors or destructors can not be called insid','e a '#039'w'+
-  'ith'#039' clause'#000+
+  '06035_E_Element zero of an ansi/wide- or long','string can'#039't be acc'+
+  'essed, use (set)length instead'#000+
+  '06037_E_Constructors or destructors can not be called inside a '#039'wi'+
+  'th'#039' clause'#000+
   '06038_E_Cannot call message handler methods directly'#000+
   '06039_E_Jump in or outside of an exception block'#000+
-  '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
-  '06041_W_Parameters size exceeds limit for certain cpu'#039,'s'#000+
+  '06040_E_Con','trol flow statements aren'#039't allowed in a finally bloc'+
+  'k'#000+
+  '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+
   '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+
   '06043_E_Local variables size exceeds supported limit'#000+
-  '07000_D_Starting $1 styled assembler parsing'#000+
+  '07000_D_Starting ','$1 styled assembler parsing'#000+
   '07001_D_Finished $1 styled assembler parsing'#000+
-  '07002_E_Non-label pattern contains @',#000+
+  '07002_E_Non-label pattern contains @'#000+
   '07004_E_Error building record offset'#000+
   '07005_E_OFFSET used without identifier'#000+
   '07006_E_TYPE used without identifier'#000+
-  '07007_E_Cannot use local variable or parameters here'#000+
+  '07007_E_Cannot us','e local variable or parameters here'#000+
   '07008_E_need to use OFFSET here'#000+
   '07009_E_need to use $ here'#000+
-  '07010_E_Cannot',' use multiple relocatable symbols'#000+
+  '07010_E_Cannot use multiple relocatable symbols'#000+
   '07011_E_Relocatable symbol can only be added'#000+
   '07012_E_Invalid constant expression'#000+
-  '07013_E_Relocatable symbol is not allowed'#000+
+  '07013_E_Relocata','ble symbol is not allowed'#000+
   '07014_E_Invalid reference syntax'#000+
   '07015_E_You can not reach $1 from that code'#000+
-  '07016_','E_Local symbols/labels aren'#039't allowed as references'#000+
+  '07016_E_Local symbols/labels aren'#039't allowed as references'#000+
   '07017_E_Invalid base and index register usage'#000+
-  '07018_W_Possible error in object field handling'#000+
+  '07018_W_Possible error in object ','field handling'#000+
   '07019_E_Wrong scale factor specified'#000+
   '07020_E_Multiple index register usage'#000+
-  '07021_E_Invalid ope','rand type'#000+
+  '07021_E_Invalid operand type'#000+
   '07022_E_Invalid string as opcode operand: $1'#000+
   '07023_W_@CODE and @DATA not supported'#000+
-  '07024_E_Null label references are not allowed'#000+
+  '07024_E_Null label references are not ','allowed'#000+
   '07025_E_Divide by zero in asm evaluator'#000+
   '07026_E_Illegal expression'#000+
-  '07027_E_escape sequence ignored: $','1'#000+
+  '07027_E_escape sequence ignored: $1'#000+
   '07028_E_Invalid symbol reference'#000+
   '07029_W_Fwait can cause emulation problems with emu387'#000+
-  '07030_W_$1 without operand translated into $1P'#000+
+  '07030_W_$1 without operand translated int','o $1P'#000+
   '07031_W_ENTER instruction is not supported by Linux kernel'#000+
-  '07032_W_Calling an overload function in asse','mbler'#000+
+  '07032_W_Calling an overload function in assembler'#000+
   '07033_E_Unsupported symbol type for operand'#000+
   '07034_E_Constant value out of bounds'#000+
   '07035_E_Error converting decimal $1'#000+
-  '07036_E_Error converting octal $1'#000+
+  '07036_E_','Error converting octal $1'#000+
   '07037_E_Error converting binary $1'#000+
   '07038_E_Error converting hexadecimal $1'#000+
-  '07039_H_','$1 translated to $2'#000+
+  '07039_H_$1 translated to $2'#000+
   '07040_W_$1 is associated to an overloaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
-  '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
+  '07042_E_Cannot use ','OLDEBP outside a nested procedure'#000+
   '07043_W_Procedures can'#039't return any value in asm code'#000+
-  '07044_E_SEG not suppo','rted'#000+
+  '07044_E_SEG not supported'#000+
   '07045_E_Size suffix and destination or source size do not match'#000+
-  '07046_W_Size suffix and destination or source size do not match'#000+
+  '07046_W_Size suffix and destination or source size do not matc','h'#000+
   '07047_E_Assembler syntax error'#000+
   '07048_E_Invalid combination of opcode and operands'#000+
-  '07049_E_Assembler syntax ','error in operand'#000+
+  '07049_E_Assembler syntax error in operand'#000+
   '07050_E_Assembler syntax error in constant'#000+
   '07051_E_Invalid String expression'#000+
-  '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
+  '07052_W_constant with symbol $1 for a','ddress which is not on a pointe'+
+  'r'#000+
   '07053_E_Unrecognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#000+
-  '07055_E_Inv','alid combination of prefix and opcode: $1'#000+
+  '07055_E_Invalid combination of prefix and opcode: $1'#000+
   '07056_E_Invalid combination of override and opcode: $1'#000+
-  '07057_E_Too many operands on line'#000+
+  '07057_E_Too many operands on line'#000,
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
-  '07061_E_Undefined local symbol $1'#000,
+  '07061_E_Undefined local symbol $1'#000+
   '07062_E_Unknown label identifier $1'#000+
   '07063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
-  '07066_W_Modulo not supported'#000+
+  '07066_W_Modulo not s','upported'#000+
   '07067_E_Invalid floating point constant $1'#000+
   '07068_E_Invalid floating point expression'#000+
-  '07069_E_Wrong s','ymbol type'#000+
+  '07069_E_Wrong symbol type'#000+
   '07070_E_Cannot index a local var or parameter with a register'#000+
   '07071_E_Invalid segment override expression'#000+
-  '07072_W_Identifier $1 supposed external'#000+
+  '07072_W_Identi','fier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
   '07074_No type of variable specified'#000+
-  '07075_','E_assembler code not returned to text section'#000+
+  '07075_E_assembler code not returned to text section'#000+
   '07076_E_Not a directive or local symbol $1'#000+
-  '07077_E_Using a defined name as a local label'#000+
+  '07077_E_Using a defined name as a local la','bel'#000+
   '07078_E_Dollar token is used without an identifier'#000+
   '07079_W_32bit constant created for address'#000+
-  '07080_N_.al','ign is target specific, use .balign or .p2align'#000+
+  '07080_N_.align is target specific, use .balign or .p2align'#000+
   '07081_E_Can'#039't access fields directly for parameters'#000+
-  '07082_E_Can'#039't access fields of objects/classes directly'#000+
+  '07082_E_Can'#039't access fields of ','objects/classes directly'#000+
   '07083_E_No size specified and unable to determine the size of the oper'+
   'ands'#000+
-  '07084_E_C','annot use RESULT in this function'#000+
+  '07084_E_Cannot use RESULT in this function'#000+
   '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
-  '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
+  '07087_W_"$1 %st(n)" translated into ','"$1 %st,%st(n)"'#000+
   '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
   '07089_E_Char < not allowed here'#000+
-  '07090_E_C','har > not allowed here'#000+
+  '07090_E_Char > not allowed here'#000+
   '07093_W_ALIGN not supported'#000+
   '07094_E_Inc and Dec cannot be together'#000+
   '07095_E_Invalid reglist for movem'#000+
-  '07096_E_Reglist invalid for opcode'#000+
+  '07096_E','_Reglist invalid for opcode'#000+
   '07097_E_Higher cpu mode required ($1)'#000+
   '08000_F_Too many assembler files'#000+
-  '08001_F_Se','lected assembler output not supported'#000+
+  '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
   '08003_F_Direct not support for binary writers'#000+
-  '08004_E_Allocating of data is only allowed in bss section'#000+
+  '08004_E_Allocating o','f data is only allowed in bss section'#000+
   '08005_F_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
-  '0','8007_E_Asm: $1 invalid combination of opcode and operands'#000+
+  '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
   '08008_E_Asm: 16 Bit references not supported'#000+
-  '08009_E_Asm: Invalid effective address'#000+
+  '08009_E_Asm: Invalid effecti','ve address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
-  '08012_E_Asm: ','Short jump is out of range $1'#000+
+  '08012_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
   '08014_E_Asm: Comp type not supported for this target'#000+
-  '08015_E_Asm: Extended type not supported for this target'#000+
+  '08015_E_Asm: Ext','ended type not supported for this target'#000+
   '08016_E_Asm: Duplicate label $1'#000+
   '08017_E_Asm: Redefined label $1'#000+
-  '0801','8_E_Asm: First defined here'#000+
+  '08018_E_Asm: First defined here'#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
-  '09002_E_Can'#039't create assember file: $1'#000+
+  '09002_E_Can'#039't create assember fi','le: $1'#000+
   '09003_E_Can'#039't create object file: $1'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
-  '09005_E_Assembler $1 not fo','und, switching to external assembling'#000+
+  '09005_E_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_E_Error while assembling exitcode $1'#000+
-  '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
-  'ssembling'#000+
+  '09008_E_Can'#039't call the',' assembler, error $1 switching to external'+
+  ' assembling'#000+
   '09009_I_Assembling $1'#000+
-  '09010_I_Assembling with smartlink','ing $1'#000+
+  '09010_I_Assembling with smartlinking $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
   '09012_W_Library $1 not found, Linking may fail !'#000+
-  '09013_E_Error while linking'#000+
+  '09013_E_Error while linking',#000+
   '09014_E_Can'#039't call the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
-  '09016_E_Util $1 not found, s','witching to external linking'#000+
+  '09016_E_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
-  '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
+  '09019_E_Creation of Dynamic/Shared',' Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
-  '09021_E_resource compiler not found, switching to external',' mode'#000+
+  '09021_E_resource compiler not found, switching to external mode'#000+
   '09022_I_Compiling resource $1'#000+
   '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+
   'king'#000+
-  '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
-  #000+
-  '09025_T_unit $1 can'#039't be shared linked, switching to static linkin',
+  '09024_T_unit $1 can'#039't be',' smart linked, switching to static linki'+
+  'ng'#000+
+  '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
   'g'#000+
   '09026_E_unit $1 can'#039't be smart or static linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
-  '09028_F_Can'#039't post process executable $1'#000+
+  '09028_F_Can'#039't post process execu','table $1'#000+
   '09029_F_Can'#039't open executable $1'#000+
   '09030_X_Size of Code: $1 bytes'#000+
-  '09031_X_Size of initialized data: $1',' bytes'#000+
+  '09031_X_Size of initialized data: $1 bytes'#000+
   '09032_X_Size of uninitialized data: $1 bytes'#000+
   '09033_X_Stack space reserved: $1 bytes'#000+
   '09034_X_Stack space commited: $1 bytes'#000+
-  '10000_T_Unitsearch: $1'#000+
+  '1','0000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
-  '1','0005_U_PPU Time: $1'#000+
+  '10005_U_PPU Time: $1'#000+
   '10006_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
-  '10009_U_PPU is compiled for another processor'#000+
+  '1000','9_U_PPU is compiled for another processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
-  '10011_U_PPU Source: $1'#000,
+  '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
-  '10016_F_Invalid PPU-File entry: $1'#000+
+  '10016_F_Invalid P','PU-File entry: $1'#000+
   '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_F_','Circular unit reference between $1 and $2'#000+
+  '10020_F_Circular unit reference between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
   '10022_F_Can'#039't find unit $1'#000+
-  '10023_W_Unit $1 was not found but $2 exists'#000+
+  '10023_W_Un','it $1 was not found but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
-  '10025_W_Compiling the system unit req','uires the -Us switch'#000+
+  '10025_W_Compiling the system unit requires the -Us switch'#000+
   '10026_F_There were $1 errors compiling module, stopping'#000+
   '10027_U_Load from $1 ($2) unit $3'#000+
-  '10028_U_Recompiling $1, checksum changed for $2'#000+
+  '10028_U_Recompiling ','$1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
-  '10030_U_Recompiling unit, static lib is',' older than ppufile'#000+
+  '10030_U_Recompiling unit, static lib is older than ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
+  '10032_U_Recompiling unit, obj and asm are older than',' ppufile'#000+
   '10033_U_Recompiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
-  '10035_U_Parsing impl','ementation of $1'#000+
+  '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '10038_H_Conditional $1 was not set at startup in last compilation of $'+
-  '2'#000+
+  '10038_H_Conditional $1 was not set at startup in',' last compilation of'+
+  ' $2'#000+
   '10039_H_Conditional $1 was set at startup in last compilation of $2'#000+
-  '10040_W_Can'#039't rec','ompile unit $1, but found modifed include files'+
-  #000+
+  '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
   '10041_H_File $1 is newer than Release PPU file $2'#000+
-  '10042_U_Using a unit which was not compiled with correct FPU mode'#000+
+  '10042_U_Using a unit which was no','t compiled with correct FPU mode'#000+
   '11000_$1 [options] <inputfile> [options]'#000+
-  '11001_W_Only one source file suppor','ted'#000+
+  '11001_W_Only one source file supported'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
   '11003_E_nested response files are not supported'#000+
-  '11004_F_No source file name in command line'#000+
+  '11004_F_No source file name in co','mmand line'#000+
   '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
-  '11007_H_-? writes help pages',#000+
+  '11007_H_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
   '11010_D_Reading further options from $1'#000+
-  '11011_W_Target is already set to: $1'#000+
+  '11011_W_Target is alre','ady set to: $1'#000+
   '11012_W_Shared libs not supported on DOS platform, reverting to static'+
   #000+
-  '11013_F_too many IF(N)D','EFs'#000+
+  '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
   '11015_F_open conditional at the end of the file'#000+
-  '11016_W_Debug information generation is not supported by this executab'+
-  'le'#000+
+  '11016_W_Debug information generation is not supported b','y this execut'+
+  'able'#000+
   '11017_H_Try recompiling with -dGDB'#000+
   '11018_E_You are using the obsolete switch $1'#000+
-  '11019_E_You',' are using the obsolete switch $1, please use $2'#000+
+  '11019_E_You are using the obsolete switch $1, please use $2'#000+
   '11020_N_Switching assembler to default source writing assembler'#000+
-  '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
+  '11021_W_Assembler ','output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
-  '11026_T_Reading options fr','om file $1'#000+
+  '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
   '11029__*** press enter ***'#000+
-  '11030_H_Start of reading config file $1'#000+
+  '11030_H_Start of rea','ding config file $1'#000+
   '11031_H_End of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
-  '11036_D_interpreti','ng firstpass option "$1"'#000+
+  '11036_D_interpreting firstpass option "$1"'#000+
   '11033_D_interpreting file option "$1"'#000+
   '11034_D_Reading config file "$1"'#000+
-  '11035_D_found source file name "$1"'#000+
+  '11035_D_found source file name "$1"',#000+
   '11037_D_Defining symbol $1'#000+
   '11038_D_Undefining symbol $1'#000+
   '11039_E_Unknown code page'#000+
-  '11023_Free Pascal Compiler',' version $FPCVER [$FPCDATE] for $FPCTARGET'+
-  #010+
+  '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+
   'Copyright (c) 1993-2002 by Florian Klaempfl'#000+
   '11024_Free Pascal Compiler version $FPCVER'#010+
-  #010+
+  #010,
   'Compiler Date  : $FPCDATE'#010+
   'Compiler Target: $FPCTARGET'#010+
   #010+
   'Supported targets:'#010+
   '  $OSTARGETS'#010+
   #010+
-  'This program comes un','der the GNU General Public Licence'#010+
+  'This program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.FPC'#010+
   #010+
   'Report bugs,suggestions etc to:'#010+
-  '                 [email protected]'#000+
+  '                 bugrep@f','reepascal.org'#000+
   '11025_**0*_put + after a boolean switch option to enable it, - to disa'+
   'ble it'#010+
-  '**1a_the compiler ','doesn'#039't delete the generated assembler file'#010+
+  '**1a_the compiler doesn'#039't delete the generated assembler file'#010+
   '**2al_list sourcecode lines in assembler file'#010+
-  '**2ar_list register allocation/release info in assembler file'#010+
+  '**2ar_list register allocation/release in','fo in assembler file'#010+
   '**2at_list temp allocation/release info in assembler file'#010+
   '**1b_generate browser info'#010+
-  '**2','bl_generate local symbol info'#010+
+  '**2bl_generate local symbol info'#010+
   '**1B_build all modules'#010+
   '**1C<x>_code generation options:'#010+
-  '**2CD_create also dynamic library (not supported)'#010+
+  '**2CD_create also dynamic library (not suppor','ted)'#010+
   '**2Ce_Compilation with emulated floating point opcodes'#010+
-  '**2Ch<n>_<n> bytes heap (between 1023 and 6710784','0)'#010+
+  '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_omit linking stage'#010+
   '**2Co_check overflow of integer operations'#010+
   '**2Cr_range checking'#010+
-  '**2CR_verify object method call validity'#010+
+  '**2CR_verify object m','ethod call validity'#010+
   '**2Cs<n>_set stack size to <n>'#010+
   '**2Ct_stack checking'#010+
-  '**2CX_create also smartlinked library',#010+
+  '**2CX_create also smartlinked library'#010+
   '**1d<x>_defines the symbol <x>'#010+
   '*O1D_generate a DEF file'#010+
   '*O2Dd<x>_set description to <x>'#010+
   '*O2Dw_PM application'#010+
-  '**1e<x>_set path to executable'#010+
+  '**1e<x>_set path to e','xecutable'#010+
   '**1E_same as -Cn'#010+
   '**1F<x>_set file names and paths:'#010+
-  '**2FD<x>_sets the directory where to search for ','compiler utilities'#010+
+  '**2FD<x>_sets the directory where to search for compiler utilities'#010+
   '**2Fe<x>_redirect error output to <x>'#010+
   '**2FE<x>_set exe/unit output path to <x>'#010+
-  '**2Fi<x>_adds <x> to include path'#010+
+  '**2Fi<x>_adds <x> to include path',#010+
   '**2Fl<x>_adds <x> to library path'#010+
   '*L2FL<x>_uses <x> as dynamic linker'#010+
   '**2Fo<x>_adds <x> to object path'#010+
-  '**2Fr','<x>_load error message file <x>'#010+
+  '**2Fr<x>_load error message file <x>'#010+
   '**2Fu<x>_adds <x> to unit path'#010+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
-  '*g1g_generate debugger information:'#010+
+  '*g1g_generate de','bugger information:'#010+
   '*g2gg_use gsym'#010+
   '*g2gd_use dbx'#010+
   '*g2gh_use heap trace unit (for memory leak debugging)'#010+
-  '*g2gl_','use line info unit to show more info for backtraces'#010+
+  '*g2gl_use line info unit to show more info for backtraces'#010+
   '*g2gc_generate checks for pointers'#010+
   '**1i_information'#010+
-  '**2iD_return compiler date'#010+
+  '**2iD_return compiler date'#010,
   '**2iV_return compiler version'#010+
   '**2iSO_return compiler OS'#010+
   '**2iSP_return compiler processor'#010+
-  '**2iTO_return target',' OS'#010+
+  '**2iTO_return target OS'#010+
   '**2iTP_return target processor'#010+
   '**1I<x>_adds <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#010+
-  '**1n_don'#039't read the default config file'#010+
+  '**1n_don'#039't read ','the default config file'#010+
   '**1o<x>_change the name of the executable produced to <x>'#010+
-  '**1pg_generate profile code',' for gprof (defines FPC_PROFILE)'#010+
+  '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
   '*L1P_use pipes instead of creating temporary assembler files'#010+
   '**1S<x>_syntax options:'#010+
-  '**2S2_switch some Delphi 2 extensions on'#010+
+  '**2S2_switch ','some Delphi 2 extensions on'#010+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
-  '*','*2Sd_tries to be Delphi compatible'#010+
+  '**2Sd_tries to be Delphi compatible'#010+
   '**2Se<x>_compiler stops after the <x> errors (default is 1)'#010+
   '**2Sg_allow LABEL and GOTO'#010+
-  '**2Sh_Use ansistrings'#010+
+  '**2Sh_Use',' ansistrings'#010+
   '**2Si_support C++ styled INLINE'#010+
   '**2Sm_support macros like C (global)'#010+
-  '**2So_tries to be TP/BP 7.0',' compatible'#010+
+  '**2So_tries to be TP/BP 7.0 compatible'#010+
   '**2Sp_tries to be gpc compatible'#010+
   '**2Ss_constructor name must be init (destructor must be done)'#010+
-  '**2St_allow static keyword in objects'#010+
+  '**2St_allow static keywo','rd in objects'#010+
   '**1s_don'#039't call assembler and linker (only with -a)'#010+
   '**2st_Generate script to link on target'#010+
-  '**2','sh_Generate script to link on host'#010+
+  '**2sh_Generate script to link on host'#010+
   '**1u<x>_undefines the symbol <x>'#010+
   '**1U_unit options:'#010+
   '**2Un_don'#039't check the unit name'#010+
-  '**2Ur_generate release unit files'#010+
+  '**2Ur_genera','te release unit files'#010+
   '**2Us_compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combination of the following l','etters:'#010+
+  '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
   '**2*_e : Show errors (default)       d : Show debug info'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
-  '**2*_n : Show notes                  t : Show tried/used files'#010+
-  '**2*_h : Show hints                  m : Show defined ma','cros'#010+
+  '**2*_n : S','how notes                  t : Show tried/used files'#010+
+  '**2*_h : Show hints                  m : Show defined macros'#010+
   '**2*_i : Show general info           p : Show compiled procedures'#010+
   '**2*_l : Show linenumbers            c : Show conditionals'#010+
-  '**2*_a : Show everything             0 : Show nothing (except errors)'#010+
-  '**2*_b : Show all procedure          r :',' Rhide/GCC compatibility mod'+
-  'e'#010+
+  '*','*2*_a : Show everything             0 : Show nothing (except errors'+
+  ')'#010+
+  '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#010+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#010+
   '**2*_    occurs'#010+
-  '**1V_write fpcdebug.txt file with lots of debugging info'#010+
+  '**1V_write fpcd','ebug.txt file with lots of debugging info'#010+
   '**1X_executable options:'#010+
   '*L2Xc_link with the c library'#010+
-  '**2Xs_strip ','all symbols from executable'#010+
+  '**2Xs_strip all symbols from executable'#010+
   '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
-  '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#010+
+  '**2XS_try to link static (default) (defin','es FPC_LINK_STATIC)'#010+
   '**2XX_try to link smart            (defines FPC_LINK_SMART)'#010+
-  '**0*_Processor specific optio','ns:'#010+
+  '**0*_Processor specific options:'#010+
   '3*1A<x>_output format:'#010+
   '3*2Aas_assemble using GNU AS'#010+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
-  '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
+  '3*2Anasmelf_elf32 (Linux) file u','sing Nasm'#010+
   '3*2Anasmobj_obj file using Nasm'#010+
   '3*2Amasm_obj file using Masm (Microsoft)'#010+
-  '3*2Atasm_obj file using Ta','sm (Borland)'#010+
+  '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Acoff_coff (Go32v2) using internal writer'#010+
   '3*2Apecoff_pecoff (Win32) using internal writer'#010+
-  '3*1R<x>_assembler reading style:'#010+
+  '3*1R<x>_assembler reading',' style:'#010+
   '3*2Ratt_read AT&T style assembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
-  '3*2Rdirect_copy assembler text',' directly to assembler file'#010+
+  '3*2Rdirect_copy assembler text directly to assembler file'#010+
   '3*1O<x>_optimizations:'#010+
   '3*2Og_generate smaller code'#010+
   '3*2OG_generate faster code (default)'#010+
-  '3*2Or_keep certain variables in registers'#010+
+  '3*2Or_keep cert','ain variables in registers'#010+
   '3*2Ou_enable uncertain optimizations (see docs)'#010+
-  '3*2O1_level 1 optimizations (quick',' optimizations)'#010+
+  '3*2O1_level 1 optimizations (quick optimizations)'#010+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
-  '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+
+  '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010,
   '3*2Op<x>_target processor:'#010+
   '3*3Op1_set target processor to 386/486'#010+
-  '3*3Op2_set target processor to Pentium/Pent','iumMMX (tm)'#010+
+  '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
   '3*1T<x>_Target operating system:'#010+
-  '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+
+  '3*2TGO32V2_version 2 of DJ Delor','ie DOS extender'#010+
   '3*2TWDOSX DOS 32 Bit Extender'#010+
   '3*2TLINUX_Linux'#010+
-  '3*2Tnetware_Novell Netware Module (experimental',')'#010+
+  '3*2Tnetware_Novell Netware Module (experimental)'#010+
   '3*2TOS2_OS/2 2.x'#010+
   '3*2TSUNOS_SunOS/Solaris'#010+
   '3*2TWin32_Windows 32 Bit'#010+
   '3*1W<x>_Win32 target options'#010+
-  '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
+  '3*2WB<x>_Set Image base to Hexadec','imal <x> value'#010+
   '3*2WC_Specify console type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
-  '3*2','WF_Specify full-screen type application (OS/2 only)'#010+
+  '3*2WF_Specify full-screen type application (OS/2 only)'#010+
   '3*2WG_Specify graphic type application'#010+
-  '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
+  '3*2WN_Do not generate relocation code (n','ecessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   '6*1A<x>_output format'#010+
-  '6*2Aas_Unix o-file using GNU AS'#010,
+  '6*2Aas_Unix o-file using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   '6*1O_optimizations:'#010+
-  '6*2Oa_turn on the optimizer'#010+
+  '6*2Oa_turn on t','he optimizer'#010+
   '6*2Og_generate smaller code'#010+
   '6*2OG_generate faster code (default)'#010+
-  '6*2Ox_optimize maximum (still B','UGGY!!!)'#010+
+  '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
   '6*2O0_set target processor to a MC68000'#010+
   '6*2O2_set target processor to a MC68020+ (default)'#010+
-  '6*1R<x>_assembler reading style:'#010+
+  '6*1R<x>_assembler reading style',':'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '6*1T<x>_Target operating system:'#010+
   '6*2TAMIGA_Commodore Amiga'#010+
-  '6*2TATARI_','Atari ST/STe/TT'#010+
+  '6*2TATARI_Atari ST/STe/TT'#010+
   '6*2TMACOS_Macintosh m68k'#010+
   '6*2TLINUX_Linux-68k'#010+
   '6*2TPALMOS_PalmOS'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+
-  '**1h_shows this help without waiting'#000
+  '**1h_shows this help with','out waiting'#000
 );

compiler/ncal.pas

@@ -2546,6 +2546,11 @@ type
                  end;
                end;
            end;
+{$ifdef m68k}
+         { we need one more address register for virtual calls on m68k }
+         if (po_virtualmethod in procdefinition.procoptions) then
+           inc(registers32);
+{$endif m68k}
          { a fpu can be used in any procedure !! }
 {$ifdef i386}
          registersfpu:=procdefinition.fpu_used;
@@ -2840,7 +2845,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.114  2002-12-06 16:56:58  peter
+  Revision 1.115  2002-12-06 17:51:10  peter
+    * merged cdecl and array fixes
+
+  Revision 1.114  2002/12/06 16:56:58  peter
     * only compile cs_fp_emulation support when cpufpuemu is defined
     * define cpufpuemu for m68k only
 

compiler/pdecsub.pas

@@ -105,15 +105,25 @@ implementation
          begin
            if assigned(vartype.def) and
               (vartype.def.deftype=arraydef) and
-              not is_special_array(vartype.def) then
+              {not is_array_constructor(vartype.def) and}
+              not is_variant_array(vartype.def) and
+              not is_array_of_const(vartype.def) then
             begin
               if (varspez<>vs_var) then
                 Message(parser_h_c_arrays_are_references);
               varspez:=vs_var;
             end;
            if assigned(vartype.def) and
-              is_array_of_const(vartype.def) then
+              (is_array_of_const(vartype.def) or
+               is_open_array(vartype.def) or
+               is_shortstring(vartype.def)) then
             begin
+              if is_open_string(vartype.def) then
+                begin
+                  { change type to normal short string }
+                  Message(parser_w_cdecl_no_openstring);
+                  vartype:=cshortstringtype;
+                end;
               if assigned(indexnext) and
                  (tsym(indexnext).typ=varsym) and
                  (copy(tvarsym(indexnext).name,1,4)='high') then
@@ -121,13 +131,18 @@ implementation
                  { removing it is to complicated,
                    we just hide it PM }
                  highname:='hidden'+copy(tvarsym(indexnext).name,5,high(name));
+                 Message(parser_w_cdecl_has_no_high);
                  owner.rename(tvarsym(indexnext).name,highname);
-                 if assigned(indexnext.indexnext) then
+                 if is_array_of_const(vartype.def) and
+                    assigned(indexnext.indexnext) then
                    Message(parser_e_C_array_of_const_must_be_last);
                end
               else
-               if assigned(indexnext) then
-                Message(parser_e_C_array_of_const_must_be_last);
+               begin
+                 if is_array_of_const(vartype.def) and
+                    assigned(indexnext) then
+                   Message(parser_e_C_array_of_const_must_be_last);
+               end;
             end;
          end;
       end;
@@ -1676,7 +1691,8 @@ const
               ps:=tsym(st.symindex.first);
               while assigned(ps.indexnext) and (tsym(ps.indexnext)<>lastps) do
                 ps:=tsym(ps.indexnext);
-              if ps.typ=varsym then
+              if (ps.typ=varsym) and
+                 (copy(ps.name,1,6)<>'hidden') then
                begin
                  { Wait with inserting the high value, it needs to be inserted
                    after the corresponding parameter }
@@ -2058,7 +2074,10 @@ const
 end.
 {
   $Log$
-  Revision 1.85  2002-12-01 22:06:14  carl
+  Revision 1.86  2002-12-06 17:51:10  peter
+    * merged cdecl and array fixes
+
+  Revision 1.85  2002/12/01 22:06:14  carl
     * cleanup of error messages
 
   Revision 1.84  2002/11/29 22:31:19  carl

compiler/symsym.pas

@@ -1737,6 +1737,9 @@ implementation
     procedure tvarsym.concatstabto(asmlist : taasmoutput);
       var stab_str : pchar;
       begin
+         if (owner.symtabletype in [parasymtable,inlineparasymtable]) and
+            (copy(name,1,6)='hidden') then
+           exit;
          inherited concatstabto(asmlist);
       if (owner.symtabletype=parasymtable) and
          (reg<>R_NO) then
@@ -2457,7 +2460,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.79  2002-11-27 20:04:10  peter
+  Revision 1.80  2002-12-06 17:51:11  peter
+    * merged cdecl and array fixes
+
+  Revision 1.79  2002/11/27 20:04:10  peter
     * tvarsym.get_push_size replaced by paramanager.push_size
 
   Revision 1.78  2002/11/27 02:34:20  peter

compiler/symtable.pas

@@ -716,6 +716,7 @@ implementation
            { also don't claim for high param of open parameters (PM) }
            if (Errorcount<>0) or
               (copy(p.name,1,3)='val') or
+              (copy(p.name,1,6)='hidden') or
               (copy(p.name,1,4)='high') then
              exit;
            if (tvarsym(p).refs=0) then
@@ -2337,7 +2338,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.83  2002-11-30 11:12:48  carl
+  Revision 1.84  2002-12-06 17:51:11  peter
+    * merged cdecl and array fixes
+
+  Revision 1.83  2002/11/30 11:12:48  carl
     + checking for symbols used with hint directives is done mostly in pexpr
       only now
 

compiler/utils/gppc386.pp

@@ -120,6 +120,9 @@ begin
   Close(fpcgdbini);
 
   Exec(fsearch(GDBExeName,GetEnv('PATH')),
+{$ifdef win32}
+    '--nw '+
+{$endif win32}
     '--nx --quiet --command='+GDBIniTempName+' '+CompilerName);
   GDBError:=DosError;
   GDBExitCode:=DosExitCode;
@@ -140,7 +143,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.4  2002-06-02 09:44:17  marco
+  Revision 1.5  2002-12-06 17:51:11  peter
+    * merged cdecl and array fixes
+
+  Revision 1.4  2002/06/02 09:44:17  marco
    * linux
 
   Revision 1.3  2002/05/18 13:34:27  peter