From 00c14e1083a9274f58965edb08d6fdd74443cf4f Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 15 Dec 2004 16:00:16 +0000 Subject: [PATCH] * external is again allowed in implementation --- compiler/msg/errore.msg | 9 +- compiler/msgidx.inc | 7 +- compiler/msgtxt.inc | 402 ++++++++++++++++++++-------------------- compiler/ncgutil.pas | 24 ++- compiler/nutils.pas | 15 +- compiler/pdecsub.pas | 133 ++++++------- compiler/psub.pas | 27 ++- 7 files changed, 336 insertions(+), 281 deletions(-) diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 409f35cb3a..c584b6a3d8 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -986,11 +986,10 @@ parser_e_no_local_var_external=03209_E_Can't declare local variable as EXTERNAL parser_e_proc_already_external=03210_E_Procedure is already declared EXTERNAL % The procedure is already declared with the EXTERNAL directive in an interface or % forward declaration. -parser_e_proc_no_external_allowed=03211_E_Can't declare procedure as EXTERNAL -% The procedure is already declared in an interface or forward declaration. The compiler -% expects the code for this procedure to be available in this unit. The EXTERNAL directive -% needs to be moved to the interface or forward declaration. -parser_w_implicit_uses_of_variants_unit=03212_W_Implicit uses of Variants unit +parser_w_implicit_uses_of_variants_unit=03211_W_Implicit uses of Variants unit +% The Variant type is used in the unit without any used unit using the Variants unit. The +% compiler has implicitly added the Variants unit to the uses list. To remove this warning +% the Variants unit needs to be added to the uses statement. % \end{description} # # Type Checking diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 5b6491f7ab..2c14002a20 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -274,8 +274,7 @@ const parser_e_illegal_assignment_to_count_var=03208; parser_e_no_local_var_external=03209; parser_e_proc_already_external=03210; - parser_e_proc_no_external_allowed=03211; - parser_w_implicit_uses_of_variants_unit=03212; + parser_w_implicit_uses_of_variants_unit=03211; type_e_mismatch=04000; type_e_incompatible_types=04001; type_e_not_equal_types=04002; @@ -650,9 +649,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 37881; + MsgTxtSize = 37837; MsgIdxMax : array[1..20] of longint=( - 18,67,213,59,57,46,99,20,35,60, + 18,67,212,59,57,46,99,20,35,60, 40,1,1,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 1209aba0b1..0990c4f2f1 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -308,296 +308,294 @@ const msgtxt : array[0..000157,1..240] of char=( '03208_E_Illegal assignment to for-loop variable "$1"'#000+ '03209_E_Can'#039't declare local variable as EXTERNAL'#000+ '03210_E_Procedure is already declared EXT','ERNAL'#000+ - '03211_E_Can'#039't declare procedure as EXTERNAL'#000+ - '03212_W_Implicit uses of Variants unit'#000+ + '03211_W_Implicit uses of Variants unit'#000+ '04000_E_Type mismatch'#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+ - '0','4004_E_Variable identifier expected'#000+ - '04005_E_Integer expression expected, but got "$1"'#000+ + '04004_E_Variable identifier expected'#000+ + '04005_E_','Integer expression expected, but got "$1"'#000+ '04006_E_Boolean expression expected, but got "$1"'#000+ '04007_E_Ordinal expression expected'#000+ '04008_E_pointer type expected, but got "$1"'#000+ - '04009_E_class type expec','ted, but got "$1"'#000+ - '04011_E_Can'#039't evaluate constant expression'#000+ + '04009_E_class type expected, but got "$1"'#000+ + '04011_E_Can'#039't evaluate con','stant expression'#000+ '04012_E_Set elements are not compatible'#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_us','e DIV instead to get an integer result'#000+ - '04016_E_string types doesn'#039't match, because of $V+ mode'#000+ + '04015_H_use DIV instead to get an integer result'#000+ + '04016','_E_string types doesn'#039't match, because of $V+ mode'#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 writel','n on typed file'#000+ - '04020_E_Can'#039't use read or write on untyped file.'#000+ + '04019_E_Can'#039't use readln or writeln on typed file'#000+ + '04020_E_Can'#039't use read or wr','ite on untyped file.'#000+ '04021_E_Type conflict between set elements'#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+ + '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) are not compatible'#000+ '04027_E_Illegal constant passed to internal math function'#000+ - '04028_E_Can'#039't get the addre','ss of constants'#000+ - '04029_E_Argument can'#039't be assigned to'#000+ + '04028_E_Can'#039't get the address of constants'#000+ + '04029_E_Argument can'#039't be as','signed to'#000+ '04030_E_Can'#039't assign local procedure/function to procedure variabl'+ 'e'#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+ - '04','034_E_interface type expected, but got "$1"'#000+ + '04034_E_interface type expected, but got "$1"'#000, '04035_W_Mixing signed expressions and longwords gives a 64bit result'#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+ + '04037_E_Typecast has different size ($1 -> $2) in assignment'#000+ + '04038_E_enums with assignme','nts 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 completely defined'#000+ + '04041_E_Class or interface type expected, but got "$1"'#000+ + '04042_E_Type "$1" is not completely define','d'#000+ '04043_W_String literal has more characters than short string length'#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_Con','structing a class "$1" with abstract methods'#000+ + '04046_W_Constructing a class "$1" with abstract methods',#000+ '04047_H_The left operand of the IN operator should be byte sized'#000+ '04048_W_Type size mismatch, possible loss of data / range check error'#000+ - '04049_H_Type size mismatch, possible loss of data / range ch','eck erro'+ - 'r'#000+ - '04050_E_The address of an abstract method can'#039't be taken'#000+ + '04049_H_Type size mismatch, possible loss of data / range check error'#000+ + '04050_E_The address of an abstract',' method can'#039't be taken'#000+ '04051_E_The operator is not applicable for the operand type'#000+ '04052_E_Constant Expression expected'#000+ '04053_E_Operation "$1" not supported for types "$2" and "$3"'#000+ - '04054_E_Illegal',' type conversion: "$1" to "$2"'#000+ - '04055_H_Conversion between ordinals and pointers is not portable'#000+ + '04054_E_Illegal type conversion: "$1" to "$2"'#000+ + '04055_H_Conve','rsion between ordinals and pointers is not portable'#000+ '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 count','er variable'#000+ - '05000_E_Identifier not found "$1"'#000+ + '04058_E_Illegal counter variable'#000+ + '05000_E_Identifier not found "$1','"'#000+ '05001_F_Internal Error in SymTableStack()'#000+ '05002_E_Duplicate identifier "$1"'#000+ '05003_H_Identifier already defined in $1 at line $2'#000+ '05004_E_Unknown identifier "$1"'#000+ - '05005_E_Forward declaration not so','lved "$1"'#000+ + '05005_E_Forward declaration not solved "$1"'#000+ '05007_E_Error in type definition'#000+ - '05009_E_Forward type not resolved "$1"'#000+ + '0','5009_E_Forward type not resolved "$1"'#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 w','ith an abstract method are '+ - 'not allowed'#000+ - '05014_W_Label not defined "$1"'#000+ + '05013_E_Instances of classes or objects with an abstract method are no'+ + 't allowed'#000+ + '05014','_W_Label not defined "$1"'#000+ '05015_E_Label used but not defined "$1"'#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_identi','fier isn'#039't a label'#000+ - '05020_E_label already defined'#000+ + '05019_E_identifier isn'#039't a label'#000+ + '05020_E_label already def','ined'#000+ '05021_E_illegal type declaration of set elements'#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+ + '05025_N_Local variable "$1" not used'#000+ + '05026_H_Value parameter "$1" is a','ssigned but never used'#000+ '05027_N_Local variable "$1" is assigned but never 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 assigne','d but never used'#000+ - '05031_N_Private method "$1.$2" never used'#000+ + '05030_N_Private field "$1.$2" is assigned but 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+ '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+ + '05035_E_Unknown record field identifier "$1"'#000+ + '05036_W_Local variable "$1" does not se','em to be initialized'#000+ '05037_W_Variable "$1" does not seem to be initialized'#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 interface method "$1" fo','und'#000+ '05043_W_Symbol "$1" is deprecated'#000+ '05044_W_Symbol "$1" is not portable'#000+ '05055_W_Symbol "$1" is not implemented'#000+ '05056_E_Can'#039't create unique type from this type'#000+ - '06009_E_Parameter list size exceeds',' 65535 bytes'#000+ - '06012_E_File types must be var parameters'#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 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+ - '06017_N_Inefficient cod','e'#000+ + '06017_N_Inefficient code'#000+ '06018_W_unreachable code'#000+ - '06020_E_Abstract methods can'#039't be called directly'#000+ + '06020_E_Abstract ','methods can'#039't be called directly'#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+ - '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+ + '06033_E_No code for inline procedure stored'#000+ + '06035_E_','Element zero of an ansi/wide- or longstring 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 hand','ler methods directly'#000+ - '06039_E_Jump in or outside of an exception block'#000+ + '06038_E_Cannot call message handler methods directly'#000+ + '06039_E_Jump in or outs','ide 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+ - '06042_W_Local variable size exceed limit for cer','tain cpu'#039's'#000+ - '06043_E_Local variables size exceeds supported limit'#000+ + '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+ + '06043_E_Local variables size exce','eds supported limit'#000+ '06044_E_BREAK not allowed'#000+ '06045_E_CONTINUE not allowed'#000+ '07000_DL_Starting $1 styled assembler parsing'#000+ '07001_DL_Finished $1 styled assembler parsing'#000+ - '07002_E_Non-label pattern con','tains @'#000+ - '07004_E_Error building record offset'#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+ '07008_E_need to use OFFSET here'#000+ '07009_E_need to use $ here'#000+ - '07010_E','_Cannot use multiple relocatable symbols'#000+ - '07011_E_Relocatable symbol can only be added'#000+ + '07010_E_Cannot use multiple relocatable symbols'#000+ + '070','11_E_Relocatable symbol can only be added'#000+ '07012_E_Invalid constant expression'#000+ '07013_E_Relocatable 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+ + '07015_E_You can not reach $1 from that code'#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+ '07019_E_Wrong scale factor specified'#000+ '07020_E_Multiple index register usage'#000+ - '07021_E_Inva','lid operand type'#000+ - '07022_E_Invalid string as opcode operand: $1'#000+ + '07021_E_Invalid operand type'#000+ + '07022_E_Invalid string as o','pcode operand: $1'#000+ '07023_W_@CODE and @DATA not supported'#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 ign','ored: $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+ + '07','029_W_Fwait can cause emulation problems with emu387'#000+ '07030_W_$1 without operand translated into $1P'#000+ '07031_W_ENTER instruction is not supported by Linux kernel'#000+ - '07032_W_Calling an overload function ','in assembler'#000+ - '07033_E_Unsupported symbol type for operand'#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+ '07037_E_Error converting binary $1'#000+ '07038_E_Error converting hexadecimal $1'#000+ - '0','7039_H_$1 translated to $2'#000+ - '07040_W_$1 is associated to an overloaded function'#000+ + '07039_H_$1 translated to $2'#000+ + '07040_W_$1 is ass','ociated to an overloaded function'#000+ '07041_E_Cannot use SELF outside a method'#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 no','t supported'#000+ - '07045_E_Size suffix and destination or source size do not match'#000+ + '07044_E_SEG not supported'#000+ + '07045_E_Size suffix and destinat','ion or source size do not match'#000+ '07046_W_Size suffix and destination or source size do not match'#000+ '07047_E_Assembler syntax error'#000+ '07048_E_Invalid combination of opcode and operands'#000+ - '07049_E_Assembler ','syntax error in operand'#000+ - '07050_E_Assembler syntax error in constant'#000+ + '07049_E_Assembler syntax error in operand'#000+ + '07050_E_Assembler sy','ntax 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+ '07053_E_Unrecognized opcode $1'#000+ '07054_E_Invalid or missing opcode'#000+ - '0705','5_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+ '07058_W_NEAR ignored'#000+ '07059_W_FAR ignored'#000+ '07060_E_Duplicate local symbol $1'#000+ - '07061_E_Undefined local sym','bol $1'#000+ + '07061_E_Undefined local symbol $1'#000+ '07062_E_Unknown label identifier $1'#000+ - '07063_E_Invalid register name'#000+ + '0','7063_E_Invalid register name'#000+ '07064_E_Invalid floating point register name'#000+ '07066_W_Modulo not supported'#000+ '07067_E_Invalid floating point constant $1'#000+ '07068_E_Invalid floating point expression'#000+ - '07069_E_','Wrong symbol type'#000+ - '07070_E_Cannot index a local var or parameter with a register'#000+ + '07069_E_Wrong symbol type'#000+ + '07070_E_Cannot index a loc','al var or parameter with a register'#000+ '07071_E_Invalid segment override expression'#000+ '07072_W_Identifier $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+ + '07074_No type of variable specified'#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+ '07078_E_Dollar token is used without an identifier'#000+ '07079_W_32bit constant created for address'#000+ - '0708','0_N_.align is target specific, use .balign or .p2align'#000+ + '07080_N_.align is target specific, use .balign o','r .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+ '07083_E_No size specified and unable to determine the size of the oper'+ 'ands'#000+ - '07','084_E_Cannot use RESULT in this function'#000+ - '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+ + '07084_E_Cannot use RESULT in this function'#000+ + '070','86_W_"$1" without operand translated into "$1 %st,%st(1)"'#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+ - '07','090_E_Char > not allowed here'#000+ - '07093_W_ALIGN not supported'#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+ '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, usin','g DWORD as default'#000+ '08000_F_Too many assembler files'#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 d','ata is only allowed in bss section'#000+ - '08005_F_No binary writer selected'#000+ + '08004_E_Allocating of data is only allowed in bss section'#000+ + '08005_F_N','o binary writer selected'#000+ '08006_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+ - '08009_E_Asm: Invalid effective ','address'#000+ - '08010_E_Asm: Immediate or reference expected'#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+ '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: Extend','ed type not supported for this target'#000+ - '08016_E_Asm: Duplicate label $1'#000+ + '08015_E_Asm: Extended type not supported for this target'#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+ '09000_W_Source operating system redefined'#000+ '09001_I_Assembling (pipe) $1'#000+ - '09','002_E_Can'#039't create assember file: $1'#000+ - '09003_E_Can'#039't create object file: $1'#000+ + '09002_E_Can'#039't create assember file: $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 found, switching to external assembling'#000+ '09006_T_Using assembler: $1'#000+ - '09007_E_Error while assembling exit','code $1'#000+ - '09008_E_Can'#039't call the assembler, error $1 switching to external a'+ - 'ssembling'#000+ + '09007_E_Error while assembling exitcode $1'#000+ + '09008_E_Can'#039't call the assembler, er','ror $1 switching to external'+ + ' assembling'#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 not found, Linking may fail !'#000+ '09013_E_Error while linking'#000+ - '09014_E_Can'#039't call the linker, switching to external 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, switching to external linking'#000+ '09017_T_Using util $1'#000+ '09018_E_Creation of Executables not supported'#000+ - '0901','9_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+ '09022_I_Compiling resource $1'#000+ - '09023_T_unit $1 can'#039't be statically linked, switching to smart li', - 'nking'#000+ - '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+ - #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 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+ - '09','028_F_Can'#039't post process executable $1'#000+ - '09029_F_Can'#039't open executable $1'#000+ + '09028_F_Can'#039't post process executable $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+ '09032_X_Size of uninitialized data: $1 bytes'#000+ '09033_X_Stack space reserved: $1 bytes'#000+ - '09034_X_St','ack space commited: $1 bytes'#000+ - '10000_T_Unitsearch: $1'#000+ + '09034_X_Stack space commited: $1 bytes'#000+ + '10000_T_Unitsea','rch: $1'#000+ '10001_T_PPU Loading $1'#000+ '10002_U_PPU Name: $1'#000+ '10003_U_PPU Flags: $1'#000+ @@ -605,265 +603,266 @@ const msgtxt : array[0..000157,1..240] of char=( '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+ + '10008_U_PPU Invalid Version $1'#000+ + '10009_U_PPU is com','piled 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+ '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+ + '10015_F_unexpected end of PPU-File'#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+ '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+ + '10022_F_Can'#039't find unit $1'#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+ '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+ + '10027_U_Load from $1 ($2) unit $3'#000+ + '10028_U_Recompiling $1, checksum c','hanged for $2'#000+ '10029_U_Recompiling $1, source found only'#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 un','it, obj and asm are older than ppufile'#000+ - '10033_U_Recompiling unit, obj is older than asm'#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+ '10036_U_Second load for unit $1'#000+ '10037_U_PPU Check file $1 time $2'#000+ - '10038_H_Conditiona','l $1 was not set at startup in last compilation of'+ + '10038_H_Conditional $1 was not set at startup in last compilat','ion of'+ ' $2'#000+ '10039_H_Conditional $1 was set at startup in last compilation of $2'#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+ - '100','42_U_Using a unit which was not compiled with correct FPU mode'#000+ + '10042_U_Using a unit which was not compiled wit','h correct FPU mode'#000+ '10043_U_Loading interface units from $1'#000+ '10044_U_Loading implementation units from $1'#000+ '10045_U_Interface CRC changed for unit $1'#000+ '10046_U_Implementation CRC changed for unit $1'#000+ - '100','47_U_Finished compiling unit $1'#000+ - '10048_U_Add dependency of $1 to $2'#000+ + '10047_U_Finished compiling unit $1'#000+ + '10048_U_Add ','dependency 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+ '10052_U_Forced reloading'#000+ '10053_U_Previous state of $1: $2'#000+ - '10054','_U_Already compiling $1, setting second compile'#000+ + '10054_U_Already compiling $1, setting second comp','ile'#000+ '10055_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+ '10059_U_Skipping re-resolving unit $1, still loading used units'#000+ - '11000_$1 [','options] [options]'#000+ - '11001_W_Only one source file supported'#000+ + '11000_$1 [options] [options]'#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+ - '11005_N_No option inside $1 conf','ig file'#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+ - '11012_W_Shared libs not supp','orted on DOS platform, reverting to stat'+ - 'ic'#000+ - '11013_F_too many IF(N)DEFs'#000+ + '11012_W_Shared libs not supported on DOS platform, reverting to static'+ + #000+ + '1','1013_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+ - '11017_H_Try recompiling w','ith -dGDB'#000+ - '11018_E_You are using the obsolete switch $1'#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+ '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 from file $1'#000+ + '1102','6_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+ - '11031_H_End of reading ','config file $1'#000+ - '11032_D_interpreting option "$1"'#000+ + '11031_H_End of reading config file $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+ '11035_D_found source file name "$1"'#000+ '11037_D_Defining symbol $1'#000+ - '11038_D_Undefin','ing symbol $1'#000+ + '11038_D_Undefining symbol $1'#000+ '11039_E_Unknown code page'#000+ - '11023_Free Pascal Compiler version $FPCVERSION [$FPCDATE] for $FPCCPU'#010+ + '1102','3_Free Pascal Compiler version $FPCVERSION [$FPCDATE] for $FPCCP'+ + 'U'#010+ 'Copyright (c) 1993-2004 by Florian Klaempfl'#000+ '11024_Free Pascal Compiler version $FPCVERSION'#010+ #010+ 'Compiler Date : $FPCDATE'#010+ - 'Compiler',' CPU Target: $FPCCPU'#010+ + 'Compiler CPU Target: $FPCCPU'#010+ #010+ 'Supported targets:'#010+ - ' $OSTARGETS'#010+ + ' $','OSTARGETS'#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+ ' bugrep@freepascal.org'#000+ - '11025_**0*_put + af','ter a boolean switch option to enable it, - to di'+ + '11025_**0*_put + after a boolean switch option to enable it, - ','to di'+ 'sable it'#010+ '**1a_the compiler doesn'#039't delete the generated assembler file'#010+ '**2al_list sourcecode lines in assembler 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+ + '*L2ap_use pipes instead of creating temporary assembler files'#010+ + '**2ar_list regist','er allocation/release info in assembler file'#010+ '**2at_list temp allocation/release info in assembler file'#010+ '**1A_output format:'#010+ '**2Adefault_use default assembler'#010+ '3*2Aas_assemble using GNU AS'#010+ - '3*2Anas','mcoff_coff (Go32v2) file using Nasm'#010+ - '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+ + '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+ + '3*2Anasm','elf_elf32 (Linux) file using Nasm'#010+ '3*2Anasmwin32_Win32 object file using Nasm'#010+ '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+ '3*2Awasm_obj file using Wasm (Watcom)'#010+ - '3*2Anasmobj_obj file using Nasm'#010, + '3*2Anasmobj_obj file using Nasm'#010+ '3*2Amasm_obj file using Masm (Microsoft)'#010+ - '3*2Atasm_obj file using Tasm (Borland)'#010+ + '3*2','Atasm_obj file using Tasm (Borland)'#010+ '3*2Aelf_elf32 (Linux) using internal writer'#010+ '3*2Acoff_coff (Go32v2) using internal writer'#010+ '3*2Apecoff_pecoff (Win32) using internal writer'#010+ - '4*2Aas_assemble using G','NU AS'#010+ + '4*2Aas_assemble using GNU AS'#010+ '6*2Aas_Unix o-file using GNU AS'#010+ - '6*2Agas_GNU Motorola assembler'#010+ + '6*2Aga','s_GNU Motorola assembler'#010+ '6*2Amit_MIT Syntax (old GAS)'#010+ '6*2Amot_Standard Motorola assembler'#010+ 'A*2Aas_assemble using GNU AS'#010+ 'P*2Aas_assemble using GNU AS'#010+ 'S*2Aas_assemble using GNU AS'#010+ - '**1b_generate brows','er info'#010+ + '**1b_generate browser info'#010+ '**2bl_generate local symbol info'#010+ - '**1B_build all modules'#010+ + '**1','B_build all modules'#010+ '**1C_code generation options:'#010+ '**2Cc_set default calling convention to '#010+ '**2CD_create also dynamic library (not supported)'#010+ - '**2Ce_Compilation with emulated floating point',' opcodes'#010+ - '**2Cf_Select fpu instruction set to use to '#010+ + '**2Ce_Compilation with emulated floating point opcodes'#010+ + '**2Cf_Select fpu instruction set',' to use to '#010+ '**2Cg_Generate PIC code'#010+ '**2Ch_ 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 checkin','g'#010+ + '**2Cr_range checking'#010+ '**2CR_verify object method call validity'#010+ - '**2Cs_set stack size to '#010+ + '*','*2Cs_set stack size to '#010+ '**2Ct_stack checking'#010+ '**2CX_create also smartlinked library'#010+ '**1d_defines the symbol '#010+ '**1D_generate a DEF file'#010+ '**2Dd_set description to '#010+ - '**2Dv_set DLL ve','rsion to '#010+ + '**2Dv_set DLL version to '#010+ '*O2Dw_PM application'#010+ - '**1e_set path to executable'#010+ + '**1e_se','t path to executable'#010+ '**1E_same as -Cn'#010+ '**1F_set file names and paths:'#010+ '**2Fc_sets input codepage to '#010+ '**2FD_sets the directory where to search for compiler utilities'#010+ - '**2Fe_redirect err','or output to '#010+ - '**2FE_set exe/unit output path to '#010+ + '**2Fe_redirect error output to '#010+ + '**2FE_set exe/unit outpu','t path to '#010+ '**2Fi_adds to include path'#010+ '**2Fl_adds to library path'#010+ '**2FL_uses as dynamic linker'#010+ '**2Fo_adds to object path'#010+ '**2Fr_load error message file '#010+ - '**2Fu','_adds to unit path'#010+ - '**2FU_set unit output path to , overrides -FE'#010+ + '**2Fu_adds to unit path'#010+ + '**2FU_set unit out','put path to , overrides -FE'#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+ - '*g2gl_use l','ine info unit to show more info for backtraces'#010+ + '*g2gl_use line info unit to show more info for backtrac','es'#010+ '*g2gv_generates programs tracable with valgrind'#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+ - '**2iSP_re','turn compiler processor'#010+ - '**2iTO_return target OS'#010+ + '**2iSP_return compiler processor'#010+ + '**2iTO_return target',' OS'#010+ '**2iTP_return target processor'#010+ '**1I_adds to include path'#010+ '**1k_Pass to the linker'#010+ '**1l_write logo'#010+ '**1M_set language mode to '#010+ '**2Mfpc_free pascal dialect (default)'#010+ - '**2Mobjfpc','_switch some Delphi 2 extensions on'#010+ - '**2Mdelphi_tries to be Delphi compatible'#010+ + '**2Mobjfpc_switch some Delphi 2 extensions on'#010+ + '**2Mdelp','hi_tries to be Delphi 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 d','efault config file'#010+ - '**1o_change the name of the executable produced to '#010+ + '**1n_don'#039't read the default config file'#010+ + '**1o_change the name o','f the executable produced to '#010+ '**1O_optimizations:'#010+ '3*2Og_generate smaller code'#010+ '3*2OG_generate faster code (default)'#010+ '**2Or_keep certain variables in registers'#010+ - '3*2Ou_enable uncertain optimizati','ons (see docs)'#010+ - '3*2O1_level 1 optimizations (quick optimizations)'#010+ + '3*2Ou_enable uncertain optimizations (see docs)'#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*2Op_target processor:'#010+ - '3*3Op1_set target processor to 38','6/486'#010+ - '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+ + '3*3Op1_set target processor to 386/486'#010+ + '3*3Op2_set target processor to Pentium','/PentiumMMX (tm)'#010+ '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+ '6*2Og_generate smaller code'#010+ '6*2OG_generate faster code (default)'#010+ '6*2Ox_optimize maximum (still BUGGY!!!)'#010+ - '6*2O0_set target pro','cessor to a MC68000'#010+ - '6*2O2_set target processor to a MC68020+ (default)'#010+ + '6*2O0_set target processor to a MC68000'#010+ + '6*2O2_set target process','or to a MC68020+ (default)'#010+ '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+ '**1R_assembler reading style:'#010+ '**2Rdefault_use default assembler'#010+ '3*2Ratt_read AT&T style assembler'#010+ - '3*2Rinte','l_read Intel style assembler'#010+ - '6*2RMOT_read motorola style assembler'#010+ + '3*2Rintel_read Intel style assembler'#010+ + '6*2RMOT_read mo','torola style assembler'#010+ '**1S_syntax options:'#010+ '**2S2_same as -Mobjfpc'#010+ '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+ '**2Sa_include assertion code.'#010+ '**2Sd_same as -Mdelphi'#010+ - '**2Se_compiler stops',' after the errors (default is 1)'#010+ - '**2Sg_allow LABEL and GOTO'#010+ + '**2Se_compiler stops after the errors (default is 1)'#010+ + '**2Sg_a','llow LABEL and GOTO'#010+ '**2Sh_Use ansistrings'#010+ '**2Si_support C++ styled INLINE'#010+ '**2SI_set interface style to '#010+ '**3SIcom COM compatible interface (default)'#010+ '**3SIcorba CORBA compatible interface'#010+ - '**2S','m_support macros like C (global)'#010+ - '**2So_same as -Mtp'#010+ + '**2Sm_support macros 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+ '**2St_allow static keyword in objects'#010+ '**1s_don'#039't call assembler and linker'#010+ - '**2sh_Generate script to link o','n host'#010+ - '**2st_Generate script to link on target'#010+ + '**2sh_Generate script to link on host'#010+ + '**2st_Generate script to link on targ','et'#010+ '**2sr_Skip register allocation phase (use with -alr)'#010+ '**1T_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 DO','S extender'#010+ + '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ '3*2Tlinux_Linux'#010+ - '3*2Tnetbsd_NetBSD'#010+ + '3*2Tnetbsd_NetBSD',#010+ '3*2Tnetware_Novell Netware Module (clib)'#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*2Twatcom_Watcom compatible DOS extender'#010+ '3*2Twdosx_WDOSX DOS extender'#010+ - '3*2Twin32_Windows 32 Bit'#010+ + '3*2Twin32_Wind','ows 32 Bit'#010+ '4*2Tlinux_Linux'#010+ '6*2Tamiga_Commodore Amiga'#010+ '6*2Tatari_Atari ST/STe/TT'#010+ @@ -871,8 +870,8 @@ const msgtxt : array[0..000157,1..240] of char=( '6*2Tmacos_Macintosh m68k (not supported)'#010+ '6*2Tpalmos_PalmOS'#010+ 'A*2Tlinux_Linux'#010+ - 'P*2Tdarwin_Darwin and ','MacOS X on PowerPC'#010+ - 'P*2Tlinux_Linux on PowerPC'#010+ + 'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+ + 'P*2Tlinux_Linux on PowerP','C'#010+ 'P*2Tmacos_MacOS (classic) on PowerPC'#010+ 'P*2Tmorphos_MorphOS'#010+ 'S*2Tlinux_Linux'#010+ @@ -880,41 +879,40 @@ const msgtxt : array[0..000157,1..240] of char=( '**1U_unit options:'#010+ '**2Un_don'#039't check the unit name'#010+ '**2Ur_generate release unit files'#010+ - '**2','Us_compile a system unit'#010+ - '**1v_Be verbose. is a combination of the following letters:'#010+ + '**2Us_compile a system unit'#010+ + '**1v_Be verbose.',' 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 macros'#010+ + '**2*_n : Show notes t : Show tried/used files'#010+ + '**2*_h : Show hi','nts 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*_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 o','f debugging info'#010+ - '3*1W_Win32-like target options'#010+ + '**1V_write fpcdebug.txt file with lots of debugging info'#010+ + '3*1W_Win32-like target o','ptions'#010+ '3*2WB_Set Image base to Hexadecimal 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*2WG_Specify graphic type application'#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*2WR_Generate relocation code'#010+ 'P*2WC_Specify console type application (MacOS only)'#010+ - 'P*2WG_Specify graphic type application (MacOS on','ly)'#010+ - 'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+ + 'P*2WG_Specify graphic type application (MacOS only)'#010+ + 'P*2WT_Specify tool type application (MPW',' tool, MacOS only)'#010+ '**1X_executable options:'#010+ '**2Xc_link with the c library'#010+ '**2Xd_don'#039't use standard library search path (needed for cross com'+ 'pile)'#010+ - '**2XD_try to link units dynamic (defines ','FPC_LINK_DYNAMIC)'#010+ - '**2XP_prepend the binutils names with the prefix '#010+ + '**2XD_try to link units dynamic (defines FPC_LINK_DYNAMIC)'#010+ + '**2XP_prepend the binut','ils names with the prefix '#010+ '**2Xr_set library search path to (needed for cross compile)'#010+ '**2Xs_strip all symbols from executable'#010+ - '**2XS_try to link units static (default) (defines FPC_LINK_','STATIC)'#010+ - '**2Xt_link with static libraries (-static is passed to linker)'#010+ + '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+ + '**2Xt_link with static libraries (-s','tatic is passed to linker)'#010+ '**2XX_try to link units smart (defines FPC_LINK_SMART)'#010+ '**1*_'#010+ '**1?_shows this help'#010+ diff --git a/compiler/ncgutil.pas b/compiler/ncgutil.pas index 387a72c045..343a3e9be4 100644 --- a/compiler/ncgutil.pas +++ b/compiler/ncgutil.pas @@ -69,6 +69,8 @@ interface procedure gen_load_para_value(list:TAAsmoutput); procedure gen_load_return_value(list:TAAsmoutput); + procedure gen_external_stub(list:taasmoutput;pd:tprocdef;const externalname:string); + {# Allocate the buffers for exception management and setjmp environment. Return a pointer to these buffers, send them to the utility routine @@ -1846,6 +1848,23 @@ implementation end; +{**************************************************************************** + External handling +****************************************************************************} + + procedure gen_external_stub(list:taasmoutput;pd:tprocdef;const externalname:string); + begin + { add the procedure to the codesegment } + maybe_new_object_file(list); + new_section(list,sec_code,lower(pd.mangledname),aktalignment.procalign); + list.concat(Tai_align.create(aktalignment.procalign)); + if (po_global in pd.procoptions) then + list.concat(Tai_symbol.createname_global(pd.mangledname,AT_FUNCTION,0)) + else + list.concat(Tai_symbol.createname(pd.mangledname,AT_FUNCTION,0)); + cg.a_jmp_name(list,externalname); + end; + {**************************************************************************** Const Data ****************************************************************************} @@ -2307,7 +2326,10 @@ implementation end. { $Log$ - Revision 1.249 2004-12-11 12:42:28 jonas + Revision 1.250 2004-12-15 16:00:16 peter + * external is again allowed in implementation + + Revision 1.249 2004/12/11 12:42:28 jonas * fixed synchronising 64bit regvars on 32bit systems at the start and end of procedures * hack for ppc for loading of paras from their callee location to local diff --git a/compiler/nutils.pas b/compiler/nutils.pas index 38bebda136..6180d7aa4b 100644 --- a/compiler/nutils.pas +++ b/compiler/nutils.pas @@ -493,10 +493,16 @@ implementation subscriptn, blockn: p := tunarynode(p).left; - derefn, - { may be more complex in some cases } + derefn : + begin + inc(result); + if (result = NODE_COMPLEXITY_INF) then + exit; + p := tunarynode(p).left; + end; typeconvn: begin + { may be more complex in some cases } if not(ttypeconvnode(p).convtype in [tc_equal,tc_int_2_int,tc_bool_2_bool,tc_real_2_real,tc_cord_2_pointer]) then inc(result); if (result = NODE_COMPLEXITY_INF) then @@ -545,7 +551,10 @@ end. { $Log$ - Revision 1.26 2004-12-15 15:27:03 jonas + Revision 1.27 2004-12-15 16:00:16 peter + * external is again allowed in implementation + + Revision 1.26 2004/12/15 15:27:03 jonas * fixed foreachnode(static) for case nodes (fixes inlining of case statements) diff --git a/compiler/pdecsub.pas b/compiler/pdecsub.pas index 988316a034..7e736b933e 100644 --- a/compiler/pdecsub.pas +++ b/compiler/pdecsub.pas @@ -47,6 +47,7 @@ interface procedure insert_funcret_local(pd:tprocdef); function proc_add_definition(var pd:tprocdef):boolean; + function proc_get_importname(pd:tprocdef):string; procedure proc_set_mangledname(pd:tprocdef); procedure handle_calling_convention(pd:tabstractprocdef); @@ -1384,7 +1385,7 @@ const pooption : [po_external]; mutexclpocall : [pocall_internproc,pocall_inline,pocall_syscall]; mutexclpotype : [potype_constructor,potype_destructor]; - mutexclpo : [po_exports,po_interrupt,po_assembler] + mutexclpo : [po_public,po_exports,po_interrupt,po_assembler] ),( idtok:_FAR; pd_flags : [pd_implemen,pd_body,pd_interface,pd_procvar,pd_notobject,pd_notobjintf]; @@ -1798,61 +1799,78 @@ const + function proc_get_importname(pd:tprocdef):string; + begin + result:=''; + if not(po_external in pd.procoptions) then + internalerror(200412151); + { import by number? } + if pd.import_nr<>0 then + begin + { Nothing to do } + end + else + { external name specified } + if assigned(pd.import_name) then + begin + { Win32 imports need to use the normal name since to functions + can refer to the same DLL function. This is also needed for compatability + with Delphi and TP7 } + if not( + assigned(pd.import_dll) and + (target_info.system in [system_i386_win32,system_i386_wdosx, + system_i386_emx,system_i386_os2]) + ) then + begin + if not(pd.proccalloption in [pocall_cdecl,pocall_cppdecl]) then + result:=pd.import_name^ + else + result:=target_info.Cprefix+pd.import_name^; + end; + end + else + begin + { Default names when importing variables } + case pd.proccalloption of + pocall_cdecl : + begin + if assigned(pd._class) then + result:=target_info.Cprefix+pd._class.objrealname^+'_'+pd.procsym.realname + else + result:=target_info.Cprefix+pd.procsym.realname; + end; + pocall_cppdecl : + begin + result:=target_info.Cprefix+pd.cplusplusmangledname; + end; + else + begin + {In MacPas a single "external" has the same effect as "external name 'xxx'" } + if (m_mac in aktmodeswitches) then + result:=tprocdef(pd).procsym.realname; + end; + end; + end; + end; + + procedure proc_set_mangledname(pd:tprocdef); + var + s : string; begin { When the mangledname is already set we aren't allowed to change it because it can already be used somewhere (PFV) } if not(po_has_mangledname in pd.procoptions) then begin - { External Procedures } if (po_external in pd.procoptions) then begin - { import by number? } - if pd.import_nr<>0 then + { External Procedures are only allowed to change the mangledname + in their first declaration } + if (pd.forwarddef or (not pd.hasforward)) then begin - { Nothing to do } - end - else - { external name specified } - if assigned(pd.import_name) then - begin - { Win32 imports need to use the normal name since to functions - can refer to the same DLL function. This is also needed for compatability - with Delphi and TP7 } - if not( - assigned(pd.import_dll) and - (target_info.system in [system_i386_win32,system_i386_wdosx, - system_i386_emx,system_i386_os2]) - ) then - begin - if not(pd.proccalloption in [pocall_cdecl,pocall_cppdecl]) then - pd.setmangledname(pd.import_name^) - else - pd.setmangledname(target_info.Cprefix+pd.import_name^); - end; - end - else - begin - { Default names when importing variables } - case pd.proccalloption of - pocall_cdecl : - begin - if assigned(pd._class) then - pd.setmangledname(target_info.Cprefix+pd._class.objrealname^+'_'+pd.procsym.realname) - else - pd.setmangledname(target_info.Cprefix+pd.procsym.realname); - end; - pocall_cppdecl : - begin - pd.setmangledname(target_info.Cprefix+pd.cplusplusmangledname); - end; - else - begin - {In MacPas a single "external" has the same effect as "external name 'xxx'" } - if (m_mac in aktmodeswitches) then - tprocdef(pd).setmangledname(tprocdef(pd).procsym.realname); - end; - end; + s:=proc_get_importname(pd); + if s<>'' then + pd.setmangledname(s); end; end else @@ -2188,21 +2206,7 @@ const { Forward declaration is external? } if (po_external in hd.procoptions) then - MessagePos(pd.fileinfo,parser_e_proc_already_external) - else - { Body declaration is external? } - if (po_external in pd.procoptions) then - begin - { Win32 supports declaration in interface and external in - implementation for dll imports. Support this for backwards - compatibility with Tp7 and Delphi } - if not( - (target_info.system in [system_i386_win32,system_i386_wdosx, - system_i386_emx,system_i386_os2]) and - assigned(pd.import_dll) - ) then - MessagePos(pd.fileinfo,parser_e_proc_no_external_allowed); - end; + MessagePos(pd.fileinfo,parser_e_proc_already_external); { Check parameters } if (m_repeat_forward in aktmodeswitches) or @@ -2344,7 +2348,10 @@ const end. { $Log$ - Revision 1.218 2004-12-07 16:11:52 peter + Revision 1.219 2004-12-15 16:00:16 peter + * external is again allowed in implementation + + Revision 1.218 2004/12/07 16:11:52 peter * set vo_explicit_paraloc flag Revision 1.217 2004/12/05 12:28:11 peter diff --git a/compiler/psub.pas b/compiler/psub.pas index c26dbab804..714ab56f4e 100644 --- a/compiler/psub.pas +++ b/compiler/psub.pas @@ -1074,6 +1074,7 @@ implementation PROCEDURE/FUNCTION PARSING ****************************************************************************} + procedure check_init_paras(p:tnamedindexitem;arg:pointer); begin if tsym(p).typ<>paravarsym then @@ -1115,6 +1116,7 @@ implementation pdflags : tpdflags; pd : tprocdef; isnestedproc : boolean; + s : string; begin { save old state } oldconstsymtable:=constsymtable; @@ -1271,6 +1273,22 @@ implementation { Handle imports } if (po_external in pd.procoptions) then begin + { External declared in implementation, and there was already a + forward (or interface) declaration then we need to generate + a stub that calls the external routine } + if (not pd.forwarddef) and + (pd.hasforward) and + not( + assigned(pd.import_dll) and + (target_info.system in [system_i386_win32,system_i386_wdosx, + system_i386_emx,system_i386_os2]) + ) then + begin + s:=proc_get_importname(pd); + if s<>'' then + gen_external_stub(codesegment,pd,s); + end; + { Import DLL specified? } if assigned(pd.import_dll) then begin @@ -1288,9 +1306,9 @@ implementation end else begin - { add mangledname to external list for DLL scanning } + { add import name to external list for DLL scanning } if target_info.DllScanSupported then - current_module.externals.insert(tExternalsItem.create(pd.mangledname)); + current_module.externals.insert(tExternalsItem.create(proc_get_importname(pd))); end; end; end; @@ -1427,7 +1445,10 @@ implementation end. { $Log$ - Revision 1.222 2004-12-05 12:28:11 peter + Revision 1.223 2004-12-15 16:00:16 peter + * external is again allowed in implementation + + Revision 1.222 2004/12/05 12:28:11 peter * procvar handling for tp procvar mode fixed * proc to procvar moved from addrnode to typeconvnode * inlininginfo is now allocated only for inline routines that