diff --git a/compiler/htypechk.pas b/compiler/htypechk.pas index b887440abf..1a34cfbc39 100644 --- a/compiler/htypechk.pas +++ b/compiler/htypechk.pas @@ -160,7 +160,7 @@ interface function allowenumop(nt:tnodetype):boolean; - procedure check_hints(const srsym: tsym; const symoptions: tsymoptions); + procedure check_hints(const srsym: tsym; const symoptions: tsymoptions; const deprecatedmsg : pshortstring); procedure check_ranges(const location: tfileposinfo; source: tnode; destdef: tdef); @@ -2605,12 +2605,15 @@ implementation end; - procedure check_hints(const srsym: tsym; const symoptions: tsymoptions); + procedure check_hints(const srsym: tsym; const symoptions: tsymoptions; const deprecatedmsg : pshortstring); begin if not assigned(srsym) then internalerror(200602051); if sp_hint_deprecated in symoptions then - Message1(sym_w_deprecated_symbol,srsym.realname); + if (sp_has_deprecated_msg in symoptions) and (deprecatedmsg <> nil) then + Message2(sym_w_deprecated_symbol_with_msg,srsym.realname,deprecatedmsg^) + else + Message1(sym_w_deprecated_symbol,srsym.realname); if sp_hint_experimental in symoptions then Message1(sym_w_experimental_symbol,srsym.realname); if sp_hint_platform in symoptions then diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 48964af622..8dca62adab 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -1513,7 +1513,7 @@ type_w_zero_to_nil=04090_W_Converting 0 to NIL # # Symtable # -# 05065 is the last used one +# 05066 is the last used one # % \section{Symbol handling} % This section lists all the messages that concern the handling of symbols. @@ -1688,6 +1688,11 @@ sym_w_library_symbol=05065_W_Symbol "$1" is belongs to a library % This means that a symbol (a variable, routine, etc...) which is % declared as \var{library} is used. Library symbols may not be % available in other libraries. +sym_w_deprecated_symbol_with_msg=05066_W_Symbol "$1" is deprecated: "$2" +% This means that a symbol (a variable, routine, etc...) which is +% declared as \var{deprecated} is used. Deprecated symbols may no longer +% be available in newer versions of the unit / library. Use of this symbol +% should be avoided as much as possible. % \end{description} # # Codegenerator diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 5013c64a49..99725fce33 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -478,6 +478,7 @@ const sym_w_experimental_symbol=05063; sym_w_forward_not_resolved=05064; sym_w_library_symbol=05065; + sym_w_deprecated_symbol_with_msg=05066; cg_e_parasize_too_big=06009; cg_e_file_must_call_by_reference=06012; cg_e_cant_use_far_pointer_there=06013; @@ -799,9 +800,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 52046; + MsgTxtSize = 52086; MsgIdxMax : array[1..20] of longint=( - 24,87,258,91,66,50,108,22,202,62, + 24,87,258,91,67,50,108,22,202,62, 48,20,1,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 67fe4e4419..2643b45497 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const msgtxt : array[0..000216] of string[240]=( +const msgtxt : array[0..000217] of string[240]=( {$else Delphi} -const msgtxt : array[0..000216,1..240] of char=( +const msgtxt : array[0..000217,1..240] of char=( {$endif Delphi} '01000_T_Compiler: $1'#000+ '01001_D_Compiler OS: $1'#000+ @@ -546,378 +546,380 @@ const msgtxt : array[0..000216,1..240] of char=( '05063_W_Symbol "$1" is experimental'#000+ '05064_W_Forward declaration "$1" not resolved, assumed external'#000+ '05065_W_Symbol "$1" is belongs to a library'#000+ + '05066_W_Symbol "$1" is deprecated: "$2"'#000+ '06009_E_Parameter list size exceeds 65535 bytes'#000+ - '06012_E_File types must be var parameters'#000+ - '0','6013_E_The use of a far pointer isn'#039't allowed there'#000+ + '060','12_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 code'#000+ - '06018_W_unreachable code'#000+ - '06020_E_Abstract methods can'#039,'t be called directly'#000+ + '06018_W_unreac','hable code'#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 acc'+ - 'essed, use (set)length instead'#000+ + '06033_E_No code for inli','ne procedure stored'#000+ + '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+ + 'sed, use (set)length instead'#000+ '06037_E_Constructors or destructors can not be called inside a '#039'wi'+ 'th'#039' clause'#000+ - '06038_E_Cannot call message handler methods directly'#000+ - '06039_E_Jump in or outside of an ex','ception block'#000+ + '06038_E_Cannot call message handler methods dire','ctly'#000+ + '06039_E_Jump in or outside of an exception block'#000+ '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+ '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+ '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+ - '06043_E_Local variables size exceeds supporte','d limit'#000+ + '06043','_E_Local variables size exceeds supported limit'#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+ - '06047_F_Cannot find system type "$1". Check if you use the correct run'+ - ' time library.'#000+ - '06048_H_In','herited call to abstract method ignored'#000+ + '06047_F_Cannot find system type "$1". Check if you use ','the correct r'+ + 'un time library.'#000+ + '06048_H_Inherited call to abstract method ignored'#000+ '06049_E_Goto label "$1" not defined or optimized away'#000+ '07000_DL_Starting $1 styled assembler parsing'#000+ '07001_DL_Finished $1 styled assembler parsing'#000+ - '07002_E_Non-label pattern contains @'#000+ - '07004_E_Error bui','lding record offset'#000+ + '07002_E_Non-la','bel 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 relo','catable symbols'#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+ '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/la','bels 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+ + '07020_E_Multiple index register usa','ge'#000+ '07021_E_Invalid operand type'#000+ - '07022_E_','Invalid string as opcode operand: $1'#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+ '07025_E_Divide by zero in asm evaluator'#000+ '07026_E_Illegal expression'#000+ - '07027_E_escape sequence ignored: $1'#000+ - '07028_E_Invalid ','symbol reference'#000+ + '07027_E_esca','pe 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+ '07031_W_ENTER instruction is not supported by Linux kernel'#000+ - '07032_W_Calling an overload function in assembler'#000+ - '07033_E_Unsu','pported symbol type for operand'#000+ + '07032_W_Calling an ove','rload 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+ - '07039_H_$1 translated to $','2'#000+ + '07038_E_Error converting h','exadecimal $1'#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+ - '07043_W_Procedures can'#039't return any value in asm code'#000+ + '07043_W_Procedures can'#039't return any value in asm code',#000+ '07044_E_SEG not supported'#000+ - '07045_E_Size ','suffix and destination or source size do not match'#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+ '07047_E_Assembler syntax error'#000+ '07048_E_Invalid combination of opcode and operands'#000+ - '07049_E_Assembler syntax error in operand'#000+ - '0','7050_E_Assembler syntax error in constant'#000+ + '070','49_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+ '07053_E_Unrecognized opcode $1'#000+ - '07054_E_Invalid or missing opcode'#000+ - '07055_E_Invalid combination o','f prefix and opcode: $1'#000+ + '07054_E_Invalid or miss','ing opcode'#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 symbol $1'#000+ - '07062_E_Unknown la','bel identifier $1'#000+ + '07061_E_Unde','fined 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+ '07067_E_Invalid floating point constant $1'#000+ - '07068_E_Invalid floating point expression'#000+ + '07068_E_Invalid floating point expr','ession'#000+ '07069_E_Wrong symbol type'#000+ - '07070_E','_Cannot index a local var or parameter with a register'#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+ '07073_E_Strings not allowed as constants'#000+ - '07074_No type of variable specified'#000+ - '07075_E_assembler code n','ot returned to text section'#000+ + '07074_No type of var','iable 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+ - '07080_N_.align is target spec','ific, use .balign or .p2align'#000+ + '07079_W_32bit constant created f','or address'#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+ - '07083_E_No size specified and unable to determine the size of the oper'+ - 'ands'#000+ - '07084_E_Cannot use RESULT i','n this function'#000+ + '07083_E_No size specified and unable to determine the size of ','the op'+ + 'erands'#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+ '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+ + '07089_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+ '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'+ + '07098_W_No size speci','fied and unable to determine the size of the op'+ 'erands, using DWORD as default'#000+ '07099_E_Syntax error while trying to parse a shifter operand'#000+ '07100_E_Address of packed component is not at a byte boundary'#000+ - '07101_W_No size specified and unable to determine the size of the oper'+ - 'ands, usi','ng BYTE as default'#000+ + '07101_W_No size specified and unable to',' determine the size of the op'+ + 'erands, using BYTE as default'#000+ '07102_W_Use of +offset(%ebp) for parameters invalid here'#000+ '07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+ #000+ - '07104_W_Use of -offset(%ebp) is not recommended for local variable acc'+ - 'ess'#000+ - '07105_W_Use of -off','set(%esp), access may cause a crash or value may '+ - 'be lost'#000+ + '07104_W_Use of -offset(%ebp) is not recommended for l','ocal variable a'+ + 'ccess'#000+ + '07105_W_Use of -offset(%esp), access may cause a crash or value may be'+ + ' lost'#000+ '07106_E_VMTOffset must be used in combination with a virtual method, a'+ 'nd "$1" is not virtual'#000+ - '07107_E_Generating PIC, but reference is not PIC-safe'#000+ + '07107_E_Generating PIC, but reference is not PIC-s','afe'#000+ '08000_F_Too many assembler files'#000+ - '080','01_F_Selected assembler output not supported'#000+ + '08001_F_Selected assembler output not supported'#000+ '08002_F_Comp not supported'#000+ '08003_F_Direct not support for binary writers'#000+ '08004_E_Allocating of data is only allowed in bss section'#000+ - '08005_F_No binary writer selected'#000+ - '08006_E_Asm: Opcode $1 not in ','table'#000+ + '08005_F_No 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+ - '08011_E_Asm: $1 value exceeds bounds $2'#000+ - '08012_','E_Asm: Short jump is out of range $1'#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: Extended type not supported for this target'#000+ - '08016_E_Asm: Duplicate label $1'#000+ - '08017_E_Asm: Redefined label ','$1'#000+ + '08016_E_Asm: Duplicat','e 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+ '08021_E_Asm: 64 Bit operands not supported'#000+ - '09000_W_Source operating system redefined'#000+ + '09000_W_Source operating system redefi','ned'#000+ '09001_I_Assembling (pipe) $1'#000+ - '09002_E','_Can'#039't create assembler file: $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+ '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+ + '09006_T_Using assembler: $1',#000+ + '09007_E_Error while assembling exitcode $1'#000+ '09008_E_Can'#039't call the assembler, error $1 switching to external a'+ 'ssembling'#000+ '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+ - '0','9013_E_Error while linking'#000+ + '09012_W_Li','brary $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+ '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+ - '09019_E_','Creation of Dynamic/Shared Libraries not supported'#000+ + '09018_E_Creati','on of Executables not supported'#000+ + '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+ '09020_I_Closing script $1'#000+ '09021_E_resource compiler "$1" 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 l','i'+ - 'nking'#000+ + '09023_T_unit $1 can'#039't be',' statically linked, 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 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+ - '0','9028_D_Calling resource compiler "$1" with "$2" as command line'#000+ + '09027_E_un','it $1 can'#039't be shared or static linked'#000+ + '09028_D_Calling resource compiler "$1" with "$2" as command line'#000+ '09029_E_Error while compiling resources'#000+ '09030_E_Can'#039't call the resource compiler "$1", switching to extern'+ 'al mode'#000+ - '09031_E_Can'#039't open resource file "$1"'#000+ - '09032_E_Can'#039't write reso','urce file "$1"'#000+ + '09031_E_Can'#039't open res','ource file "$1"'#000+ + '09032_E_Can'#039't write resource file "$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+ - '09133_X_Stack space reserved: $1',' bytes'#000+ + '09132_X_Size of uninitialized data: $','1 bytes'#000+ + '09133_X_Stack space reserved: $1 bytes'#000+ '09134_X_Stack space committed: $1 bytes'#000+ '09200_F_Executable image size is too big for $1 target.'#000+ '09201_W_Object file "$1" contains 32-bit absolute relocation to symbol'+ ' "$2".'#000+ - '10000_T_Unitsearch: $1'#000+ + '10000_T_Unitsearch: ','$1'#000+ '10001_T_PPU Loading $1'#000+ - '10002_U_PPU Na','me: $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+ '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+ - '10010_U_PPU is co','mpiled for an other target'#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+ '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+ - '10017_F_PPU Dbx count problem'#000+ - '10018_E_Ill','egal unit name: $1'#000+ + '1','0017_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 used by $2'#000+ - '10023_W_Unit $1 was not found but $2 exists'#000+ - '10024_F_Unit $','1 searched but $2 found'#000+ + '10023_W_Unit $1 wa','s 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+ - '10029_U_Recompiling ','$1, source found only'#000+ + '10028_U_Recompiling $1, chec','ksum changed 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 unit, 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+ - '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+ - '10041_U_File $1 is newer than P','PU file $2'#000+ + '10040_W_Can'#039't recompile unit $1, but found modifed inclu','de files'+ + #000+ + '10041_U_File $1 is newer than PPU file $2'#000+ '10042_U_Trying to use a unit which was compiled with a different FPU m'+ 'ode'#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 c','hanged 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+ '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+ + '1','0052_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+ '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+ + '10059_U_Skip','ping re-resolving unit $1, still loading used units'#000+ '10060_U_Unloading resource unit $1 (not needed)'#000+ '10061_E_Unit $1 was compiled using a different whole program optimizat'+ - 'ion feedback input ($2, $3); recompile it without wpo or use the same '+ - 'wpo feedback input file for this compila','tion invocation'#000+ + 'ion feedback input ($2, $3); recompile it without wpo or use the same ', + 'wpo feedback input file for this compilation invocation'#000+ '11000_O_$1 [options] [options]'#000+ '11001_W_Only one source file supported, changing source file to compil'+ 'e from "$1" into "$2"'#000+ '11002_W_DEF file can be created only for OS/2'#000+ - '11003_E_nested response files are not suppo','rted'#000+ + '110','03_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+ '11008_F_Too many config files nested'#000+ - '11009_F_Unable to open file $1'#000+ - '11010_D_Reading further ','options from $1'#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 supported on DOS platform, reverting to static'+ #000+ '11013_F_In options file $1 at line $2 too many \var{\#IF(N)DEFs} encou'+ - 'ntered'#000+ - '11014_F_In options file $1 at line $2 u','nexpected \var{\#ENDIFs} enco'+ - 'untered'#000+ + 'ntered',#000+ + '11014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} encoun'+ + 'tered'#000+ '11015_F_Open conditional at the end of the options file'#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 swit','ch $1'#000+ + '11017_H_Try recompiling with -dGDB',#000+ + '11018_W_You are using the obsolete switch $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+ '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+ - '11022_W_"$1" assembler use forced'#000+ - '11026_T_R','eading options from file $1'#000+ + '110','22_W_"$1" assembler use forced'#000+ + '11026_T_Reading options from file $1'#000+ '11027_T_Reading options from environment $1'#000+ '11028_D_Handling option "$1"'#000+ '11029_O_*** 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 f','ile $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+ '11039_E_Unknown code page'#000+ - '11040_F_Config file $1 is a directory'#000+ - '11041_W_Assembler output s','elected "$1" cannot generate debug info, d'+ - 'ebugging disabled'#000+ + '11040_F_Config file $1 i','s a directory'#000+ + '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+ + 'ugging disabled'#000+ '11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+ '11043_F_In options file $1 at line $2 \var{\#ELSE} directive without \'+ - 'var{\#IF(N)DEF} found'#000+ - '11044_F_Option "$1" ','is not, or not yet, supported on the current tar'+ - 'get platform'#000+ + 'va','r{\#IF(N)DEF} found'#000+ + '11044_F_Option "$1" is not, or not yet, supported on the current targe'+ + 't platform'#000+ '11045_F_The feature "$1" is not, or not yet, supported on the selected'+ ' target platform'#000+ - '11046_N_DWARF debug information cannot be used with smart linking on t'+ - 'his target, switching ','to static linking'#000+ + '11046_N_DWARF debug information cannot be used with ','smart linking on'+ + ' this target, switching to static linking'#000+ '11047_W_Option "$1" is ignored for the current target platform.'#000+ '12000_F_Cannot open whole program optimization feedback file "$1"'#000+ - '12001_D_Processing whole program optimization information in wpo feedb'+ - 'ack file "$1"'#000+ - '12002_D_','Finished processing the whole program optimization informati'+ - 'on in wpo feedback file "$1"'#000+ + '12001_D_Processing whole program optimization inform','ation in wpo fee'+ + 'dback file "$1"'#000+ + '12002_D_Finished processing the whole program optimization information'+ + ' in wpo feedback file "$1"'#000+ '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+ 'ck file'#000+ - '12004_W_No handler registered for whole program optimization section "'+ - '$2"',' at line $1 of wpo feedback file, ignoring'#000+ + '12004_W_No handler registered for',' whole program optimization section'+ + ' "$2" at line $1 of wpo feedback file, ignoring'#000+ '12005_D_Found whole program optimization section "$1" with information'+ ' about "$2"'#000+ '12006_F_The selected whole program optimizations require a previously '+ - 'generated feedback file (use -Fw to specify)'#000, + 'gener','ated feedback file (use -Fw to specify)'#000+ '12007_E_No collected information necessary to perform "$1" whole progr'+ 'am optimization found'#000+ '12008_F_Specify a whole program optimization feedback file to store th'+ 'e generated info in (using -FW)'#000+ - '12009_E_Not generating any whole program optim','ization information, y'+ + '12009_','E_Not generating any whole program optimization information, y'+ 'et a feedback file was specified (using -FW)'#000+ '12010_E_Not performing any whole program optimizations, yet an input f'+ 'eedback file was specified (using -Fw)'#000+ - '12011_D_Skipping whole program optimization section "$1", becaus','e no'+ + '12011_D_Skipping whole p','rogram optimization section "$1", because no'+ 't needed by the requested optimizations'#000+ '12012_W_Overriding previously read information for "$1" from feedback '+ 'input file using information in section "$2"'#000+ - '12013_E_Cannot extract symbol liveness information from program when s'+ - 'tripping sy','mbols, use -Xs-'#000+ + '12013_E_Cannot extract symbol liveness in','formation from program when'+ + ' stripping symbols, use -Xs-'#000+ '12014_E_Cannot extract symbol liveness information from program when w'+ 'hen not linking'#000+ '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+ 'n from linked program'#000+ - '12016_E_Error during reading symbol liveness i','nformation produced by'+ + '12016_','E_Error during reading symbol liveness information produced by'+ ' "$1"'#000+ '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+ 'ion from linked program'#000+ '12018_E_Collection of symbol liveness information can only help when u'+ - 'sing smart linking, use -CX -XX'#000+ - '12019_E_Cannot c','reate specified whole program optimisation feedback '+ - 'file "$1"'#000+ + 'sing sma','rt linking, use -CX -XX'#000+ + '12019_E_Cannot create specified whole program optimisation feedback fi'+ + 'le "$1"'#000+ '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+ 'CPU'#010+ 'Copyright (c) 1993-2009 by Florian Klaempfl'#000+ - '11024_Free Pascal Compiler version $FPCVERSION'#010+ + '11024_Free Pascal Co','mpiler version $FPCVERSION'#010+ #010+ - 'Compiler Dat','e : $FPCDATE'#010+ + 'Compiler Date : $FPCDATE'#010+ 'Compiler CPU Target: $FPCCPU'#010+ #010+ 'Supported targets:'#010+ @@ -929,10 +931,10 @@ const msgtxt : array[0..000216,1..240] of char=( 'Supported FPU instruction sets:'#010+ ' $FPUINSTRUCTIONSETS'#010+ #010+ - 'Supported ABI targets:'#010+ + 'Supported AB','I targets:'#010+ ' $ABITARGETS'#010+ #010+ - 'Supported Opti','mizations:'#010+ + 'Supported Optimizations:'#010+ ' $OPTIMIZATIONS'#010+ #010+ 'Supported Whole Program Optimizations:'#010+ @@ -942,8 +944,8 @@ const msgtxt : array[0..000216,1..240] of char=( 'Supported Microcontroller types:'#010+ ' $CONTROLLERTYPES'#010+ #010+ - 'This program comes under the GNU General Public Licence'#010+ - 'For more information read COPYING.FPC',#010+ + 'This program comes under the GNU General Public Licen','ce'#010+ + 'For more information read COPYING.FPC'#010+ #010+ 'Report bugs, suggestions, etc. to:'#010+ ' http://bugs.freepascal.org'#010+ @@ -951,192 +953,191 @@ const msgtxt : array[0..000216,1..240] of char=( ' bugs@freepascal.org'#000+ '11025_**0*_Put + after a boolean switch option to enable it, - to disa'+ 'ble it'#010+ - '**1a_The compiler doesn'#039't delete the gener','ated assembler file'#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+ - '**2at_List ','temp allocation/release info in assembler file'#010+ + '**2ar_List register allocation/re','lease 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*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+ - '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+ - '3*2Anasmwin32_Win32 ob','ject 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*2Awasm_Obj file using Wasm (Watcom)'#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*2Aelf_ELF (Linux) ','using internal writer'#010+ + '3*2Atasm_Obj file u','sing Tasm (Borland)'#010+ + '3*2Aelf_ELF (Linux) using internal writer'#010+ '3*2Acoff_COFF (Go32v2) using internal writer'#010+ '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+ '4*2Aas_Assemble using GNU AS'#010+ '6*2Aas_Unix o-file using GNU AS'#010+ - '6*2Agas_GNU Motorola assembler'#010+ + '6*2Agas_GNU Motorola as','sembler'#010+ '6*2Amit_MIT Syntax (old GAS)'#010+ - '6*2','Amot_Standard Motorola assembler'#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 browser info'#010+ '**2bl_Generate local symbol info'#010+ - '**1B_Build all modules'#010+ + '**1B_Build all modul','es'#010+ '**1C_Code generation options:'#010+ - '**2C','a_Select ABI, see fpc -i for possible values'#010+ + '**2Ca_Select ABI, see fpc -i for possible values'#010+ '**2Cb_Generate big-endian code'#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, see fpc -i for possible '+ - 'values'#010+ + '**2Ce_Compilation with e','mulated floating point opcodes'#010+ + '**2Cf_Select fpu instruction set to use, see fpc -i for possible va'+ + 'lues'#010+ '**2CF_Minimal floating point constant precision (default, 32, 64)'#010+ '**2Cg_Generate PIC code'#010+ - '**2Ch_ bytes heap (between 1023 and 67107840)'#010+ + '**2Ch_ bytes heap (between 1023 and',' 67107840)'#010+ '**2Ci_IO-checking'#010+ - '**2Cn_Omit ','linking stage'#010+ + '**2Cn_Omit linking stage'#010+ '**2Co_Check overflow of integer operations'#010+ '**2CO_Check for possible overflow of integer operations'#010+ '**2Cp_Select instruction set, see fpc -i for possible values'#010+ - '**2CP=_ packing settings'#010+ - '**3CPPACKSET=_ set alloca','tion: 0, 1 or DEFAULT or NORMAL, 2, '+ - '4 and 8'#010+ + '**2CP=_ packing s','ettings'#010+ + '**3CPPACKSET=_ set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+ + 'and 8'#010+ '**2Cr_Range checking'#010+ '**2CR_Verify object method call validity'#010+ '**2Cs_Set stack checking size to '#010+ '**2Ct_Stack checking (for testing only, see manual)'#010+ - '**2CX_Create also smartlinked library'#010+ - '**1d','_Defines the symbol '#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 version to '#010+ '*O2Dw_PM application'#010+ '**1e_Set path to executable'#010+ '**1E_Same as -Cn'#010+ - '**1fPIC_Same as -Cg'#010+ + '**1fPIC_Same as',' -Cg'#010+ '**1F_Set file names and paths:'#010+ - '*','*2Fa[,y]_(for a program) load units and [y] before uses is p'+ - 'arsed'#010+ + '**2Fa[,y]_(for a program) load units and [y] before uses is par'+ + 'sed'#010+ '**2Fc_Set input codepage to '#010+ '**2FC_Set RC compiler binary name to '#010+ - '**2Fd_Disable the compiler'#039's internal directory cache'#010+ - '**2FD_Set the directory where t','o search for compiler utilities'#010+ + '**2Fd_Disable the compiler'#039's internal directory ','cache'#010+ + '**2FD_Set the directory where to search for compiler utilities'#010+ '**2Fe_Redirect error output to '#010+ '**2Ff_Add to framework path (Darwin only)'#010+ '**2FE_Set exe/unit output path to '#010+ '**2Fi_Add to include path'#010+ - '**2Fl_Add to library path'#010+ - '**2FL_Use <','x> as dynamic linker'#010+ + '**2Fl_Add to library path'#010+ + '**2FL_Use as dynamic linker'#010+ '**2Fm_Load unicode conversion table from .txt in the compiler di'+ 'r'#010+ '**2Fo_Add to object path'#010+ '**2Fr_Load error message file '#010+ - '**2FR_Set resource (.res) linker to '#010+ + '**2FR_Set resource (.res) linker to',' '#010+ '**2Fu_Add to unit path'#010+ - '**2FU','_Set unit output path to , overrides -FE'#010+ + '**2FU_Set unit output path to , overrides -FE'#010+ '**2FW_Store generated whole-program optimization feedback in '#010+ '**2Fw_Load previously stored whole-program optimization feedback fr'+ 'om '#010+ - '*g1g_Generate debug information (default format ','for target)'#010+ + '*g1g_Gen','erate debug information (default format for target)'#010+ '*g2gc_Generate checks for pointers'#010+ '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+ '*g2gl_Use line info unit (show more info with backtraces)'#010+ - '*g2go_Set debug information options'#010+ - '*g3godwarfsets_ Enable DWARF set',' debug information (breaks gdb < 6.5'+ - ')'#010+ + '*g2go_Set debug information ','options'#010+ + '*g3godwarfsets_ Enable DWARF set debug information (breaks gdb < 6.5)'#010+ '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+ #010+ '*g2gp_Preserve case in stabs symbol names'#010+ '*g2gs_Generate Stabs debug information'#010+ - '*g2gt_Trash local variables (to detect uninitializ','ed uses)'#010+ + '*g2gt_Tras','h local variables (to detect uninitialized uses)'#010+ '*g2gv_Generates programs traceable with Valgrind'#010+ '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+ '*g2gw2_Generate DWARFv2 debug information'#010+ '*g2gw3_Generate DWARFv3 debug information'#010+ - '**1i_Information'#010+ - '**2iD_Return compiler dat','e'#010+ + '**','1i_Information'#010+ + '**2iD_Return compiler date'#010+ '**2iV_Return short compiler version'#010+ '**2iW_Return full compiler version'#010+ '**2iSO_Return compiler OS'#010+ '**2iSP_Return compiler host processor'#010+ '**2iTO_Return target OS'#010+ '**2iTP_Return target processor'#010+ - '**1I_Add to include path'#010+ - '**1k_Pass ',' to the linker'#010+ + '**1I_','Add 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_FPC mode with Object Pascal support'#010+ '**2Mdelphi_Delphi 7 compatibility mode'#010+ - '**2Mtp_TP/BP 7.0 compatibility mode'#010+ - '**2Mmacpas_Macin','tosh Pascal dialects compatibility mode'#010+ + '**2Mtp_TP/BP',' 7.0 compatibility mode'#010+ + '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+ '**1n_Do not read the default config files'#010+ '**1N_Node tree optimizations'#010+ '**2Nu_Unroll loops'#010+ '**1o_Change the name of the executable produced to '#010+ - '**1O_Optimizations:'#010+ - '**2O-_Disable optimization','s'#010+ + '**1O_O','ptimizations:'#010+ + '**2O-_Disable optimizations'#010+ '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+ '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+ '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+ '**2Oa=_Set alignment'#010+ - '**2Oo[NO]_Enable or disable optimizatio','ns, see fpc -i for possibl'+ + '**','2Oo[NO]_Enable or disable optimizations, see fpc -i for possibl'+ 'e values'#010+ '**2Op_Set target cpu for optimizing, see fpc -i for possible values'+ #010+ '**2OW_Generate whole-program optimization feedback for optimization'+ - ' , see fpc -i for possible values'#010+ - '**2Ow_Perform whole-prog','ram optimization , see fpc -i for poss'+ - 'ible values'#010+ + ' , see fpc -i for pos','sible values'#010+ + '**2Ow_Perform whole-program optimization , see fpc -i for possib'+ + 'le values'#010+ '**2Os_Optimize for size rather than speed'#010+ '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+ '**1R_Assembler reading style:'#010+ - '**2Rdefault_Use default assembler for target'#010+ - '3*2Ratt','_Read AT&T style assembler'#010+ + '**2Rdefault_','Use default assembler for target'#010+ + '3*2Ratt_Read AT&T style assembler'#010+ '3*2Rintel_Read Intel style assembler'#010+ '6*2RMOT_Read motorola style assembler'#010+ '**1S_Syntax options:'#010+ '**2S2_Same as -Mobjfpc'#010+ '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+ - '**2Sa_Turn on assertions'#010+ - '**2Sd_Same as -Md','elphi'#010+ + '**','2Sa_Turn on assertions'#010+ + '**2Sd_Same as -Mdelphi'#010+ '**2Se_Error options. is a combination of the following:'#010+ '**3*_ : Compiler halts after the errors (default is 1)'#010+ '**3*_w : Compiler also halts after warnings'#010+ - '**3*_n : Compiler also halts after notes'#010+ - '**3*_h : Compiler also h','alts after hints'#010+ + '**3*_n : Compiler also ha','lts after notes'#010+ + '**3*_h : Compiler also halts after hints'#010+ '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+ '**2Sh_Use ansistrings by default instead of shortstrings'#010+ - '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+ + '**2Si_Turn on inlining of procedures/functions declared as "inline"',#010+ '**2Sk_Load fpcylix unit'#010+ - '**2SI_Set in','terface style to '#010+ + '**2SI_Set interface style to '#010+ '**3SIcom_COM compatible interface (default)'#010+ '**3SIcorba_CORBA compatible interface'#010+ '**2Sm_Support macros like C (global)'#010+ '**2So_Same as -Mtp'#010+ - '**2Ss_Constructor name must be init (destructor must be done)'#010+ - '**2St_Allow static ','keyword in objects'#010+ + '**2Ss_Constructor name must be init (dest','ructor must be done)'#010+ + '**2St_Allow static keyword in objects'#010+ '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+ '**1s_Do not call assembler and linker'#010+ '**2sh_Generate script to link on host'#010+ - '**2st_Generate script to link on target'#010+ - '**2sr_Skip register allocation phase (us','e with -alr)'#010+ + '**2st_Generate script to link on target'#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 DOS extender'#010+ '3*2Tlinux_Linux'#010+ '3*2Tnetbsd_NetBSD'#010+ - '3*2Tnetware_Novell Netware Module (clib)'#010+ - '3','*2Tnetwlibc_Novell Netware Module (libc)'#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*2Tsymbian_Symbian OS'#010+ '3*2Twatcom_Watcom compatible DOS extender'#010+ - '3*2Twdosx_WDOSX DOS extender'#010+ + '3*2Twdosx_WDOSX DOS ext','ender'#010+ '3*2Twin32_Windows 32 Bit'#010+ - '3*2Twince','_Windows CE'#010+ + '3*2Twince_Windows CE'#010+ '4*2Tlinux_Linux'#010+ '6*2Tamiga_Commodore Amiga'#010+ '6*2Tatari_Atari ST/STe/TT'#010+ @@ -1145,90 +1146,90 @@ const msgtxt : array[0..000216,1..240] of char=( '6*2Tpalmos_PalmOS'#010+ 'A*2Tlinux_Linux'#010+ 'A*2Twince_Windows CE'#010+ - 'P*2Tamiga_AmigaOS on PowerPC'#010+ - 'P*2Tdarwin_Dar','win and Mac OS X on PowerPC'#010+ + 'P*2','Tamiga_AmigaOS on PowerPC'#010+ + 'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+ 'P*2Tlinux_Linux on PowerPC'#010+ 'P*2Tmacos_Mac OS (classic) on PowerPC'#010+ 'P*2Tmorphos_MorphOS'#010+ 'S*2Tlinux_Linux'#010+ '**1u_Undefines the symbol '#010+ '**1U_Unit options:'#010+ - '**2Un_Do not check where the unit name matches the file nam','e'#010+ + '**2Un_Do not check ','where the unit name matches the file name'#010+ '**2Ur_Generate release unit files (never automatically recompiled)'#010+ '**2Us_Compile a system unit'#010+ '**1v_Be verbose. 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*_e : Show errors (default) ',' 0 : Show nothing (except errors'+ + ')'#010+ + '**2*_w : Show warnings u : Show unit info'#010+ '**2*_n : Show notes t : Show tried/used files'#010+ '**2*_h : Show hints c : Show conditionals'#010+ - '**2*_i : Show general info d : Show debug info'#010+ - '**2*_l : Sh','ow linenumbers r : Rhide/GCC compatibility mod'+ - 'e'#010+ + '**2*_i : Show general info ',' d : Show debug info'#010+ + '**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+ '**2*_s : Show time stamps q : Show message numbers'#010+ '**2*_a : Show everything x : Executable info (Win32 only)'#010+ - '**2*_b : Write file names messages p : Write tr','ee.log with parse t'+ + '**2*_b : ','Write file names messages p : Write tree.log with parse t'+ 'ree'#010+ '**2*_ with full path v : Write fpcdebug.txt with'#010+ '**2*_ lots of debugging info'#010+ - '**2*_m, : Don'#039't show messages numbered and '#010+ - '3*1W_Target-specific options',' (targets)'#010+ + '**2*_m, : Don'#039't show messages numbered ',' and '#010+ + '3*1W_Target-specific options (targets)'#010+ 'A*1W_Target-specific options (targets)'#010+ 'P*1W_Target-specific options (targets)'#010+ 'p*1W_Target-specific options (targets)'#010+ '3*2Wb_Create a bundle instead of a library (Darwin)'#010+ - 'P*2Wb_Create a bundle instead of a library (Darwin)',#010+ + 'P*2Wb_Creat','e a bundle instead of a library (Darwin)'#010+ 'p*2Wb_Create a bundle instead of a library (Darwin)'#010+ '3*2WB_Create a relocatable image (Windows)'#010+ 'A*2WB_Create a relocatable image (Windows, Symbian)'#010+ - '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+ - 'A*2WC_Specify console type appli','cation (Windows)'#010+ + '3*2WC_Specify console type application (EMX, OS/2, W','indows)'#010+ + 'A*2WC_Specify console type application (Windows)'#010+ 'P*2WC_Specify console type application (Classic Mac OS)'#010+ '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ 'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ - '3*2We_Use external resources (Darwin)'#010+ - 'P*2We','_Use external resources (Darwin)'#010+ + '3*2','We_Use external resources (Darwin)'#010+ + 'P*2We_Use external resources (Darwin)'#010+ 'p*2We_Use external resources (Darwin)'#010+ '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+ '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+ - 'A*2WG_Specify graphic type application (Windows)'#010+ - 'P*2WG','_Specify graphic type application (Classic Mac OS)'#010+ + 'A*2WG_Specify ','graphic type application (Windows)'#010+ + 'P*2WG_Specify graphic type application (Classic Mac OS)'#010+ '3*2Wi_Use internal resources (Darwin)'#010+ 'P*2Wi_Use internal resources (Darwin)'#010+ 'p*2Wi_Use internal resources (Darwin)'#010+ - '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - 'A*2WN','_Do not generate relocation code, needed for debugging (Windows'+ + '3*2WN_Do not generate relocation co','de, needed for debugging (Windows'+ ')'#010+ + 'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ '3*2WR_Generate relocation code (Windows)'#010+ 'A*2WR_Generate relocation code (Windows)'#010+ - 'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+ - '3*2WX_Enable executable stack (Linux',')'#010+ + 'P*2WT_Specify MPW tool type application (Classic Mac ','OS)'#010+ + '3*2WX_Enable executable stack (Linux)'#010+ 'A*2WX_Enable executable stack (Linux)'#010+ 'p*2WX_Enable executable stack (Linux)'#010+ 'P*2WX_Enable executable stack (Linux)'#010+ '**1X_Executable options:'#010+ - '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+ - 'ux)'#010+ - '**2Xd_Do not use standard',' library search path (needed for cross comp'+ - 'ile)'#010+ + '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, F','reeBSD, L'+ + 'inux)'#010+ + '**2Xd_Do not use standard library search path (needed for cross compil'+ + 'e)'#010+ '**2Xe_Use external linker'#010+ '**2Xg_Create debuginfo in a separate file and add a debuglink section '+ 'to executable'#010+ - '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+ - '**2Xi_Use inte','rnal linker'#010+ + '**2XD_Try to link units dynamically (','defines FPC_LINK_DYNAMIC)'#010+ + '**2Xi_Use internal linker'#010+ '**2Xm_Generate link map'#010+ '**2XM_Set the name of the '#039'main'#039' program routine (default i'+ 's '#039'main'#039')'#010+ '**2XP_Prepend the binutils names with the prefix '#010+ - '**2Xr_Set the linker'#039's rlink-path to (needed for cross comp'+ - 'ile, see t','he ld manual for more information) (BeOS, Linux)'#010+ + '**2Xr_Set the linker'#039's rlink-path',' to (needed for cross co'+ + 'mpile, see the ld manual for more information) (BeOS, Linux)'#010+ '**2XR_Prepend to all linker search paths (BeOS, Darwin, FreeBSD'+ ', Linux, Mac OS, Solaris)'#010+ '**2Xs_Strip all symbols from executable'#010+ - '**2XS_Try to link units statically (default, defines FP','C_LINK_STATIC'+ + '**2XS_Try to li','nk units statically (default, defines FPC_LINK_STATIC'+ ')'#010+ '**2Xt_Link with static libraries (-static is passed to linker)'#010+ '**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010+ '**1*_'#010+ '**1?_Show this help'#010+ - '**1h_Shows this help without waiting' + '**1h_Shows this help without w','aiting' ); diff --git a/compiler/ncal.pas b/compiler/ncal.pas index ff4d31abe0..03464fe94d 100644 --- a/compiler/ncal.pas +++ b/compiler/ncal.pas @@ -2455,7 +2455,7 @@ implementation { check for hints (deprecated etc) } if (procdefinition.typ = procdef) then - check_hints(tprocdef(procdefinition).procsym,tprocdef(procdefinition).symoptions); + check_hints(tprocdef(procdefinition).procsym,tprocdef(procdefinition).symoptions,tprocdef(procdefinition).deprecatedmsg); { add needed default parameters } if assigned(procdefinition) and diff --git a/compiler/pbase.pas b/compiler/pbase.pas index 3ad1657f1c..178ace0370 100644 --- a/compiler/pbase.pas +++ b/compiler/pbase.pas @@ -90,7 +90,7 @@ interface function try_consume_unitsym(var srsym:tsym;var srsymtable:TSymtable;var tokentoconsume : ttoken):boolean; - function try_consume_hintdirective(var symopt:tsymoptions):boolean; + function try_consume_hintdirective(var symopt:tsymoptions; var deprecatedmsg:pshortstring):boolean; { just for an accurate position of the end of a procedure (PM) } var @@ -194,7 +194,7 @@ implementation try_consume_unitsym(srsym,srsymtable,t); { if nothing found give error and return errorsym } if assigned(srsym) then - check_hints(srsym,srsym.symoptions) + check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg) else begin identifier_not_found(orgpattern); @@ -227,7 +227,7 @@ implementation try_consume_unitsym(srsym,srsymtable,t); { if nothing found give error and return errorsym } if assigned(srsym) then - check_hints(srsym,srsym.symoptions) + check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg) else begin identifier_not_found(orgpattern); @@ -282,12 +282,15 @@ implementation end; - function try_consume_hintdirective(var symopt:tsymoptions):boolean; + function try_consume_hintdirective(var symopt:tsymoptions; var deprecatedmsg:pshortstring):boolean; + var + last_is_deprecated:boolean; begin try_consume_hintdirective:=false; if not(m_hintdirective in current_settings.modeswitches) then exit; repeat + last_is_deprecated:=false; case idtoken of _LIBRARY : begin @@ -298,6 +301,7 @@ implementation begin include(symopt,sp_hint_deprecated); try_consume_hintdirective:=true; + last_is_deprecated:=true; end; _EXPERIMENTAL : begin @@ -318,6 +322,15 @@ implementation break; end; consume(Token); + { handle deprecated message } + if ((token=_CSTRING) or (token=_CCHAR)) and last_is_deprecated then + begin + if deprecatedmsg<>nil then + internalerror(200910181); + deprecatedmsg:=stringdup(pattern); + consume(token); + include(symopt,sp_has_deprecated_msg); + end; until false; end; diff --git a/compiler/pdecl.pas b/compiler/pdecl.pas index 5e6c4e767c..99a36c8a2b 100644 --- a/compiler/pdecl.pas +++ b/compiler/pdecl.pas @@ -160,6 +160,7 @@ implementation hdef : tdef; sym : tsym; dummysymoptions : tsymoptions; + deprecatedmsg : pshortstring; storetokenpos,filepos : tfileposinfo; old_block_type : tblock_type; skipequal : boolean; @@ -181,12 +182,16 @@ implementation sym:=readconstant(orgname,filepos); { Support hint directives } dummysymoptions:=[]; - try_consume_hintdirective(dummysymoptions); + deprecatedmsg:=nil; + try_consume_hintdirective(dummysymoptions,deprecatedmsg); if assigned(sym) then begin sym.symoptions:=sym.symoptions+dummysymoptions; + sym.deprecatedmsg:=deprecatedmsg; symtablestack.top.insert(sym); - end; + end + else + stringdispose(deprecatedmsg); consume(_SEMICOLON); end; @@ -439,7 +444,7 @@ implementation case hdef.typ of pointerdef : begin - try_consume_hintdirective(newtype.symoptions); + try_consume_hintdirective(newtype.symoptions,newtype.deprecatedmsg); consume(_SEMICOLON); if try_to_consume(_FAR) then begin @@ -452,19 +457,19 @@ implementation { in case of type renaming, don't parse proc directives } if istyperenaming then begin - try_consume_hintdirective(newtype.symoptions); + try_consume_hintdirective(newtype.symoptions,newtype.deprecatedmsg); consume(_SEMICOLON); end else begin if not check_proc_directive(true) then begin - try_consume_hintdirective(newtype.symoptions); + try_consume_hintdirective(newtype.symoptions,newtype.deprecatedmsg); consume(_SEMICOLON); end; parse_var_proc_directives(tsym(newtype)); handle_calling_convention(tprocvardef(hdef)); - if try_consume_hintdirective(newtype.symoptions) then + if try_consume_hintdirective(newtype.symoptions,newtype.deprecatedmsg) then consume(_SEMICOLON); end; end; @@ -479,17 +484,17 @@ implementation vmtbuilder.generate_vmt; vmtbuilder.free; end; - try_consume_hintdirective(newtype.symoptions); + try_consume_hintdirective(newtype.symoptions,newtype.deprecatedmsg); consume(_SEMICOLON); end; recorddef : begin - try_consume_hintdirective(newtype.symoptions); + try_consume_hintdirective(newtype.symoptions,newtype.deprecatedmsg); consume(_SEMICOLON); end; else begin - try_consume_hintdirective(newtype.symoptions); + try_consume_hintdirective(newtype.symoptions,newtype.deprecatedmsg); consume(_SEMICOLON); end; end; @@ -564,6 +569,7 @@ implementation orgname : TIDString; p : tnode; dummysymoptions : tsymoptions; + deprecatedmsg : pshortstring; storetokenpos,filepos : tfileposinfo; old_block_type : tblock_type; sp : pchar; @@ -612,12 +618,16 @@ implementation current_tokenpos:=storetokenpos; { Support hint directives } dummysymoptions:=[]; - try_consume_hintdirective(dummysymoptions); + deprecatedmsg:=nil; + try_consume_hintdirective(dummysymoptions,deprecatedmsg); if assigned(sym) then begin sym.symoptions:=sym.symoptions+dummysymoptions; + sym.deprecatedmsg:=deprecatedmsg; symtablestack.top.insert(sym); - end; + end + else + stringdispose(deprecatedmsg); consume(_SEMICOLON); p.free; end; diff --git a/compiler/pdecobj.pas b/compiler/pdecobj.pas index aa2ddef831..54f2e1bc0d 100644 --- a/compiler/pdecobj.pas +++ b/compiler/pdecobj.pas @@ -110,7 +110,7 @@ implementation end; { hint directives, these can be separated by semicolons here, that needs to be handled here with a loop (PFV) } - while try_consume_hintdirective(p.symoptions) do + while try_consume_hintdirective(p.symoptions,p.deprecatedmsg) do Consume(_SEMICOLON); end; @@ -400,12 +400,19 @@ implementation procedure maybe_parse_hint_directives(pd:tprocdef); var dummysymoptions : tsymoptions; + deprecatedmsg : pshortstring; begin dummysymoptions:=[]; - while try_consume_hintdirective(dummysymoptions) do + deprecatedmsg:=nil; + while try_consume_hintdirective(dummysymoptions,deprecatedmsg) do Consume(_SEMICOLON); if assigned(pd) then - pd.symoptions:=pd.symoptions+dummysymoptions; + begin + pd.symoptions:=pd.symoptions+dummysymoptions; + pd.deprecatedmsg:=deprecatedmsg; + end + else + stringdispose(deprecatedmsg); end; var diff --git a/compiler/pdecsub.pas b/compiler/pdecsub.pas index 266dd80898..40b4075165 100644 --- a/compiler/pdecsub.pas +++ b/compiler/pdecsub.pas @@ -2758,6 +2758,11 @@ const fwpd.fileinfo:=currpd.fileinfo; if assigned(fwpd.funcretsym) then fwpd.funcretsym.fileinfo:=currpd.fileinfo; + if assigned(currpd.deprecatedmsg) then + begin + stringdispose(fwpd.deprecatedmsg); + fwpd.deprecatedmsg:=stringdup(currpd.deprecatedmsg^); + end; { import names } if assigned(currpd.import_dll) then begin diff --git a/compiler/pdecvar.pas b/compiler/pdecvar.pas index b9b8c094eb..560a6f4107 100644 --- a/compiler/pdecvar.pas +++ b/compiler/pdecvar.pas @@ -1140,6 +1140,7 @@ implementation allowdefaultvalue, hasdefaultvalue : boolean; hintsymoptions : tsymoptions; + deprecatedmsg : pshortstring; old_block_type : tblock_type; begin old_block_type:=block_type; @@ -1217,12 +1218,16 @@ implementation { try to parse the hint directives } hintsymoptions:=[]; - try_consume_hintdirective(hintsymoptions); + deprecatedmsg:=nil; + try_consume_hintdirective(hintsymoptions,deprecatedmsg); for i:=0 to sc.count-1 do begin vs:=tabstractvarsym(sc[i]); vs.symoptions := vs.symoptions + hintsymoptions; + if deprecatedmsg<>nil then + vs.deprecatedmsg:=stringdup(deprecatedmsg^); end; + stringdispose(deprecatedmsg); { Handling of Delphi typed const = initialized vars } if allowdefaultvalue and @@ -1318,6 +1323,7 @@ implementation offset : longint; uniondef : trecorddef; hintsymoptions : tsymoptions; + deprecatedmsg : pshortstring; semicoloneaten: boolean; {$if defined(powerpc) or defined(powerpc64)} tempdef: tdef; @@ -1403,7 +1409,8 @@ implementation { try to parse the hint directives } hintsymoptions:=[]; - try_consume_hintdirective(hintsymoptions); + deprecatedmsg:=nil; + try_consume_hintdirective(hintsymoptions,deprecatedmsg); { update variable type and hints } for i:=0 to sc.count-1 do @@ -1412,7 +1419,10 @@ implementation fieldvs.vardef:=hdef; { insert any additional hint directives } fieldvs.symoptions := fieldvs.symoptions + hintsymoptions; + if deprecatedmsg<>nil then + fieldvs.deprecatedmsg:=stringdup(deprecatedmsg^); end; + stringdispose(deprecatedmsg); { Records and objects can't have default values } { for a record there doesn't need to be a ; before the END or ) } diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas index 97c1026233..7127b28a43 100644 --- a/compiler/pexpr.pas +++ b/compiler/pexpr.pas @@ -1201,7 +1201,7 @@ implementation static_name:=lower(sym.owner.name^)+'_'+sym.name; searchsym_in_class(tobjectdef(sym.owner.defowner),tobjectdef(sym.owner.defowner),static_name,sym,srsymtable); if assigned(sym) then - check_hints(sym,sym.symoptions); + check_hints(sym,sym.symoptions,sym.deprecatedmsg); p1.free; p1:=nil; { static syms are always stored as absolutevarsym to handle scope and storage properly } @@ -1327,7 +1327,7 @@ implementation end; { if nothing found give error and return errorsym } if assigned(srsym) then - check_hints(srsym,srsym.symoptions) + check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg) else begin identifier_not_found(orgstoredpattern); @@ -1446,7 +1446,7 @@ implementation { search also in inherited methods } searchsym_in_class(tobjectdef(hdef),current_objectdef,pattern,srsym,srsymtable); if assigned(srsym) then - check_hints(srsym,srsym.symoptions); + check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg); consume(_ID); do_member_read(tobjectdef(hdef),false,srsym,p1,again,[]); end @@ -1466,7 +1466,7 @@ implementation srsym:=search_class_member(tobjectdef(hdef),pattern); if assigned(srsym) then begin - check_hints(srsym,srsym.symoptions); + check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg); if not(getaddr) and not(sp_static in srsym.symoptions) then Message(sym_e_only_static_in_static) else @@ -1495,7 +1495,7 @@ implementation srsym:=search_class_member(tobjectdef(hdef),pattern); if assigned(srsym) then begin - check_hints(srsym,srsym.symoptions); + check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg); consume(_ID); do_member_read(tobjectdef(hdef),getaddr,srsym,p1,again,[]); end @@ -1995,7 +1995,7 @@ implementation if assigned(srsym) and (srsym.typ=fieldvarsym) then begin - check_hints(srsym,srsym.symoptions); + check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg); p1:=csubscriptnode.create(srsym,p1) end else @@ -2051,7 +2051,7 @@ implementation searchsym_in_class(classh,classh,pattern,srsym,srsymtable); if assigned(srsym) then begin - check_hints(srsym,srsym.symoptions); + check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg); consume(_ID); do_member_read(classh,getaddr,srsym,p1,again,[]); end @@ -2075,7 +2075,7 @@ implementation searchsym_in_class(classh,classh,pattern,srsym,srsymtable); if assigned(srsym) then begin - check_hints(srsym,srsym.symoptions); + check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg); consume(_ID); do_member_read(classh,getaddr,srsym,p1,again,[]); end @@ -2268,7 +2268,7 @@ implementation end; if assigned(srsym) then begin - check_hints(srsym,srsym.symoptions); + check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg); { load the procdef from the inherited class and not from self } case srsym.typ of diff --git a/compiler/ppu.pas b/compiler/ppu.pas index 4c9ab96c01..4c9095efaf 100644 --- a/compiler/ppu.pas +++ b/compiler/ppu.pas @@ -43,7 +43,7 @@ type {$endif Test_Double_checksum} const - CurrentPPUVersion = 101; + CurrentPPUVersion = 102; { buffer sizes } maxentrysize = 1024; diff --git a/compiler/psub.pas b/compiler/psub.pas index cce18fd8f0..d4bcda68b4 100644 --- a/compiler/psub.pas +++ b/compiler/psub.pas @@ -1588,7 +1588,7 @@ implementation { hint directives, these can be separated by semicolons here, that needs to be handled here with a loop (PFV) } - while try_consume_hintdirective(pd.symoptions) do + while try_consume_hintdirective(pd.symoptions,pd.deprecatedmsg) do Consume(_SEMICOLON); { Set calling convention } diff --git a/compiler/ptconst.pas b/compiler/ptconst.pas index baf41ac5b5..53e4d84134 100644 --- a/compiler/ptconst.pas +++ b/compiler/ptconst.pas @@ -1401,7 +1401,7 @@ implementation read_typed_const_data(valuelist,sym.vardef); { Parse hints } - try_consume_hintdirective(sym.symoptions); + try_consume_hintdirective(sym.symoptions,sym.deprecatedmsg); consume(_SEMICOLON); diff --git a/compiler/symconst.pas b/compiler/symconst.pas index a3876c8828..d0ae84367d 100644 --- a/compiler/symconst.pas +++ b/compiler/symconst.pas @@ -146,7 +146,8 @@ type sp_internal, { internal symbol, not reported as unused } sp_implicitrename, sp_hint_experimental, - sp_generic_para + sp_generic_para, + sp_has_deprecated_msg ); tsymoptions=set of tsymoption; diff --git a/compiler/symdef.pas b/compiler/symdef.pas index 953985849f..dc892d6b62 100644 --- a/compiler/symdef.pas +++ b/compiler/symdef.pas @@ -463,6 +463,7 @@ interface {$endif} visibility : tvisibility; symoptions : tsymoptions; + deprecatedmsg : pshortstring; { symbol owning this definition } procsym : tsym; procsymderef : tderef; @@ -2931,6 +2932,7 @@ implementation import_name:=nil; import_nr:=0; inlininginfo:=nil; + deprecatedmsg:=nil; {$ifdef i386} fpu_used:=maxfpuregs; {$endif i386} @@ -2954,6 +2956,10 @@ implementation ppufile.getposinfo(fileinfo); visibility:=tvisibility(ppufile.getbyte); ppufile.getsmallset(symoptions); + if sp_has_deprecated_msg in symoptions then + deprecatedmsg:=stringdup(ppufile.getstring) + else + deprecatedmsg:=nil; {$ifdef powerpc} { library symbol for AmigaOS/MorphOS } ppufile.getderef(libsymderef); @@ -3054,6 +3060,7 @@ implementation stringdispose(resultname); stringdispose(import_dll); stringdispose(import_name); + stringdispose(deprecatedmsg); if (po_msgstr in procoptions) then stringdispose(messageinf.str); if assigned(_mangledname) then @@ -3091,6 +3098,8 @@ implementation ppufile.putposinfo(fileinfo); ppufile.putbyte(byte(visibility)); ppufile.putsmallset(symoptions); + if sp_has_deprecated_msg in symoptions then + ppufile.putstring(deprecatedmsg^); {$ifdef powerpc} { library symbol for AmigaOS/MorphOS } ppufile.putderef(libsymderef); diff --git a/compiler/symsym.pas b/compiler/symsym.pas index 7c7375677e..7dac5cac52 100644 --- a/compiler/symsym.pas +++ b/compiler/symsym.pas @@ -360,6 +360,10 @@ implementation ppufile.getposinfo(fileinfo); visibility:=tvisibility(ppufile.getbyte); ppufile.getsmallset(symoptions); + if sp_has_deprecated_msg in symoptions then + deprecatedmsg:=stringdup(ppufile.getstring) + else + deprecatedmsg:=nil; end; @@ -370,6 +374,8 @@ implementation ppufile.putposinfo(fileinfo); ppufile.putbyte(byte(visibility)); ppufile.putsmallset(symoptions); + if sp_has_deprecated_msg in symoptions then + ppufile.putstring(deprecatedmsg^); end; diff --git a/compiler/symtype.pas b/compiler/symtype.pas index bb9878c3bb..e0f89be174 100644 --- a/compiler/symtype.pas +++ b/compiler/symtype.pas @@ -101,6 +101,8 @@ interface refs : longint; reflist : TLinkedList; visibility : tvisibility; + { deprecated optionally can have a message } + deprecatedmsg: pshortstring; isdbgwritten : boolean; constructor create(st:tsymtyp;const aname:string); destructor destroy;override; @@ -334,10 +336,12 @@ implementation fileinfo:=current_tokenpos; isdbgwritten := false; visibility:=vis_public; + deprecatedmsg:=nil; end; destructor Tsym.destroy; begin + stringdispose(deprecatedmsg); if assigned(RefList) then RefList.Free; inherited Destroy; diff --git a/compiler/utils/ppudump.pp b/compiler/utils/ppudump.pp index ee445d1c32..7c3c24217d 100644 --- a/compiler/utils/ppudump.pp +++ b/compiler/utils/ppudump.pp @@ -744,7 +744,7 @@ begin end; -procedure readsymoptions; +procedure readsymoptions(space : string); type { symbol options } tsymoption=(sp_none, @@ -757,7 +757,8 @@ type sp_has_overloaded, sp_internal, { internal symbol, not reported as unused } sp_implicitrename, - sp_generic_para + sp_generic_para, + sp_has_deprecated_msg ); tsymoptions=set of tsymoption; tsymopt=record @@ -765,18 +766,19 @@ type str : string[30]; end; const - symopts=10; + symopts=11; symopt : array[1..symopts] of tsymopt=( - (mask:sp_static; str:'Static'), - (mask:sp_hint_deprecated;str:'Hint Deprecated'), - (mask:sp_hint_platform; str:'Hint Platform'), - (mask:sp_hint_library; str:'Hint Library'), - (mask:sp_hint_unimplemented;str:'Hint Unimplemented'), - (mask:sp_hint_experimental;str:'Hint Experimental'), - (mask:sp_has_overloaded; str:'Has overloaded'), - (mask:sp_internal; str:'Internal'), - (mask:sp_implicitrename; str:'Implicit Rename'), - (mask:sp_generic_para; str:'Generic Parameter') + (mask:sp_static; str:'Static'), + (mask:sp_hint_deprecated; str:'Hint Deprecated'), + (mask:sp_hint_platform; str:'Hint Platform'), + (mask:sp_hint_library; str:'Hint Library'), + (mask:sp_hint_unimplemented; str:'Hint Unimplemented'), + (mask:sp_hint_experimental; str:'Hint Experimental'), + (mask:sp_has_overloaded; str:'Has overloaded'), + (mask:sp_internal; str:'Internal'), + (mask:sp_implicitrename; str:'Implicit Rename'), + (mask:sp_generic_para; str:'Generic Parameter'), + (mask:sp_has_deprecated_msg; str:'Has Deprecated Message') ); var symoptions : tsymoptions; @@ -798,6 +800,8 @@ begin end; end; writeln; + if sp_has_deprecated_msg in symoptions then + writeln(space,'Deprecated : ', ppufile.getstring); end; @@ -809,7 +813,7 @@ begin readposinfo; writeln(space,' Visibility : ',Visibility2Str(ppufile.getbyte)); write (space,' SymOptions : '); - readsymoptions; + readsymoptions(space+' '); end; @@ -1866,7 +1870,7 @@ begin readposinfo; writeln(space,' Visibility : ',Visibility2Str(ppufile.getbyte)); write (space,' SymOptions : '); - readsymoptions; + readsymoptions(space+' '); if tsystemcpu(ppufile.header.cpu)=cpu_powerpc then begin { library symbol for AmigaOS/MorphOS }