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

* moved type conversion of C varargs from tcallnode to

Browse Source 
tarrayconstructornode.inset_typeconvs() and fixed them:
    * integers < 32 bit are converted to 32 bit (this was previously
      done in the code generator for some targets, and not for others)
    * currency is also converted to double for targets where currency = int64
    * single is converted to double, except for x86_64 (is at least
      necessary on darwin/ppc, darwin/i386 and linux/i386)
    * enums are converted to 32 bit ints
    * procvars are converted to pointers
    * proper errors are given for various unsupported types
   NOTE: in C, floating point constants are by default double, while in
    FPC they are of type extended. On platforms where extended <> double,
    such constants when passed to C varargs are automatically converted
    to double by default (gives warning). If you want to pass them as
    single or extended or get rid of the warning, use an explicit typecast
  * increased ppu version because of introduction of new node flag
    (nf_cvarargs for tarrayconstructornode)
  * fixed tests/test/cg/tprintf
  * changed tests/test/cg/cdecl/taoc5 to use explicit typecasts for
    floating point constants passed to C varargs functions.

git-svn-id: trunk@2949 -
This commit is contained in:
Jonas Maebe 2006-03-17 22:26:48 +00:00
parent ab8f96f4cf
commit 4db6e1ddb8
10 changed files with 322 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/msg/errore.msg
View File

@ -1263,6 +1263,11 @@ type_e_cant_choose_overload_function=04057_E_Can't determine which overloaded fu
type_e_illegal_count_var=04058_E_Illegal counter variable
% The type of a \var{for} loop variable must be an ordinal type.
% Loop variables cannot be reals or strings.
type_w_double_c_varargs=04059_W_Converting constant real value to double for C variable argument, add explicit typecast to prevent this.
% In C, constant real values are double by default. For this reason, if you
% pass a constant real value to a variable argument part of a C function, FPC
% by default converts this constant to double as well. If you want to prevent
% this from happening, add an explicit typecast around the constant.
% \end{description}
#
# Symtable

5
compiler/msgidx.inc
View File

@ -349,6 +349,7 @@ const
type_w_pointer_to_longint_conv_not_portable=04056;
type_e_cant_choose_overload_function=04057;
type_e_illegal_count_var=04058;
type_w_double_c_varargs=04059;
sym_e_id_not_found=05000;
sym_f_internal_error_in_symtablestack=05001;
sym_e_duplicate_id=05002;
@ -672,9 +673,9 @@ const
option_info=11024;
option_help_pages=11025;
MsgTxtSize = 39607;
MsgTxtSize = 39720;
MsgIdxMax : array[1..20] of longint=(
19,75,219,59,62,47,100,22,135,60,
19,75,219,60,62,47,100,22,135,60,
41,1,1,1,1,1,1,1,1,1
);

410
compiler/msgtxt.inc
View File

@ -391,343 +391,345 @@ const msgtxt : array[0..000165,1..240] of char=(
'04056_W_Conversion between ordinals and',' pointers is not portable'#000+
'04057_E_Can'#039't determine which overloaded function to call'#000+
'04058_E_Illegal counter variable'#000+
'05000_E_Identifier not found "$1"'#000+
'04059_W_Converting constant real value to double for C variable argume'+
'nt, add explicit typecast to prevent this.'#000+
'05000_E_Id','entifier 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_Erro','r 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+
'050','20_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_Val','ue parameter "$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_Private 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 var','iable "$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_H_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 in','terface 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+
'05056_E_Can'#039't create unique type from this type'#000+
'05057_H_Local variable "$1" does not seem to be initialized'#000+
'05057_H_Local variable "$1" does not seem to be initializ','ed'#000+
'05058_H_Variable "$1" does not seem to be initialized'#000+
'05059_W_Function result variable does not seem to initia','lized'#000+
'05059_W_Function result variable does not seem to initialized'#000+
'05060_H_Function result variable does not seem to be initialized'#000+
'05061_W_Variable "$1" read but nowhere assigned'#000+
'06009_E_Parameter list size exceeds 65535 bytes'#000+
'06009_E_','Parameter list size exceeds 65535 bytes'#000+
'06012_E_File types must be var parameters'#000+
'06013_E_The use of a far pointe','r isn'#039't allowed there'#000+
'06013_E_The use of a far pointer isn'#039't allowed there'#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 destruc','tor'#000+
'06017_N_Inefficient code'#000+
'06018_W_unreachable code'#000+
'06020_E_Abstract methods can'#039't be called directly'#000+
'06027_DL_','Register $1 weight $2 $3'#000+
'06027_DL_Register $1 weight $2 $3'#000+
'06029_DL_Stack frame is omitted'#000+
'06031_E_Object or class methods can'#039't be inline.'#000+
'06032_E_Procvar calls cannot 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 longstrin','g can'#039't be acc'+
'essed, use (set)length instead'#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 inside a '#039'wi'+
'th'#039' clause'#000+
'06038_E_Cannot call message handler methods directly'#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 bloc'+
'k'#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+
'06042_W_Local variable size exceed limit for certain cpu'#039's'#000+
'06042_W_Local variabl','e size exceed limit for certain cpu'#039's'#000+
'06043_E_Local variables size exceeds supported limit'#000+
'06044_E_BREAK not allo','wed'#000+
'06044_E_BREAK not allowed'#000+
'06045_E_CONTINUE not allowed'#000+
'06046_F_Unknown compilerproc "$1". Check if you use the correct run ti'+
'me library.'#000+
'07000_DL_Starting $1 styled assembler parsing'#000+
'07000_DL_Sta','rting $1 styled assembler parsing'#000+
'07001_DL_Finished $1 styled assembler parsing'#000+
'07002_E_Non-label pattern contain','s @'#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_Ca','nnot use local variable or parameters here'#000+
'07008_E_need to use OFFSET here'#000+
'07009_E_need to use $ here'#000+
'07010_E_Can','not 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_R','elocatable symbol is not allowed'#000+
'07014_E_Invalid reference syntax'#000+
'07015_E_You can not reach $1 from that code'#000+
'070','16_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 ','operand 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 a','re 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 transla','ted into $1P'#000+
'07031_W_ENTER instruction is not supported by Linux kernel'#000+
'07032_W_Calling an overload function in a','ssembler'#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+
'0','7036_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_Cann','ot use OLDEBP outside a nested procedure'#000+
'07043_W_Procedures can'#039't return any value in asm code'#000+
'07044_E_SEG not su','pported'#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 n','ot match'#000+
'07047_E_Assembler syntax error'#000+
'07048_E_Invalid combination of opcode and operands'#000+
'07049_E_Assembler synt','ax 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 address which is not on a pointe'+
'r'#000+
'07053_E_Unrecognized opcode $1'#000+
'07054_E_Invalid or missing opcode'#000+
'07055_E_','Invalid 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 o','n 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_Modul','o not supported'#000+
'07067_E_Invalid floating point constant $1'#000+
'07068_E_Invalid floating point expression'#000+
'07069_E_Wron','g symbol 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','_Identifier $1 supposed external'#000+
'07073_E_Strings not allowed as constants'#000+
'07074_No type of variable specified'#000+
'070','75_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 l','ocal label'#000+
'07078_E_Dollar token is used without an identifier'#000+
'07079_W_32bit constant created for address'#000+
'07080_N_','.align 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 fie','lds of objects/classes directly'#000+
'07083_E_No size specified and unable to determine the size of the oper'+
'ands'#000+
'07084_','E_Cannot 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)" translate','d 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_Char > 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+
'07095_E_Invalid reglist for movem'#000,
'07096_E_Reglist invalid for opcode'#000+
'07097_E_Higher cpu mode required ($1)'#000+
'07098_W_No size specified and unable to ','determine the size of the op'+
'erands, using DWORD as default'#000+
'07098_W_No size specified and unable to determine the size of the oper'+
'ands, using DWORD as default'#000+
'07099_E_Syntax error while trying to parse a shifter operand'#000+
'08000_F_Too many assembler files'#000+
'08000_F','_Too many assembler files'#000+
'08001_F_Selected assembler output not supported'#000+
'08002_F_Comp not supported'#000+
'08003_F_Dire','ct not support for binary writers'#000+
'08003_F_Direct not support for binary writers'#000+
'08004_E_Allocating of 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','8006_E_Asm: Opcode $1 not in table'#000+
'08007_E_Asm: $1 invalid combination of opcode and operands'#000+
'08008_E_Asm: 16 Bit',' references not supported'#000+
'08008_E_Asm: 16 Bit references not supported'#000+
'08009_E_Asm: Invalid effective address'#000+
'08010_E_Asm: Immediate or reference expected'#000+
'08011_E_Asm: $1 value exceeds bounds $2'#000+
'08011_E_Asm: $1 v','alue exceeds bounds $2'#000+
'08012_E_Asm: Short jump is out of range $1'#000+
'08013_E_Asm: Undefined label $1'#000+
'08014_E_Asm: Co','mp type not supported for this target'#000+
'08014_E_Asm: Comp type not supported for this target'#000+
'08015_E_Asm: Extended type not supported for this target'#000+
'08016_E_Asm: Duplicate label $1'#000+
'08016_E_Asm: Duplicate label $1'#000,
'08017_E_Asm: Redefined label $1'#000+
'08018_E_Asm: First defined here'#000+
'08019_E_Asm: Invalid register $1'#000+
'08020_E_Asm: 16 ','or 32 Bit references not supported'#000+
'08020_E_Asm: 16 or 32 Bit references not supported'#000+
'08021_E_Asm: 64 Bit operands not supported'#000+
'09000_W_Source operating system redefined'#000+
'09001_I_Assembling (pipe) $1'#000+
'09001_I','_Assembling (pipe) $1'#000+
'09002_E_Can'#039't create assembler file: $1'#000+
'09003_E_Can'#039't create object file: $1'#000+
'09004_E_Can'#039't ','create archive file: $1'#000+
'09004_E_Can'#039't create archive file: $1'#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+
'09007_E_Er','ror while assembling exitcode $1'#000+
'09008_E_Can'#039't call the assembler, error $1 switching to external a'+
'ssembling'#000+
'0900','9_I_Assembling $1'#000+
'09009_I_Assembling $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+
'09012_W_Library $1 no','t found, Linking may fail !'#000+
'09013_E_Error while linking'#000+
'09014_E_Can'#039't call the linker, switching to external link','ing'#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, switching to external linking'#000+
'09017_T_Using util $1'#000+
'09018_E_Creation of Executables not supported'#000+
'09018_E_Creation of Execu','tables 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+
'09023_T_unit $1 can'#039't be statically link','ed, switching to smart l'+
'inking'#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 link'+
'ing'#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+
'09027_E_unit $1 can'#039't be s','hared or static linked'#000+
'09028_D_Calling resource compiler "$1" with "$2" as command line'#000+
'09128_F_Can'#039't post proces','s executable $1'#000+
'09128_F_Can'#039't post process executable $1'#000+
'09129_F_Can'#039't open executable $1'#000+
'09130_X_Size of Code: $1 bytes'#000+
'09131_X_Size of initialized data: $1 bytes'#000+
'09132_X_Size of uninitialized data: $1 bytes'#000+
'0913','2_X_Size of uninitialized data: $1 bytes'#000+
'09133_X_Stack space reserved: $1 bytes'#000+
'09134_X_Stack space committed: $1',' bytes'#000+
'09134_X_Stack space committed: $1 bytes'#000+
'10000_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+
'10005_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+
'10008_U_PPU Invalid Version $1'#000+
'10009_U_PPU is compiled for another processor'#000+
'10010_U_PPU is compiled for an other target'#000+
'10011_U_PPU Source: $1'#000+
'10012_U_Writing $1'#000+
'10012_U_Wr','iting $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_I','nvalid PPU-File entry: $1'#000+
'10016_F_Invalid PPU-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 u','nit 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+
'10','023_W_Unit $1 was not found but $2 exists'#000+
'10023_W_Unit $1 was not found but $2 exists'#000+
'10024_F_Unit $1 searched but $2 found'#000+
'10025_W_Compiling the system unit requires 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_Reco','mpiling $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 tha','n ppufile'#000+
'10031_U_Recompiling unit, shared lib is older than ppufile'#000+
'10032_U_Recompiling unit, obj and asm are ol','der 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 implementation 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+
'10040_W_Can'#039't recompile unit $1, but fou','nd 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 not compiled with cor','rect FPU mode'#000+
'10043_U_Loading interface units from $1'#000+
'10044_U_Loading implementation units from $1'#000+
'10045_U_Interf','ace CRC changed for unit $1'#000+
'10045_U_Interface CRC changed for unit $1'#000+
'10046_U_Implementation CRC changed for unit $1'#000+
'10047_U_Finished compiling unit $1'#000+
'10048_U_Add dependency of $1 to $2'#000+
'10048_U_Add depen','dency of $1 to $2'#000+
'10049_U_No reload, is caller: $1'#000+
'10050_U_No reload, already in second compile: $1'#000+
'10051_U_Flag ','for reload: $1'#000+
'10051_U_Flag for reload: $1'#000+
'10052_U_Forced reloading'#000+
'10053_U_Previous state of $1: $2'#000+
'10054_U_Already compiling $1, setting second compile'#000+
'10055_U_Loading unit $1'#000+
'1','0055_U_Loading unit $1'#000+
'10056_U_Finished loading unit $1'#000+
'10057_U_Registering new unit $1'#000+
'10058_U_Re-resolving unit',' $1'#000+
'10058_U_Re-resolving unit $1'#000+
'10059_U_Skipping re-resolving unit $1, still loading used units'#000+
'11000_O_$1 [options] <inputfile> [options]'#000+
'11001_W_Only one source file supported'#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 suppor','ted'#000+
'11003_E_nested response files are not supported'#000+
'11004_F_No source file name in command 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 o','ptions from $1'#000+
'11010_D_Reading further options from $1'#000+
'11011_W_Target is already set to: $1'#000+
'11012_W_Shared libs not supported on DOS platform, reverting to static'+
#000+
'11013_F_too many IF(N)DEFs'#000+
'1101','3_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 info','rmation generation is not supported by this execut'+
'able'#000+
'11016_W_Debug information generation is not supported by this executab'+
'le'#000+
'11017_H_Try recompiling with -dGDB'#000+
'11018_W_You are using the obsolete switch $1'#000+
'11018_W_You are using the obsolete sw','itch $1'#000+
'11019_W_You are using the obsolete switch $1, please use $2'#000+
'11020_N_Switching assembler to default source',' writing assembler'#000+
'11020_N_Switching assembler to default source writing assembler'#000+
'11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
'11022_W_"$1" assembler use forced'#000+
'11026_T_Reading options from 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+
'11029__*** press enter ***'#000+
'11030_H_Start of reading config file $1'#000+
'11031_H_End of reading config file $1'#000+
'11032_D_interpreting option "$1"'#000+
'11032_D_interpreting option "$1"',#000+
'11036_D_interpreting firstpass option "$1"'#000+
'11033_D_interpreting file option "$1"'#000+
'11034_D_Reading config file "$1','"'#000+
'11034_D_Reading config file "$1"'#000+
'11035_D_found source file name "$1"'#000+
'11039_E_Unknown code page'#000+
'11040_F_Config file $1 is a directory'#000+
'11023_Free Pascal Compiler version $FPCVERSION [$FPCDATE] for $FPCCPU'#010+
'11023_Free Pascal Compile','r version $FPCVERSION [$FPCDATE] for $FPCCP'+
'U'#010+
'Copyright (c) 1993-2005 by Florian Klaempfl'#000+
'11024_Free Pascal Compil','er version $FPCVERSION'#010+
'11024_Free Pascal Compiler version $FPCVERSION'#010+
#010+
'Compiler Date : $FPCDATE'#010+
'Compiler CPU Target: $FPCCPU'#010+
@ -735,237 +737,237 @@ const msgtxt : array[0..000165,1..240] of char=(
'Supported targets:'#010+
' $OSTARGETS'#010+
#010+
'Supported CPU instruction sets:'#010+
'Supported ','CPU instruction sets:'#010+
' $INSTRUCTIONSETS'#010+
#010+
'Supported FPU instruction sets:'#010+
' $FPUINSTRUCTIONSETS'#010+
#010+
'Supported Optimi','zations:'#010+
'Supported Optimizations:'#010+
' $OPTIMIZATIONS'#010+
#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+
'Repor','t bugs,suggestions etc to:'#010+
' bugrep@freepascal.org'#000+
'11025_**0*_put + after a boolean switch option ','to enable it, - to di'+
'sable it'#010+
'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+
'**2al_list sourcecode lines in assembler file'#010+
'**2al_list sourcecode lines in asse','mbler file'#010+
'**2an_list node info in assembler file'#010+
'*L2ap_use pipes instead of creating temporary assembler files'#010+
'*','*2ar_list register allocation/release info in assembler file'#010+
'**2ar_list register allocation/release info in assembler file'#010+
'**2at_list temp allocation/release info in assembler file'#010+
'**1A<x>_output format:'#010+
'**1A<x>_','output format:'#010+
'**2Adefault_use default assembler'#010+
'3*2Aas_assemble using GNU AS'#010+
'3*2Anasmcoff_coff (Go32v2) file usi','ng Nasm'#010+
'3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
'3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
'3*2Anasmwin32_Win32 object file using Nasm'#010+
'3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
'3*2Anasmwdosx_Win32/WDOSX object f','ile using Nasm'#010+
'3*2Awasm_obj file using Wasm (Watcom)'#010+
'3*2Anasmobj_obj file using Nasm'#010+
'3*2Amasm_obj file using Masm',' (Microsoft)'#010+
'3*2Amasm_obj file using Masm (Microsoft)'#010+
'3*2Atasm_obj file using Tasm (Borland)'#010+
'3*2Aelf_elf32 (Linux) using internal writer'#010+
'3*2Acoff_coff (Go32v2) using internal writer'#010+
'3*2Acoff_coff (Go32v2) using in','ternal writer'#010+
'3*2Apecoff_pecoff (Win32) using internal writer'#010+
'4*2Aas_assemble using GNU AS'#010+
'6*2Aas_Unix o-file usi','ng 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+
'A*2Aas_assemble using GNU AS'#010+
'A*2Aas_assemble using',' GNU AS'#010+
'P*2Aas_assemble using GNU AS'#010+
'S*2Aas_assemble using GNU AS'#010+
'**1b_generate browser info'#010+
'**2bl_generate local',' symbol info'#010+
'**2bl_generate local symbol info'#010+
'**1B_build all modules'#010+
'**1C<x>_code generation options:'#010+
'**2Cc<x>_set default calling convention to <x>'#010+
'**2CD_create also dynamic library (not supported)'#010+
'**2CD_creat','e also dynamic library (not supported)'#010+
'**2Ce_Compilation with emulated floating point opcodes'#010+
'**2Cf<x>_Select fpu',' instruction set to use, see fpc -i for possible '+
'values'#010+
'**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
'lues'#010+
'**2Cg_Generate PIC code'#010+
'**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
'**2Ch<n>_<n> bytes heap (between 1023 and 67107','840)'#010+
'**2Ci_IO-checking'#010+
'**2Cn_omit linking stage'#010+
'**2Co_check overflow of integer operations'#010+
'**2Cp<x>_select instru','ction set, see fpc -i for possible values'#010+
'**2Cp<x>_select instruction set, see fpc -i for possible values'#010+
'**2Cr_range checking'#010+
'**2CR_verify object method call validity'#010+
'**2Cs<n>_set stack size to <n>'#010+
'**2Cs<n>_set stack size',' to <n>'#010+
'**2Ct_stack checking'#010+
'**2CX_create also smartlinked library'#010+
'**1d<x>_defines the symbol <x>'#010+
'**1D_generate a',' DEF file'#010+
'**1D_generate a DEF file'#010+
'**2Dd<x>_set description to <x>'#010+
'**2Dv<x>_set DLL version to <x>'#010+
'*O2Dw_PM application'#010+
'**1e<x>_set path to executable'#010+
'**1E_same as -Cn'#010+
'*','*1E_same as -Cn'#010+
'**1F<x>_set file names and paths:'#010+
'**2Fa<x>[,y]_for a program load first units <x> and [y] before ','uses '+
'is parsed'#010+
'**2Fa<x>[,y]_for a program load first units <x> and [y] before uses is'+
' parsed'#010+
'**2Fc<x>_sets input codepage to <x>'#010+
'**2FD<x>_sets the directory where to search for compiler utilities'#010+
'**2Fe<x>_redirect error output to <x>'#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+
'**2Fl<x>_','adds <x> to library path'#010+
'**2Fl<x>_adds <x> to library path'#010+
'**2FL<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 inf','ormation:'#010+
'*g1g_generate debugger information:'#010+
'*g2gc_generate checks for pointers'#010+
'*g2gd_use dbx'#010+
'*g2gg_use gsym'#010+
'*g2gh_use heap trace unit (for memory leak debugging)'#010+
'*g2gh_use heap trace unit (for memory leak debugging)',#010+
'*g2gl_use line info unit to show more info for backtraces'#010+
'*g2gv_generates programs traceable with valgrind'#010+
'*g2gw','_generate dwarf debugging info'#010+
'*g2gw_generate dwarf debugging info'#010+
'**1i_information'#010+
'**2iD_return compiler date'#010+
'**2iV_return compiler version'#010+
'**2iSO_return compiler OS'#010+
'**2iSO_return compiler',' OS'#010+
'**2iSP_return compiler processor'#010+
'**2iTO_return target OS'#010+
'**2iTP_return target processor'#010+
'**1I<x>_adds <x> to i','nclude path'#010+
'**1I<x>_adds <x> to include path'#010+
'**1k<x>_Pass <x> to the linker'#010+
'**1l_write logo'#010+
'**1M<x>_set language mode to <x>'#010+
'**2Mfpc_free pascal dialect (default)'#010+
'**2Mfpc_free pascal dialect (defaul','t)'#010+
'**2Mobjfpc_switch some Delphi 2 extensions on'#010+
'**2Mdelphi_tries to be Delphi compatible'#010+
'**2Mtp_tries to be TP/B','P 7.0 compatible'#010+
'**2Mtp_tries to be TP/BP 7.0 compatible'#010+
'**2Mgpc_tries to be gpc compatible'#010+
'**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010+
'**1n_don'#039't read the default config file'#010+
'**1n_don',#039't read the default config file'#010+
'**1N<x>_node tree optimizations'#010+
'**2Nu_unroll loops'#010+
'**1o<x>_change the name of the',' executable produced to <x>'#010+
'**1o<x>_change the name of the executable produced to <x>'#010+
'**1O<x>_optimizations:'#010+
'**2O-_disable optimizations'#010+
'**2O1_level 1 optimizations (quick and debugger friendly)'#010+
'**2O1_level 1 optimizations (quick and debugger ','friendly)'#010+
'**2O2_level 2 optimizations (-O1 + quick optimizations)'#010+
'**2O3_level 3 optimizations (-O2 + slow optimiz','ations)'#010+
'**2O3_level 3 optimizations (-O2 + slow optimizations)'#010+
'**2Oa<x>=<y>_set alignment'#010+
'**2Oo[NO]<x>_enable or disable optimizations, see fpc -i for possible '+
'values'#010+
'**2Op<x>_set target cpu for optimizing, see fpc -i for possible values'+
#010+
'**2Op<x>_set ta','rget cpu for optimizing, see fpc -i for possible valu'+
'es'#010+
'**2Os_generate smaller code'#010+
'**1pg_generate profile code f','or gprof (defines FPC_PROFILE)'#010+
'**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
'**1R<x>_assembler reading style:'#010+
'**2Rdefault_use default assembler'#010+
'3*2Ratt_read AT&T style assembler'#010+
'3*2Ratt_read AT&T style assem','bler'#010+
'3*2Rintel_read Intel style assembler'#010+
'6*2RMOT_read motorola style assembler'#010+
'**1S<x>_syntax options:'#010+
'**2S2_sam','e as -Mobjfpc'#010+
'**2S2_same as -Mobjfpc'#010+
'**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
'**2Sa_include assertion code.'#010+
'**2Sd_same as -Mdelphi'#010+
'**2Se<x>_error options. <x> is a combination of the following:'#010+
'**3*_<n> : compiler stops after the <n> errors (default is 1',')'#010+
'**2Se<x>_e','rror options. <x> is a combination of the following:'#010+
'**3*_<n> : compiler stops after the <n> errors (default is 1)'#010+
'**3*_w : compiler stops also after warnings'#010+
'**3*_n : compiler stops also after notes'#010+
'**3*_h : compiler stops also after hints'#010+
'**3*_h : compiler stops also after hints',#010+
'**2Sg_allow LABEL and GOTO'#010+
'**2Sh_Use ansistrings'#010+
'**2Si_support C++ styled INLINE'#010+
'**2Sk_load fpcylix unit'#010+
'**2SI<x','>_set interface style to <x>'#010+
'**2SI<x>_set interface style to <x>'#010+
'**3SIcom_COM compatible interface (default)'#010+
'**3SIcorba_CORBA compatible interface'#010+
'**2Sm_support macros like C (global)'#010+
'**2Sm_support ma','cros like C (global)'#010+
'**2So_same as -Mtp'#010+
'**2Sp_same as -Mgpc'#010+
'**2Ss_constructor name must be init (destructor must ','be done)'#010+
'**2Ss_constructor name must be init (destructor must be done)'#010+
'**2St_allow static keyword in objects'#010+
'**1s_don'#039't call assembler and linker'#010+
'**2sh_Generate script to link on host'#010+
'**2st_Generate script to link on target'#010+
'**2st','_Generate script to link on target'#010+
'**2sr_Skip register allocation phase (use with -alr)'#010+
'**1T<x>_Target operating ','system:'#010+
'**1T<x>_Target operating system:'#010+
'3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
'3*2Tfreebsd_FreeBSD'#010+
'3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
'3*2Tlinux_Linux'#010+
'3','*2Tlinux_Linux'#010+
'3*2Tnetbsd_NetBSD'#010+
'3*2Tnetware_Novell Netware Module (clib)'#010+
'3*2Tnetwlibc_Novell Netware Module (lib','c)'#010+
'3*2Tnetwlibc_Novell Netware Module (libc)'#010+
'3*2Topenbsd_OpenBSD'#010+
'3*2Tos2_OS/2 / eComStation'#010+
'3*2Tsunos_SunOS/Solaris'#010+
'3*2Twatcom_Watcom compatible DOS extender'#010+
'3*2Twdosx_WDOSX DOS extender'#010+
'3*2Twdosx_W','DOSX DOS extender'#010+
'3*2Twin32_Windows 32 Bit'#010+
'3*2Twince_Windows CE'#010+
'4*2Tlinux_Linux'#010+
'6*2Tamiga_Commodore Amiga'#010+
'6*2Tata','ri_Atari ST/STe/TT'#010+
'6*2Tatari_Atari ST/STe/TT'#010+
'6*2Tlinux_Linux/m68k'#010+
'6*2Tmacos_Macintosh m68k (not supported)'#010+
'6*2Tpalmos_PalmOS'#010+
'A*2Tlinux_Linux'#010+
'A*2Twince_Windows CE'#010+
'A*2Twince_Wi','ndows CE'#010+
'P*2Tamiga_AmigaOS on PowerPC'#010+
'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+
'P*2Tlinux_Linux on PowerPC'#010+
'P*2Tmac','os_MacOS (classic) on PowerPC'#010+
'P*2Tmacos_MacOS (classic) on PowerPC'#010+
'P*2Tmorphos_MorphOS'#010+
'S*2Tlinux_Linux'#010+
'**1u<x>_undefines the symbol <x>'#010+
'**1U_unit options:'#010+
'**2Un_don'#039't check the unit name'#010+
'**2Un_don',#039't check the unit name'#010+
'**2Ur_generate release unit files'#010+
'**2Us_compile a system unit'#010+
'**1v<x>_Be verbose. <x> is a',' combination of the following letters:'#010+
'**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
'**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+
'**2*_w : Show warnings u : Show unit info'#010+
'**2*_w : Show warn','ings u : Show unit info'#010+
'**2*_n : Show notes t : Show tried/used files'#010+
'**2*_h : Sho','w hints c : Show conditionals'#010+
'**2*_h : Show hints c : Show conditionals'#010+
'**2*_i : Show general info d : Show debug info'#010+
'**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+
'**2*_a : Show everything x : Executable info (Win32 on','ly'+
')'#010+
'**2*_l : Show linenumbe','rs r : Rhide/GCC compatibility mod'+
'e'#010+
'**2*_a : Show everything x : Executable info (Win32 only)'#010+
'**2*_b : Write file names messages with full path'#010+
'**2*_v : write fpcdebug.txt with p : Write tree.log with parse tre'+
'e'#010+
'**2*_ lots of debugging info'#010+
'*','*2*_ lots of debugging info'#010+
'3*1W<x>_Win32-like target options'#010+
'3*2WB_Create a relocatable image'#010+
'3*2WB<x>_Set Im','age base to Hexadecimal <x> value'#010+
'3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
'3*2WC_Specify console type application'#010+
'3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
'3*2WF_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 (necessary for debugging)'#010+
'3*2WR_Generate relocation code'#010+
'P*2WC_Specify console type application (MacOS only)'#010+
'P*2WG_Specify graphic type application (MacOS only)'#010+
'P','*2WG_Specify graphic type application (MacOS only)'#010+
'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+
'**1','X_executable options:'#010+
'**1X_executable options:'#010+
'**2Xc_pass --shared to the linker (Unix only)'#010+
'**2Xd_don'#039't use standard library search path (needed for cross com'+
'pile)'#010+
'**2Xd_don'#039't use standard library search path (needed for cr','oss c'+
'ompile)'#010+
'**2XD_try to link units dynamic (defines FPC_LINK_DYNAMIC)'#010+
'**2Xm_generate link map'#010+
'**2XM<x>','_set the name of the '#039'main'#039' program routine (default'+
' is '#039'main'#039')'#010+
'**2XM<x>_set the name of the '#039'main'#039' program routine (default i'+
's '#039'main'#039')'#010+
'**2XP<x>_prepend the binutils names with the prefix <x>'#010+
'**2Xr<x>_set library search path to <x> (needed for cross compile)'#010+
'**2Xr<x','>_set library search path to <x> (needed for cross compile)'#010+
'**2Xs_strip all symbols from executable'#010+
'**2XS_try to ','link units static (default) (defines FPC_LINK_STATIC)'#010+
'**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+
'**2Xt_link with static libraries (-static is passed to linker)'#010+
'**2XX_try to link units smart (defines FPC_LINK_SMART)'#010+
'**2XX_try ','to link units smart (defines FPC_LINK_SMART)'#010+
'**1*_'#010+
'**1?_shows this help'#010+
'**1h_shows this help without w','aiting'#000
'**1h_shows this help without waiting'#000
);

12
compiler/ncal.pas
View File

@ -564,13 +564,9 @@ type
{ typechecking needed }
if (cpf_varargs_para in callparaflags) then
begin
{ convert pascal to C types }
case left.resulttype.def.deftype of
stringdef :
inserttypeconv(left,charpointertype);
floatdef :
inserttypeconv(left,s64floattype);
end;
{ this should only happen vor C varargs }
{ the necessary conversions have already been performed in }
{ tarrayconstructornode.insert_typeconvs }
set_varstate(left,vs_read,[vsf_must_be_valid]);
resulttype:=left.resulttype;
{ also update parasym type to get the correct parameter location
@ -1061,7 +1057,7 @@ type
include(callnodeflags,cnf_uses_varargs);
{ Get arrayconstructor node and insert typeconvs }
hp:=tarrayconstructornode(oldleft.left);
hp.insert_typeconvs;
hp.insert_typeconvs(true);
{ Add c args parameters }
{ It could be an empty set }
if assigned(hp) and

43
compiler/ncnv.pas
View File

@ -1011,8 +1011,6 @@ implementation
include(left.flags,nf_is_currency);
resulttypepass(left);
end;
if left.nodetype=realconstn then
result:=crealconstnode.create(trealconstnode(left).value_real,resulttype);
end;
@ -1419,6 +1417,10 @@ implementation
te_exact,
te_equal :
begin
result := simplify;
if assigned(result) then
exit;
{ because is_equal only checks the basetype for sets we need to
check here if we are loading a smallset into a normalset }
if (resulttype.def.deftype=setdef) and
@ -1460,6 +1462,9 @@ implementation
te_convert_l2,
te_convert_l3 :
begin
result := simplify;
if assigned(result) then
exit;
{ nothing to do }
end;
@ -1652,12 +1657,34 @@ implementation
{ Constant folding and other node transitions to
remove the typeconv node }
case left.nodetype of
realconstn :
begin
if is_currency(resulttype.def) then
result := resulttype_real_to_currency
else if (resulttype.def.deftype = floatdef) then
result := resulttype_real_to_real
else
exit;
if not(assigned(result)) then
begin
result := left;
left := nil;
end;
if (result.nodetype = realconstn) then
begin
result:=crealconstnode.create(trealconstnode(result).value_real,resulttype);
if ([nf_explicit,nf_internal] * flags <> []) then
include(result.flags, nf_explicit);
end;
end;
niln :
begin
{ nil to ordinal node }
if (resulttype.def.deftype=orddef) then
begin
hp:=cordconstnode.create(0,resulttype,true);
if ([nf_explicit,nf_internal] * flags <> []) then
include(hp.flags, nf_explicit);
result:=hp;
exit;
end
@ -1667,6 +1694,8 @@ implementation
begin
hp:=cnilnode.create;
hp.resulttype:=resulttype;
if ([nf_explicit,nf_internal] * flags <> []) then
include(hp.flags, nf_explicit);
result:=hp;
exit;
end
@ -1678,6 +1707,8 @@ implementation
(po_methodpointer in tprocvardef(resulttype.def).procoptions)) then
begin
left.resulttype:=resulttype;
if ([nf_explicit,nf_internal] * flags <> []) then
include(left.flags, nf_explicit);
result:=left;
left:=nil;
exit;
@ -1694,6 +1725,8 @@ implementation
(convtype<>tc_cchar_2_pchar) then
begin
hp:=cpointerconstnode.create(TConstPtrUInt(tordconstnode(left).value),resulttype);
if ([nf_explicit,nf_internal] * flags <> []) then
include(hp.flags, nf_explicit);
result:=hp;
exit;
end
@ -1702,6 +1735,8 @@ implementation
begin
{ replace the resulttype and recheck the range }
left.resulttype:=resulttype;
if ([nf_explicit,nf_internal] * flags <> []) then
include(left.flags, nf_explicit);
testrange(left.resulttype.def,tordconstnode(left).value,(nf_explicit in flags));
result:=left;
left:=nil;
@ -1715,6 +1750,8 @@ implementation
if (resulttype.def.deftype=pointerdef) then
begin
left.resulttype:=resulttype;
if ([nf_explicit,nf_internal] * flags <> []) then
include(left.flags, nf_explicit);
result:=left;
left:=nil;
exit;
@ -1724,6 +1761,8 @@ implementation
begin
hp:=cordconstnode.create(TConstExprInt(tpointerconstnode(left).value),
resulttype,not(nf_explicit in flags));
if ([nf_explicit,nf_internal] * flags <> []) then
include(hp.flags, nf_explicit);
result:=hp;
exit;
end;

60
compiler/nld.pas
View File

@ -88,7 +88,7 @@ interface
function det_resulttype:tnode;override;
function docompare(p: tnode): boolean; override;
procedure force_type(tt:ttype);
procedure insert_typeconvs;
procedure insert_typeconvs(iscvarargs: boolean);
end;
tarrayconstructornodeclass = class of tarrayconstructornode;
@ -911,12 +911,14 @@ implementation
end;
procedure tarrayconstructornode.insert_typeconvs;
procedure tarrayconstructornode.insert_typeconvs(iscvarargs: boolean);
var
hp : tarrayconstructornode;
dovariant : boolean;
begin
dovariant:=(nf_forcevaria in flags) or tarraydef(resulttype.def).isvariant;
if (iscvarargs) then
include(flags,nf_cvarargs);
dovariant:=(nf_forcevaria in flags) or tarraydef(resulttype.def).isvariant or iscvarargs;
{ only pass left tree, right tree contains next construct if any }
if assigned(left) then
begin
@ -927,7 +929,8 @@ implementation
{ Insert typeconvs for array of const }
if dovariant then
begin
if hp.left.nodetype=stringconstn then
if not(iscvarargs) and
(hp.left.nodetype=stringconstn) then
hp.left:=ctypeconvnode.create_internal(hp.left,cansistringtype)
else
case hp.left.resulttype.def.deftype of
@ -935,10 +938,12 @@ implementation
hp.left:=ctypeconvnode.create_internal(hp.left,s32inttype);
arraydef :
begin
if is_chararray(hp.left.resulttype.def) then
if not(iscvarargs) and
is_chararray(hp.left.resulttype.def) then
hp.left:=ctypeconvnode.create_internal(hp.left,charpointertype)
else
if is_widechararray(hp.left.resulttype.def) then
if not(iscvarargs) and
is_widechararray(hp.left.resulttype.def) then
hp.left:=ctypeconvnode.create_internal(hp.left,widecharpointertype)
else
CGMessagePos1(hp.left.fileinfo,type_e_wrong_type_in_array_constructor,hp.left.resulttype.def.typename);
@ -949,20 +954,43 @@ implementation
not(is_64bitint(hp.left.resulttype.def)) then
hp.left:=ctypeconvnode.create(hp.left,s32inttype)
else if is_void(hp.left.resulttype.def) then
CGMessagePos1(hp.left.fileinfo,type_e_wrong_type_in_array_constructor,hp.left.resulttype.def.typename);
CGMessagePos1(hp.left.fileinfo,type_e_wrong_type_in_array_constructor,hp.left.resulttype.def.typename)
else if iscvarargs and
is_currency(hp.left.resulttype.def) then
hp.left:=ctypeconvnode.create(hp.left,s64floattype);
end;
floatdef :
if not(is_currency(hp.left.resulttype.def)) then
hp.left:=ctypeconvnode.create(hp.left,pbestrealtype^);
if not(iscvarargs) then
begin
if not(is_currency(hp.left.resulttype.def)) then
hp.left:=ctypeconvnode.create(hp.left,pbestrealtype^);
end
else
begin
if is_constrealnode(hp.left) and
not(nf_explicit in hp.left.flags) then
MessagePos(hp.left.fileinfo,type_w_double_c_varargs);
if (tfloatdef(hp.left.resulttype.def).typ in [{$ifndef x86_64}s32real,{$endif}s64currency]) or
(is_constrealnode(hp.left) and
not(nf_explicit in hp.left.flags)) then
hp.left:=ctypeconvnode.create(hp.left,s64floattype);
end;
procvardef :
hp.left:=ctypeconvnode.create(hp.left,voidpointertype);
stringdef,
variantdef,
pointerdef,
classrefdef:
stringdef:
if iscvarargs then
hp.left:=ctypeconvnode.create(hp.left,charpointertype);
variantdef:
if iscvarargs then
CGMessagePos1(hp.left.fileinfo,type_e_wrong_type_in_array_constructor,hp.left.resulttype.def.typename);
pointerdef:
;
classrefdef:
if iscvarargs then
hp.left:=ctypeconvnode.create(hp.left,voidpointertype);
objectdef :
if is_object(hp.left.resulttype.def) then
if iscvarargs or
is_object(hp.left.resulttype.def) then
CGMessagePos1(hp.left.fileinfo,type_e_wrong_type_in_array_constructor,hp.left.resulttype.def.typename);
else
CGMessagePos1(hp.left.fileinfo,type_e_wrong_type_in_array_constructor,hp.left.resulttype.def.typename);
@ -987,7 +1015,9 @@ implementation
resulttypepassed already }
if assigned(left) then
begin
insert_typeconvs;
{ in case of C varargs, insert_typeconvs has already been called }
if not(nf_cvarargs in flags) then
insert_typeconvs(false);
{ call firstpass for all nodes }
hp:=self;
while assigned(hp) do

3
compiler/node.pas
View File

@ -228,8 +228,9 @@ interface
{ tarrayconstructnode }
nf_forcevaria,
nf_novariaallowed,
nf_cvarargs,
{ ttypeconvnode }
{ ttypeconvnode, and the first one also treal/ord/pointerconstn }
nf_explicit,
nf_internal, { no warnings/hints generated }
nf_load_procvar,

2
compiler/ppu.pas
View File

@ -43,7 +43,7 @@ type
{$endif Test_Double_checksum}
const
CurrentPPUVersion=54;
CurrentPPUVersion=55;
{ buffer sizes }
maxentrysize = 1024;

8
tests/test/cg/cdecl/taoc5.pp
View File

@ -36,19 +36,19 @@ end;
begin
l:=4.0;
test_one_double([3.45]);
test_one_double([double(3.45)]);
if abs(l-3.45)>0.01 then
has_errors:=true;
l:=4.0;
test_one_double([3.45,2.45]);
test_one_double([double(3.45),double(2.45)]);
if abs(l-3.45)>0.01 then
has_errors:=true;
l:=4;
test_one_double([3.45,24.25,678.8]);
test_one_double([double(3.45),double(24.25),double(678.8)]);
if abs(l-3.45)>0.01 then
has_errors:=true;
l:=4;
test_two_doubles([3.45,4.56]);
test_two_doubles([double(3.45),double(4.56)]);
if abs(l-4.56)>0.01 then
has_errors:=true;
if has_errors then

18
tests/test/cg/tprintf.pp
View File

@ -83,21 +83,23 @@ begin
end;
Writeln('Testing with single double argument');
printf('Text containing double: %f'+lineending,[d]);
sprintf(p,'Text containing double: %f'+lineending,[d]);
printf('Text containing double: %lf'+lineending,[d]);
sprintf(p,'Text containing double: %lf'+lineending,[d]);
if strpos(p,'double: 45.4')=nil then
begin
writeln('The output of sprintf for double is wrong: ',p);
has_errors:=true;
end;
printf('Text containing long double: %f'+lineending,[e]);
{$ifdef FPC_HAS_TYPE_EXTENDED}
printf('Text containing long double: %Lf'+lineending,[e]);
sprintf(p,'Text containing long double: %f'+lineending,[e]);
if strpos(p,'long double: 74.7')=nil then
begin
writeln('The output of sprintf for long double is wrong:',p);
has_errors:=true;
end;
{$endif FPC_HAS_TYPE_EXTENDED}
Writeln('Testing with combined pchar argument');
printf('Text containing "%s" and "%s" text'+lineending,[s,s2]);
@ -137,8 +139,8 @@ begin
end;
Writeln('Testing with single double argument');
printf('Text containing double: %f"%s"'+lineending,[d,s2]);
sprintf(p,'Text containing double: %f"%s"'+lineending,[d,s2]);
printf('Text containing double: %lf"%s"'+lineending,[d,s2]);
sprintf(p,'Text containing double: %lf"%s"'+lineending,[d,s2]);
if (strpos(p,'double: 45.4')=nil) or
(strpos(p,'"next"')=nil) then
begin
@ -146,14 +148,16 @@ begin
has_errors:=true;
end;
printf('Text containing long double: %f"%s"'+lineending,[e,s2]);
sprintf(p,'Text containing long double: %f"%s"'+lineending,[e,s2]);
{$ifdef FPC_HAS_TYPE_EXTENDED}
printf('Text containing long double: %Lf"%s"'+lineending,[e,s2]);
sprintf(p,'Text containing long double: %Lf"%s"'+lineending,[e,s2]);
if (strpos(p,'long double: 74.7')=nil) or
(strpos(p,'"next"')=nil) then
begin
writeln('The output of sprintf for long double is wrong:',p);
has_errors:=true;
end;
{$endif FPC_HAS_TYPE_EXTENDED}
if has_errors then
halt(1);