From 1e123d66ba0ff858e5d0c2661983cf831439fd50 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 18 Oct 2007 00:24:05 +0000 Subject: [PATCH] * improved generics git-svn-id: trunk@8838 - --- .gitattributes | 2 +- compiler/msg/errore.msg | 13 - compiler/msgidx.inc | 3 +- compiler/msgtxt.inc | 536 ++++++++++----------- compiler/pbase.pas | 2 + compiler/pdecobj.pas | 14 +- compiler/pdecsub.pas | 14 +- compiler/pexpr.pas | 19 +- compiler/psub.pas | 5 +- compiler/ptype.pas | 196 +++++--- tests/test/tgeneric1.pp | 9 + tests/test/tgeneric10.pp | 2 +- tests/test/tgeneric11.pp | 6 +- tests/test/tgeneric14.pp | 6 +- tests/test/tgeneric4.pp | 9 +- tests/test/tgeneric7.pp | 2 +- tests/test/{tugeneric7.pp => ugeneric7.pp} | 2 +- 17 files changed, 475 insertions(+), 365 deletions(-) rename tests/test/{tugeneric7.pp => ugeneric7.pp} (95%) diff --git a/.gitattributes b/.gitattributes index 0e9e8db70f..eb5213987b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7096,7 +7096,6 @@ tests/test/tstrreal1.pp svneol=native#text/plain tests/test/tstrreal2.pp svneol=native#text/plain tests/test/tstrreal3.pp -text tests/test/tsubdecl.pp svneol=native#text/plain -tests/test/tugeneric7.pp svneol=native#text/plain tests/test/tunaligned1.pp svneol=native#text/plain tests/test/tunit1.pp svneol=native#text/plain tests/test/tunit2.pp svneol=native#text/plain @@ -7125,6 +7124,7 @@ tests/test/ugeneric10.pp svneol=native#text/plain tests/test/ugeneric14.pp svneol=native#text/plain tests/test/ugeneric3.pp svneol=native#text/plain tests/test/ugeneric4.pp svneol=native#text/plain +tests/test/ugeneric7.pp svneol=native#text/plain tests/test/uimpluni1.pp svneol=native#text/plain tests/test/uimpluni2.pp svneol=native#text/plain tests/test/uinline4a.pp svneol=native#text/plain diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 37214ad480..d5c2c2a706 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -1120,19 +1120,6 @@ parser_e_type_object_constants=03230_E_Constants of objects containing a VMT are parser_e_label_outside_proc=03231_E_Taking the address of labels defined outside the current scope isn't allowed % It isn't allowed to take the addresss of labels outside the % current procedure. -parser_f_no_anonymous_specializations=03232_F_Anonymous generic specializations are not allowed -% Something like -% \begin{verbatim} -% var -% MyLinkedList: specialize TLinkedList; -% \end{verbatim} -% is not allowed. Declare a specialized type first: -% \begin{verbatim} -% type -% TMyLinkedList = specialize TLinkedList; -% var -% MyLinkedList: TMyLinkedList -% \end{verbatim} parser_e_initialized_not_for_external=03233_E_Cannot initialize variables declared as external % Variables declared as external can not be initialized with a default value. parser_e_illegal_function_result=03234_E_Illegal function result type diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 03c0655141..68bcc59199 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -319,7 +319,6 @@ const parser_e_no_generics_as_params=03229; parser_e_type_object_constants=03230; parser_e_label_outside_proc=03231; - parser_f_no_anonymous_specializations=03232; parser_e_initialized_not_for_external=03233; parser_e_illegal_function_result=03234; parser_e_no_common_type=03235; @@ -732,7 +731,7 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 45312; + MsgTxtSize = 45254; MsgIdxMax : array[1..20] of longint=( 24,86,237,83,63,50,107,22,135,60, diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 3f148f0ef6..c59eb9d3a0 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -363,456 +363,454 @@ const msgtxt : array[0..000188,1..240] of char=( '03230_E_Constants of objects containing a VMT aren'#039't allowed'#000+ '03231','_E_Taking the address of labels defined outside the current sco'+ 'pe isn'#039't allowed'#000+ - '03232_F_Anonymous generic specializations are not allowed'#000+ '03233_E_Cannot initialize variables declared as external'#000+ '03234_E_Illegal function result type'#000+ - '03235_E_','No common type possible between "$1" and "$2"'#000+ - '03236_E_Generics without specialization can not be used as a type for '+ - 'a variable'#000+ + '03235_E_No common type possible between "$1" and "$2"'#000+ + '03236_E_Gene','rics without specialization can not be used as a type fo'+ + 'r a variable'#000+ '04000_E_Type mismatch'#000+ '04001_E_Incompatible types: got "$1" expected "$2"'#000+ - '04002_E_Type mismatch between "$1" and "','$2"'#000+ + '04002_E_Type mismatch between "$1" and "$2"'#000+ '04003_E_Type identifier expected'#000+ - '04004_E_Variable identifier expected'#000+ + '04004_E_Variable iden','tifier 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+ + '04008_E_pointer type expected, but got "$1"'#000+ '04009_E_class type expected, but got "$1"'#000+ - '04011_E_Can'#039't evaluate constant expression'#000+ + '04','011_E_Can'#039't evaluate constant 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 CO','MP which i'+ - 's an integer type'#000+ - '04015_H_use DIV instead to get an integer result'#000+ + '04014_W_Automatic type conversion from floating type to COMP which is '+ + 'an integer type'#000+ + '04015_H_use DIV instead to get',' an integer result'#000+ '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 t','ype'#000+ + '04018_E_Can'#039't read or write variables of this type'#000+ '04019_E_Can'#039't use readln or writeln on typed file'#000+ - '04020_E_Can'#039't use read or write on untyped file.'#000+ + '0402','0_E_Can'#039't use read or write on untyped file.'#000+ '04021_E_Type conflict between set elements'#000+ '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+ - '04023_E_Integer or real expressi','on expected'#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+ + '0','4025_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 mat','h function'#000+ - '04028_E_Can'#039't take the address of constant expressions'#000+ + '04027_E_Illegal constant passed to internal math function'#000+ + '04028_E_Can'#039't take the address of constant expr','essions'#000+ '04029_E_Argument can'#039't be assigned to'#000+ '04030_E_Can'#039't assign local procedure/function to procedure variabl'+ 'e'#000+ '04031_E_Can'#039't assign values to an address'#000+ - '04032_E_Can'#039't assign value','s to const variable'#000+ + '04032_E_Can'#039't assign values to const variable'#000+ '04033_E_Array type required'#000+ - '04034_E_interface type expected, but got "$1"'#000+ + '04034_E_in','terface 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+ + ' check error'#000+ + '04037_E_Typecast has different size ($1 -> $2) in as','signment'#000+ '04038_E_enums with assignments can'#039't be used as array index'#000+ '04039_E_Class or Object types "$1" and "$2" are not related'#000+ '04040_W_Class types "$1" and "$2" are not related'#000+ - '040','41_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 defined'#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_Constructing a class "$1" with abstract methods'#000+ + '04045_W_Comparison is always true due to range of values'#000+ + '04046_W_Constructin','g 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_Ty','pe size mismatch, possible loss of data / range check erro'+ - 'r'#000+ + '04049_H_Type size mismatch, possible loss of data / range check erro','r'+ + #000+ '04050_E_The address of an abstract method can'#039't be taken'#000+ '04051_E_Assignments to formal parameters and open arrays are not possi'+ 'ble'#000+ '04052_E_Constant Expression expected'#000+ - '04053_E_Oper','ation "$1" not supported for types "$2" and "$3"'#000+ - '04054_E_Illegal type conversion: "$1" to "$2"'#000+ + '04053_E_Operation "$1" not supported for types "$2" and "$3"'#000+ + '04054_E_I','llegal type conversion: "$1" to "$2"'#000+ '04055_H_Conversion between ordinals and pointers is not portable'#000+ '04056_W_Conversion between ordinals and pointers is not portable'#000+ - '04057_E_Can'#039't d','etermine which overloaded function to call'#000+ - '04058_E_Illegal counter variable'#000+ + '04057_E_Can'#039't determine which overloaded function to call'#000+ + '04058_E_Illegal',' counter variable'#000+ '04059_W_Converting constant real value to double for C variable argume'+ 'nt, add explicit typecast to prevent this.'#000+ - '04060_E_Class or COM interface type expected, but g','ot "$1"'#000+ - '04061_E_Constant packed arrays are not yet supported'#000+ + '04060_E_Class or COM interface type expected, but got "$1"'#000+ + '04061_E_Constant packed arrays are not yet support','ed'#000+ '04062_E_Incompatible type for arg no. $1: Got "$2" expected "(Bit)Pack'+ 'ed Array"'#000+ '04063_E_Incompatible type for arg no. $1: Got "$2" expected "(not pack'+ 'ed) Array"'#000+ - '04064_E_Elements o','f packed arrays cannot be of a type which need to '+ - 'be initialised'#000+ + '04064_E_Elements of packed arrays cannot be of a type which need to be'+ + ' initi','alised'#000+ '04065_E_Constant packed records and objects are not yet supported'#000+ '04066_W_Arithmetic "$1" on untyped pointer is unportable to {$T+}, sug'+ 'gest typecast'#000+ - '04076_E_Can'#039't take addres','s of a subroutine marked as local'#000+ - '04077_E_Can'#039't export subroutine marked as local from a unit'#000+ + '04076_E_Can'#039't take address of a subroutine marked as local'#000+ + '04077_E_Can'#039't export sub','routine marked as local from a unit'#000+ '04078_E_Type is not automatable: "$1"'#000+ '04079_H_Converting the operands to "$1" before doing the add could pre'+ 'vent overflow errors.'#000+ - '04080_H_Converti','ng the operands to "$1" before doing the subtract co'+ - 'uld prevent overflow errors.'#000+ + '04080_H_Converting the operands to "$1" before doing the subtract coul'+ + 'd pr','event overflow errors.'#000+ '04081_H_Converting the operands to "$1" before doing the multiply coul'+ 'd prevent overflow errors.'#000+ - '04082_W_Converting pointers to signed integers may result in w','rong c'+ - 'omparison results and range errors, use an unsigned type instead.'#000+ + '04082_W_Converting pointers to signed integers may result in wrong com'+ + 'parison results and range errors, use an unsigned ','type instead.'#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 solved "$1"'#000+ + '05004_E_Unknown identifier "$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+ '05010_E_Only static variables can be used in static methods or outside'+ ' methods'#000+ - '05012_F_record or c','lass type expected'#000+ - '05013_E_Instances of classes or objects with an abstract method are no'+ - 't allowed'#000+ + '05012_F_record or class type expected'#000+ + '05013_E_Instances of classes or objects',' with an abstract method are '+ + 'not allowed'#000+ '05014_W_Label not defined "$1"'#000+ '05015_E_Label used but not defined "$1"'#000+ '05016_E_Illegal label declaration'#000+ - '05017_E_GOTO and LABEL are not suppo','rted (use switch -Sg)'#000+ + '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+ '05018_E_Label not found'#000+ - '05019_E_identifier isn'#039't a label'#000+ + '05019_E_iden','tifier isn'#039't a label'#000+ '05020_E_label already defined'#000+ '05021_E_illegal type declaration of set elements'#000+ '05022_E_Forward class definition not resolved "$1"'#000+ - '05023_H_Unit "$1" not used in $','2'#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+ + '05025_N_Local variable "','$1" not used'#000+ '05026_H_Value parameter "$1" is assigned but never used'#000+ '05027_N_Local variable "$1" is assigned but never used'#000+ '05028_H_Local $1 "$2" is not used'#000+ - '05029_N_Private field "$','1.$2" is never used'#000+ - '05030_N_Private field "$1.$2" is assigned but never used'#000+ + '05029_N_Private field "$1.$2" is never used'#000+ + '05030_N_Private field "$1.$2" is assig','ned 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 c','urrent record for C'#000+ - '05035_E_Unknown record field identifier "$1"'#000+ + '05034_W_Type "$1" is not aligned correctly in current record for C'#000+ + '05035_E_Unknown record field identifie','r "$1"'#000+ '05036_W_Local variable "$1" does not seem 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 declar','ation: $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 matchi','ng implementation for interface method "$1" found'#000+ '05043_W_Symbol "$1" is deprecated'#000+ '05044_W_Symbol "$1" is not portable'#000+ '05055_W_Symbol "$1" is not implemented'#000+ - '05056_E_Can'#039't create un','ique type from this type'#000+ - '05057_H_Local variable "$1" does not seem to be initialized'#000+ + '05056_E_Can'#039't create unique type from this type'#000+ + '05057_H_Local variable "$1" does ','not seem to be initialized'#000+ '05058_H_Variable "$1" does not seem to be initialized'#000+ '05059_W_Function result variable does not seem to initialized'#000+ - '05060_H_Function result variable does n','ot seem to be initialized'#000+ - '05061_W_Variable "$1" read but nowhere assigned'#000+ + '05060_H_Function result variable does not seem to be initialized'#000+ + '05061_W_Variable "$1" read but n','owhere assigned'#000+ '05062_H_Found abstract method: $1'#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 all','owed there'#000+ - '06015_E_EXPORT declared functions can'#039't be called'#000+ + '06013_E_The use of a far pointer isn'#039't allowed there'#000+ + '06015_E_EXPORT declared functions can'#039't be call','ed'#000+ '06016_W_Possible illegal call of constructor or destructor'#000+ '06017_N_Inefficient code'#000+ '06018_W_unreachable code'#000+ '06020_E_Abstract methods can'#039't be called directly'#000+ - '06027_DL_Register $1',' weight $2 $3'#000+ + '06027_DL_Register $1 weight $2 $3'#000+ '06029_DL_Stack frame is omitted'#000+ - '06031_E_Object or class methods can'#039't be inline.'#000+ + '06031_E_Obje','ct 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+ - '06037_E_Constructors or destructors can not be called inside a '#039'wi'+ - 'th'#039' clause'#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'w'+ + 'ith'#039' clause'#000+ '06038_E_Cannot call message handler methods directly'#000+ '06039_E_Jump in or outside of an exception block'#000+ - '06040_E_Control flow statem','ents aren'#039't allowed in a finally bloc'+ - 'k'#000+ - '06041_W_Parameters size exceeds limit for certain cpu'#039's'#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 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+ + '06045_E_CONTINUE not allowed'#000+ + '06046_F_Unknown compilerproc "$1". C','heck if you use the correct run '+ + 'time library.'#000+ '06047_F_Cannot find system type "$1". Check if you use the correct run'+ ' time library.'#000+ '06048_H_Inherited call to abstract method ignored'#000+ - '0','6049_E_Goto label "$1" not defined or optimized away'#000+ - '07000_DL_Starting $1 styled assembler parsing'#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 building record offset'#000+ - '07005_E_OFFSET used w','ithout identifier'#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+ + '070','07_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 symbo','l can only be added'#000+ + '07011_E_Relocatable symbol can only be added'#000+ '07012_E_Invalid constant expression'#000+ - '07013_E_Relocatable symbol is not allowed'#000+ + '07','013_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+ - '07017_E','_Invalid base and index register usage'#000+ - '07018_W_Possible error in object field handling'#000+ + '07017_E_Invalid base and index register usage'#000+ + '07018_W_Possible er','ror in object field handling'#000+ '07019_E_Wrong scale factor specified'#000+ '07020_E_Multiple index register usage'#000+ '07021_E_Invalid operand type'#000+ '07022_E_Invalid string as opcode operand: $1'#000+ - '0702','3_W_@CODE and @DATA not supported'#000+ - '07024_E_Null label references are not allowed'#000+ + '07023_W_@CODE and @DATA not supported'#000+ + '07024_E_Null label refer','ences 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+ - '07029_W_Fwait can cause ','emulation problems with emu387'#000+ - '07030_W_$1 without operand translated into $1P'#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_Unsupported symbol type for operand'#000+ - '07034_E_C','onstant value out of bounds'#000+ - '07035_E_Error converting decimal $1'#000+ + '07034_E_Constant value out of bounds'#000+ + '07035_E_Error converting decim','al $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+ - '07040_W_$1 is associated to an overload','ed function'#000+ + '07040_W_$1 is associated to an overloaded function'#000+ '07041_E_Cannot use SELF outside a method'#000+ - '07042_E_Cannot use OLDEBP outside a nested procedure'#000+ + '07042','_E_Cannot use OLDEBP outside a nested procedure'#000+ '07043_W_Procedures can'#039't return any value in asm code'#000+ '07044_E_SEG not supported'#000+ - '07045_E_Size suffix and destination or source size do ','not match'#000+ - '07046_W_Size suffix and destination or source size do not match'#000+ + '07045_E_Size suffix and destination or source size do not match'#000+ + '07046_W_Size suffix and destination or source si','ze 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+ + '07050_E_Assembler syntax error in constant'#000+ '07051_E_Invalid String expression'#000+ - '07052_W_constant with symbol $1 for address which is not on a pointer'#000+ + '07052_W_constant with s','ymbol $1 for address which is not on a pointe'+ + 'r'#000+ '07053_E_Unrecognized opcode $1'#000+ '07054_E_Invalid or missing opcode'#000+ '07055_E_Invalid combination of prefix and opcode: $1'#000+ - '07056_E_Invalid c','ombination of override and opcode: $1'#000+ - '07057_E_Too many operands on line'#000+ + '07056_E_Invalid combination of override and opcode: $1'#000+ + '07057_E_Too many ope','rands 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 label identifier $1'#000+ - '07063_E_Invalid registe','r name'#000+ + '07063_E_Invalid register name'#000+ '07064_E_Invalid floating point register name'#000+ - '07066_W_Modulo not supported'#000+ + '07066_','W_Modulo not 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 wi','th a register'#000+ - '07071_E_Invalid segment override expression'#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 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+ + '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 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+ + '07081_E_Can'#039't access fields directly for parameters'#000+ + '07082_E_Can'#039't acc','ess 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 in this function'#000+ - '07086_W_"$1" without oper','and translated into "$1 %st,%st(1)"'#000+ - '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+ + '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+ + '07087_W_"$1 %st(n)" tr','anslated 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+ '07093_W_ALIGN not supported'#000+ - '07094_E_','Inc and Dec cannot be together'#000+ - '07095_E_Invalid reglist for movem'#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 oper'+ 'ands, using DWORD as default'#000+ - '070','99_E_Syntax error while trying to parse a shifter operand'#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, 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+ + '07102_W_Use of +offset(%ebp) for parameters invalid here'#000+ + '07103_W_Use of +offset(','%ebp) is not compatible with regcall conventi'+ + 'on'#000+ '07104_W_Use of -offset(%ebp) is not recommended for local variable acc'+ 'ess'#000+ - '07105_W_Use of -offset(%esp), access may cause a crash or va','lue may '+ - 'be lost'#000+ - '07106_E_VMTOffset must be used in combination with a virtual method, a'+ - 'nd "$1" is not virtual'#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 combinat','ion with a virtual method,'+ + ' and "$1" is not virtual'#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 supp','ort for binary writers'#000+ - '08004_E_Allocating of data is only allowed in bss section'#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+ '08007_E_Asm: $1 invalid combination of opcode and operands'#000+ - '08008_E_Asm: 16 Bit references',' not supported'#000+ + '08008_E_Asm: 16 Bit references not supported'#000+ '08009_E_Asm: Invalid effective address'#000+ - '08010_E_Asm: Immediate or reference expected'#000+ + '0801','0_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: Extended type not supported for this target'#000+ + '08014_E_Asm: Comp type not supported for this target'#000+ + '08015_E_Asm: Extended type not ','supported for this target'#000+ '08016_E_Asm: Duplicate label $1'#000+ '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 r','eferences not supported'#000+ - '08021_E_Asm: 64 Bit operands not supported'#000+ + '08020_E_Asm: 16 or 32 Bit references not supported'#000+ + '08021_E_Asm: 64 Bit operands not s','upported'#000+ '09000_W_Source operating system redefined'#000+ '09001_I_Assembling (pipe) $1'#000+ '09002_E_Can'#039't create assembler file: $1'#000+ '09003_E_Can'#039't create object file: $1'#000+ - '09004_E_Can'#039't create arch','ive file: $1'#000+ - '09005_E_Assembler $1 not found, switching to external assembling'#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+ '09008_E_Can'#039't call the assembler, error $1 switching to external a'+ 'ssembling'#000+ - '09009_I_Assembl','ing $1'#000+ + '09009_I_Assembling $1'#000+ '09010_I_Assembling with smartlinking $1'#000+ - '09011_W_Object $1 not found, Linking may fail !'#000+ + '09011_W_Obj','ect $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+ - '09015_I','_Linking $1'#000+ - '09016_E_Util $1 not found, switching to external linking'#000+ + '09015_I_Linking $1'#000+ + '09016_E_Util $1 not found, switching to extern','al 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+ '09020_I_Closing script $1'#000+ - '09021_E_resource c','ompiler not found, switching to external mode'#000+ - '09022_I_Compiling resource $1'#000+ + '09021_E_resource compiler not found, switching to external mode'#000+ + '09022_I_Comp','iling resource $1'#000+ '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+ 'king'#000+ '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+ #000+ - '09025_T_unit $1 can'#039't be s','hared linked, switching to static link'+ - 'ing'#000+ - '09026_E_unit $1 can'#039't be smart or static linked'#000+ + '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+ + 'g'#000+ + '09026_E_unit $1 ','can'#039't be smart or static linked'#000+ '09027_E_unit $1 can'#039't be shared or static linked'#000+ '09028_D_Calling resource compiler "$1" with "$2" as command line'#000+ - '09128_F_Can'#039't post process executabl','e $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+ + '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+ '09134_X_Stack space committed: $1 bytes'#000+ - '1000','0_T_Unitsearch: $1'#000+ + '10000_T_Unitsearch: $1'#000+ '10001_T_PPU Loading $1'#000+ - '10002_U_PPU Name: $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 compiled for an other target'#000+ + '10009_U_PPU is compiled for another processor'#000+ + '10010_U_PPU is comp','iled 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+ + '10016_F_Invalid PPU-File entry: $1'#000+ '10017_F_PPU Dbx count problem'#000+ - '10018_E_Illegal unit name: $1'#000+ + '10018_E_Illeg','al 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+ - '10','023_W_Unit $1 was not found but $2 exists'#000+ - '10024_F_Unit $1 searched but $2 found'#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_Reco','mpiling $1, checksum changed for $2'#000+ - '10029_U_Recompiling $1, source found only'#000+ + '10028_U_Recompiling $1, checksum changed for $2'#000+ + '10029_U_Recompiling $1',', source found only'#000+ '10030_U_Recompiling unit, static lib is older than ppufile'#000+ '10031_U_Recompiling unit, shared lib is older than ppufile'#000+ - '10032_U_Recompiling unit, obj and asm are ol','der 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 th','an 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 fou','nd modifed include files'+ - #000+ - '10041_U_File $1 is newer than PPU file $2'#000+ + '10040_W_Can'#039't recompile unit $1, but found modifed include 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_Interf','ace CRC changed for unit $1'#000+ - '10046_U_Implementation CRC changed for unit $1'#000+ + '10045_U_Interface CRC changed for unit $1'#000+ + '10046_U_Implementation CRC cha','nged 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+ + '10051_U_Flag for reload: $1'#000+ '10052_U_Forced reloading'#000+ - '10053_U_Previous state of $1: $2'#000+ + '10053_U_Previous s','tate 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+ + '10058_U_Re-resolving unit $1'#000+ + '10059_U_Skipping re-resolving unit $1, still loading u','sed units'#000+ '11000_O_$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 suppor','ted'#000+ + '11003_E_nested response files are not supported'#000+ '11004_F_No source file name in command line'#000+ - '11005_N_No option inside $1 config file'#000+ + '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 o','ptions from $1'#000+ + '11010_D_Reading further options from $1'#000+ '11011_W_Target is already set to: $1'#000+ - '11012_W_Shared libs not supported on DOS platform, reverting to static'+ - #000+ + '11012_','W_Shared libs not supported on DOS platform, reverting to stat'+ + 'ic'#000+ '11013_F_too many IF(N)DEFs'#000+ '11014_F_too many ENDIFs'#000+ '11015_F_open conditional at the end of the file'#000+ - '11016_W_Debug info','rmation generation is not supported by this execut'+ - 'able'#000+ - '11017_H_Try recompiling with -dGDB'#000+ + '11016_W_Debug information generation is not supported by this executab'+ + 'le'#000+ + '110','17_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+ + '11020_N_Switching assembler to default source writing assembler'#000+ + '11021_W_Assembler output selected "$1" ','is not compatible with "$2"'#000+ '11022_W_"$1" assembler use forced'#000+ '11026_T_Reading options from file $1'#000+ '11027_T_Reading options from environment $1'#000+ '11028_D_Handling option "$1"'#000+ - '11029__***',' press enter ***'#000+ + '11029__*** press enter ***'#000+ '11030_H_Start of reading config file $1'#000+ - '11031_H_End of reading config file $1'#000+ + '1','1031_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+ + '11034_D_Reading config file "$1"'#000+ '11035_D_found source file name "$1"'#000+ - '11039_E_Unknown code page'#000+ + '11039_E_Unknown code',' page'#000+ '11040_F_Config file $1 is a directory'#000+ '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+ 'ugging disabled'#000+ - '11023_Free Pascal Compiler version $FPCFULLVERSION [','$FPCDATE] for $F'+ - 'PCCPU'#010+ - 'Copyright (c) 1993-2007 by Florian Klaempfl'#000+ + '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+ + 'CPU'#010+ + 'Copyright (c) 1993-2007 by Florian K','laempfl'#000+ '11024_Free Pascal Compiler version $FPCVERSION'#010+ #010+ 'Compiler Date : $FPCDATE'#010+ @@ -822,10 +820,10 @@ const msgtxt : array[0..000188,1..240] of char=( ' $OSTARGETS'#010+ #010+ 'Supported CPU instruction sets:'#010+ - ' ',' $INSTRUCTIONSETS'#010+ + ' $INSTRUCTIONSETS'#010+ #010+ 'Supported FPU instruction sets:'#010+ - ' $FPUINSTRUCTIONSETS'#010+ + ' $FPUI','NSTRUCTIONSETS'#010+ #010+ 'Supported Optimizations:'#010+ ' $OPTIMIZATIONS'#010+ @@ -833,256 +831,256 @@ const msgtxt : array[0..000188,1..240] of char=( 'This program comes under the GNU General Public Licence'#010+ 'For more information read COPYING.FPC'#010+ #010+ - 'Report bugs,suggestions etc ','to:'#010+ + 'Report bugs,suggestions etc to:'#010+ ' bugs@freepascal.org'#000+ - '11025_**0*_Put + after a boolean switch option to enable it, - to disa'+ - 'ble it'#010+ + '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 nod','e info in assembler file'#010+ - '*L2ap_Use pipes instead of creating temporary assembler files'#010+ + '**2an_List node info in assembler file'#010+ + '*L2ap_Use pipes instead of creati','ng temporary assembler files'#010+ '**2ar_List register allocation/release info in assembler file'#010+ '**2at_List temp allocation/release info in assembler file'#010+ '**1A_Output format:'#010+ - '**2Adefaul','t_Use default assembler'#010+ + '**2Adefault_Use default assembler'#010+ '3*2Aas_Assemble using GNU AS'#010+ - '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+ + '3*2An','asmcoff_COFF (Go32v2) file using Nasm'#010+ '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+ '3*2Anasmwin32_Win32 object file using Nasm'#010+ '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+ - '3*2Awasm_O','bj file using Wasm (Watcom)'#010+ - '3*2Anasmobj_Obj file using Nasm'#010+ + '3*2Awasm_Obj file using Wasm (Watcom)'#010+ + '3*2Anasmobj_Obj file using Nas','m'#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*2Acoff_COFF (Go32v2) using internal writer'#010+ - '3*2Apecoff_PE','-COFF (Win32) using internal writer'#010+ - '4*2Aas_Assemble using GNU AS'#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*2Amit_MIT Syntax (old GAS)'#010+ '6*2Amot_Standard Motorola assembler'#010+ 'A*2Aas_Assemble using GNU AS'#010+ - 'P*2Aas_Assemble us','ing GNU AS'#010+ + 'P*2Aas_Assemble using GNU AS'#010+ 'S*2Aas_Assemble using GNU AS'#010+ - '**1b_Generate browser info'#010+ + '**1b_Generate brow','ser info'#010+ '**2bl_Generate local symbol info'#010+ '**1B_Build all modules'#010+ '**1C_Code generation options:'#010+ '**2Cc_Set default calling convention to '#010+ - '**2CD_Create also dynamic library (no','t supported)'#010+ - '**2Ce_Compilation with emulated floating point opcodes'#010+ + '**2CD_Create also dynamic library (not supported)'#010+ + '**2Ce_Compilation with emulated floating poin','t 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+ - '**2C','h_ bytes heap (between 1023 and 67107840)'#010+ - '**2Ci_IO-checking'#010+ + '**2Ch_ bytes heap (between 1023 and 67107840)'#010+ + '**2Ci_IO-c','hecking'#010+ '**2Cn_Omit linking stage'#010+ '**2Co_Check overflow of integer operations'#010+ '**2Cp_Select instruction set, see fpc -i for possible values'#010+ '**2CP=_ packing settings'#010+ - '**3CPPACKSE','T=_ set allocation: 0, 1 or DEFAULT or NORMAL, 2, '+ - '4 and 8'#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 size to '#010+ '**2Ct_Stack checking'#010+ '**2CX_Create also smartlinked library'#010+ - '**1d_Defines the sym','bol '#010+ + '**1d_Defines the symbol '#010+ '**1D_Generate a DEF file'#010+ - '**2Dd_Set description to '#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+ '**1F_Set file names and paths:'#010+ - '**2Fa[,y]_(for a ','program) load units and [y] before uses is p'+ - 'arsed'#010+ - '**2Fc_Set input codepage to '#010+ + '**2Fa[,y]_(for a program) load units and [y] before uses is par'+ + 'sed'#010+ + '**2F','c_Set input codepage to '#010+ '**2FC_Set RC compiler binary name to '#010+ '**2FD_Set the directory where to search for compiler utilities'#010+ '**2Fe_Redirect error output to '#010+ - '**2','Ff_Add to framework path (Darwin only)'#010+ - '**2FE_Set exe/unit output path 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 as dynamic linker'#010+ - '**2Fm_Load unicode conversion table from .txt ','in the compiler '+ - 'dir'#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<','x>_Load error message file '#010+ '**2FR_Set resource (.res) linker to '#010+ '**2Fu_Add to unit path'#010+ '**2FU_Set unit output path to , overrides -FE'#010+ - '*g1g_Generate debug inform','ation (default format for target)'#010+ - '*g2gc_Generate checks for pointers'#010+ + '*g1g_Generate debug information (default format for target)'#010+ + '*g2gc_Generate checks fo','r 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+ - '*g3godwarf','sets_ Enable Dwarf set debug information (breaks gdb < 6.5'+ - ')'#010+ + '*g3godwarfsets_ Enable Dwarf set debug information (breaks gdb < 6.5',')'+ + #010+ '*g2gp_Preserve case in stabs symbol names'#010+ '*g2gs_Generate stabs debug information'#010+ '*g2gt_Trash local variables (to detect uninitialized uses)'#010+ - '*g2gv_Generates programs traceable with ','valgrind'#010+ - '*g2gw_Generate dwarf-2 debug information (same as -gw2)'#010+ + '*g2gv_Generates programs traceable with valgrind'#010+ + '*g2gw_Generate dwarf-2 debug information (same as',' -gw2)'#010+ '*g2gw2_Generate dwarf-2 debug information'#010+ '*g2gw3_Generate dwarf-3 debug information'#010+ '**1i_Information'#010+ '**2iD_Return compiler date'#010+ '**2iV_Return short compiler version'#010+ - '**2iW_Retur','n full compiler version'#010+ + '**2iW_Return full compiler version'#010+ '**2iSO_Return compiler OS'#010+ - '**2iSP_Return compiler host processor'#010+ + '**2iSP_R','eturn 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+ '**1l_Write logo'#010+ - '**1M_Set langua','ge mode to '#010+ + '**1M_Set language mode to '#010+ '**2Mfpc_Free Pascal dialect (default)'#010+ - '**2Mobjfpc_FPC mode with Object Pascal support'#010+ + '**2Mo','bjfpc_FPC mode with Object Pascal support'#010+ '**2Mdelphi_Delphi 7 compatibility mode'#010+ '**2Mtp_TP/BP 7.0 compatibility mode'#010+ '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+ - '**1n_Do n','ot read the default config files'#010+ - '**1N_Node tree optimizations'#010+ + '**1n_Do not read the default config files'#010+ + '**1N_Node tree optimiz','ations'#010+ '**2Nu_Unroll loops'#010+ '**1o_Change the name of the executable produced to '#010+ '**1O_Optimizations:'#010+ '**2O-_Disable optimizations'#010+ - '**2O1_Level 1 optimizations (quick and debugger',' friendly)'#010+ - '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+ + '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+ + '**2O2_Level 2 optimizations (-O1 + quick optimi','zations)'#010+ '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+ '**2Oa=_Set alignment'#010+ '**2Oo[NO]_Enable or disable optimizations, see fpc -i for possible '+ 'values'#010+ - '**2Op_Set t','arget cpu for optimizing, see fpc -i for possible valu'+ - 'es'#010+ - '**2Os_Optimize for size rather than speed'#010+ + '**2Op_Set target cpu for optimizing, see fpc -i for possible 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*2','Ratt_Read AT&T style assembler'#010+ - '3*2Rintel_Read Intel style assembler'#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',' -Mdelphi'#010+ - '**2Se_Error options. is a combination of the following:'#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 al','so halts after hints'#010+ - '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#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+ '**2Sk_Load fpcylix unit'#010+ - '**2SI_Se','t interface style to '#010+ - '**3SIcom_COM compatible interface (default)'#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 sta','tic keyword in objects'#010+ - '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+ + '**2St_Allow static keyword in objects'#010+ + '**2Sx_Enable exception keywords (de','fault 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',' (use with -alr)'#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*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 (cli','b)'#010+ + '3*2Tnetware_Novell Netware Module (clib)'#010+ '3*2Tnetwlibc_Novell Netware Module (libc)'#010+ - '3*2Topenbsd_OpenBSD'#010+ + '3*2Topenbsd_O','penBSD'#010+ '3*2Tos2_OS/2 / eComStation'#010+ '3*2Tsunos_SunOS/Solaris'#010+ '3*2Twatcom_Watcom compatible DOS extender'#010+ '3*2Twdosx_WDOSX DOS extender'#010+ '3*2Twin32_Windows 32 Bit'#010+ '3*2Twince_Windows CE'#010+ - '4*2Tlin','ux_Linux'#010+ + '4*2Tlinux_Linux'#010+ '6*2Tamiga_Commodore Amiga'#010+ - '6*2Tatari_Atari ST/STe/TT'#010+ + '6*2Tatari_Atari ST/STe/','TT'#010+ '6*2Tlinux_Linux/m68k'#010+ '6*2Tmacos_Macintosh m68k (not supported)'#010+ '6*2Tpalmos_PalmOS'#010+ 'A*2Tlinux_Linux'#010+ 'A*2Twince_Windows CE'#010+ 'P*2Tamiga_AmigaOS on PowerPC'#010+ - 'P*2Tdarwin_Darwin and Mac OS X 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*2Tmacos_Mac OS (clas','sic) 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 name'#010+ - '**2Ur_Generate re','lease unit files (never automatically recompiled)'#010+ - '**2Us_Compile a system unit'#010+ + '**2Ur_Generate release unit files (never automatically recompiled)'#010+ + '**2Us_Co','mpile 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*_n : Show notes t : Show tried/used files'#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 : Show linenumbers ',' r : Rhide/GCC compatibility mod'+ - 'e'#010+ - '**2*_a : Show everything x : Executable info (Win32 only)'#010+ + '**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+ + '**2*_a : Show ever','ything x : Executable info (Win32 only'+ + ')'#010+ '**2*_b : Write file names messages with full path'#010+ '**2*_v : Write fpcdebug.txt with p : Write tree.log with parse tre'+ 'e'#010+ - '**2*_ ',' lots of debugging info'#010+ - '3*1W_Target-specific options (targets)'#010+ + '**2*_ lots of debugging info'#010+ + '3*1W_Target-specific options (t','argets)'#010+ 'A*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 lib','rary (Darwin)'#010+ - 'p*2Wb_Create a bundle instead of a library (Darwin)'#010+ + 'P*2Wb_Create 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 conso','le type application (Windows)'#010+ - 'P*2WC_Specify console type application (Classic Mac OS)'#010+ + 'A*2WC_Specify console type application (Windows)'#010+ + 'P*2WC_Specify console type a','pplication (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*2WF_Specify full-screen type',' application (EMX, OS/2)'#010+ - '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+ + '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+ + '3*2WG_Specify graphic type applic','ation (EMX, OS/2, Windows)'#010+ 'A*2WG_Specify graphic type application (Windows)'#010+ 'P*2WG_Specify graphic type application (Classic Mac OS)'#010+ - '3*2WN_Do not generate relocation code, needed for ','debugging (Windows'+ + '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ + 'A*2WN_Do not generate relocation code,',' 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+ - '**1X_Execut','able options:'#010+ - '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+ - 'ux)'#010+ + '**1X_Executable options:'#010+ + '**2Xc_Pass --shared/-dynamic to the linker (','BeOS, Darwin, FreeBSD, L'+ + 'inux)'#010+ '**2Xd_Do not use standard library search path (needed for cross compil'+ 'e)'#010+ '**2Xe_Use external linker'#010+ - '**2XD_Try to link units dynamically (defines FPC','_LINK_DYNAMIC)'#010+ + '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+ '**2Xi_Use internal linker'#010+ - '**2Xm_Generate link map'#010+ + '**2Xm_Generate li','nk 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 library search path to (needed',' for cross compile) ('+ - 'BeOS, Linux)'#010+ - '**2XR_Prepend to all linker search paths (BeOS, Darwin, FreeBSD'+ - ', Linux, Mac OS, Solaris)'#010+ + '**2Xr_Set library search path to (needed for cross compile) (Be'+ + 'OS, Linux)'#010+ + '**2XR_Prepend to ','all linker search paths (BeOS, Darwin, FreeB'+ + 'SD, Linux, Mac OS, Solaris)'#010+ '**2Xs_Strip all symbols from executable'#010+ - '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010, - '**2Xt_Link with static libraries (-static is passed to linker)'#010+ + '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+ + '**2Xt_Link with static libraries (-static is passed to lin','ker)'#010+ '**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010+ '**1*_'#010+ '**1?_Show this help'#010+ diff --git a/compiler/pbase.pas b/compiler/pbase.pas index 3fb8655e26..9c1fcaf6b8 100644 --- a/compiler/pbase.pas +++ b/compiler/pbase.pas @@ -61,6 +61,8 @@ interface { true, if we found a name for a named arg } found_arg_name : boolean; + { true, if we are parsing generic declaration } + parse_generic : boolean; procedure identifier_not_found(const s:string); diff --git a/compiler/pdecobj.pas b/compiler/pdecobj.pas index 36934d53a4..210dee6ea1 100644 --- a/compiler/pdecobj.pas +++ b/compiler/pdecobj.pas @@ -391,7 +391,8 @@ implementation { reads the parent class } if try_to_consume(_LKLAMMER) then begin - id_type(hdef,false); + { use single_type instead of id_type for specialize support } + single_type(hdef,false); if (not assigned(hdef)) or (hdef.typ<>objectdef) then begin @@ -513,12 +514,15 @@ implementation generictype : ttypesym; current_blocktype : tblock_type; oldaktobjectdef : tobjectdef; + old_parse_generic : boolean; begin old_object_option:=current_object_option; oldaktobjectdef:=aktobjectdef; + old_parse_generic:=parse_generic; { objects and class types can't be declared local } - if not(symtablestack.top.symtabletype in [globalsymtable,staticsymtable]) then + if not(symtablestack.top.symtabletype in [globalsymtable,staticsymtable]) and + not assigned(genericlist) then Message(parser_e_no_local_objects); storetypecanbeforward:=typecanbeforward; @@ -563,7 +567,10 @@ implementation begin generictype:=ttypesym(genericlist[i]); if generictype.typedef.typ=undefineddef then - include(aktobjectdef.defoptions,df_generic) + begin + include(aktobjectdef.defoptions,df_generic); + parse_generic:=true; + end else include(aktobjectdef.defoptions,df_specialization); symtablestack.top.insert(generictype); @@ -831,6 +838,7 @@ implementation aktobjectdef:=oldaktobjectdef; testcurobject:=0; typecanbeforward:=storetypecanbeforward; + parse_generic:=old_parse_generic; current_object_option:=old_object_option; end; diff --git a/compiler/pdecsub.pas b/compiler/pdecsub.pas index cf00fe86a6..1955f40fe3 100644 --- a/compiler/pdecsub.pas +++ b/compiler/pdecsub.pas @@ -403,6 +403,7 @@ implementation defaultvalue : tconstsym; defaultrequired : boolean; old_object_option : tsymoptions; + old_block_type : tblock_type; currparast : tparasymtable; parseprocvar : tppv; explicit_paraloc : boolean; @@ -410,6 +411,8 @@ implementation paranr : integer; dummytype : ttypesym; begin + old_object_option:=current_object_option; + old_block_type:=block_type; explicit_paraloc:=false; consume(_LKLAMMER); { Delphi/Kylix supports nonsense like } @@ -424,9 +427,9 @@ implementation defaultrequired:=false; paranr:=0; { the variables are always public } - old_object_option:=current_object_option; current_object_option:=[sp_public]; inc(testcurobject); + block_type:=bt_type; repeat parseprocvar:=pv_none; if try_to_consume(_VAR) then @@ -630,6 +633,7 @@ implementation { reset object options } dec(testcurobject); current_object_option:=old_object_option; + block_type:=old_block_type; consume(_RKLAMMER); end; @@ -649,9 +653,11 @@ implementation aprocsym : tprocsym; popclass : boolean; ImplIntf : TImplementedInterface; + old_parse_generic : boolean; begin { Save the position where this procedure really starts } procstartfilepos:=current_tokenpos; + old_parse_generic:=parse_generic; result:=false; pd:=nil; @@ -848,7 +854,10 @@ implementation (pd.parast.symtablelevel=normal_function_level) then begin if (df_generic in pd._class.defoptions) then - include(pd.defoptions,df_generic); + begin + include(pd.defoptions,df_generic); + parse_generic:=true; + end; if (df_specialization in pd._class.defoptions) then begin include(pd.defoptions,df_specialization); @@ -902,6 +911,7 @@ implementation symtablestack.pop(pd._class.symtable); end; + parse_generic:=old_parse_generic; result:=true; end; diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas index 7d15728b05..d8664e330a 100644 --- a/compiler/pexpr.pas +++ b/compiler/pexpr.pas @@ -2018,7 +2018,8 @@ implementation end; else begin - Message(parser_e_invalid_qualifier); + if p1.resultdef.typ<>undefineddef then + Message(parser_e_invalid_qualifier); p1.destroy; p1:=cerrornode.create; comp_expr(true); @@ -2138,7 +2139,8 @@ implementation end; else begin - Message(parser_e_invalid_qualifier); + if p1.resultdef.typ<>undefineddef then + Message(parser_e_invalid_qualifier); p1.destroy; p1:=cerrornode.create; { Error } @@ -2153,13 +2155,14 @@ implementation if assigned(p1.resultdef) and (p1.resultdef.typ=procvardef) then begin - if assigned(getprocvardef) and - equal_defs(p1.resultdef,getprocvardef) then + { Typenode for typecasting or expecting a procvar } + if (p1.nodetype=typen) or + ( + assigned(getprocvardef) and + equal_defs(p1.resultdef,getprocvardef) + ) then begin - { classes can define now types so we've to allow - type casts with these nested types as well } - if (p1.nodetype=typen) and - try_to_consume(_LKLAMMER) then + if try_to_consume(_LKLAMMER) then begin p1:=comp_expr(true); consume(_RKLAMMER); diff --git a/compiler/psub.pas b/compiler/psub.pas index 4858e62a33..3e429d1954 100644 --- a/compiler/psub.pas +++ b/compiler/psub.pas @@ -1286,14 +1286,14 @@ implementation { stop token recorder for generic template } current_scanner.stoprecordtokens; - { Give a warning for accesses in the static symtable that aren't visible + { Give an error for accesses in the static symtable that aren't visible outside the current unit } st:=procdef.owner; while (st.symtabletype=ObjectSymtable) do st:=st.defowner.owner; if (pi_uses_static_symtable in flags) and (st.symtabletype<>staticsymtable) then - Comment(V_Warning,'Global Generic template references static symtable'); + Comment(V_Error,'Global Generic template references static symtable'); end; { save exit info } @@ -1788,6 +1788,7 @@ implementation hmodule : tmodule; begin if not((tsym(p).typ=typesym) and + (ttypesym(p).typedef.typesym=tsym(p)) and (ttypesym(p).typedef.typ=objectdef) and (df_specialization in ttypesym(p).typedef.defoptions) ) then diff --git a/compiler/ptype.pas b/compiler/ptype.pas index 806fa25c53..39f9decca3 100644 --- a/compiler/ptype.pas +++ b/compiler/ptype.pas @@ -63,7 +63,7 @@ implementation globals,tokens,verbose,constexp, systems, { target } - paramgr, + paramgr,procinfo, { symtable } symconst,symsym,symtable, defutil,defcmp, @@ -77,29 +77,50 @@ implementation pbase,pexpr,pdecsub,pdecvar,pdecobj; - procedure generate_specialization(var pt1:tnode;const name:string); + procedure generate_specialization(var tt:tdef); var st : TSymtable; + srsym : tsym; pt2 : tnode; first, err : boolean; i : longint; sym : tsym; + old_block_type : tblock_type; genericdef : tstoreddef; generictype : ttypesym; generictypelist : TFPObjectList; oldsymtablestack : tsymtablestack; hmodule : tmodule; pu : tused_unit; + uspecializename, + specializename : string; + vmtbuilder : TVMTBuilder; + onlyparsepara : boolean; begin { retrieve generic def that we are going to replace } - genericdef:=tstoreddef(pt1.resultdef); - pt1.resultdef:=nil; + genericdef:=tstoreddef(tt); + tt:=nil; + onlyparsepara:=false; + if not(df_generic in genericdef.defoptions) then begin Message(parser_e_special_onlygenerics); - pt1.resultdef:=generrordef; - { recover } + tt:=generrordef; + onlyparsepara:=true; + end; + + { Only need to record the tokens, then we don't know the type yet } + if parse_generic then + begin + tt:=cundefinedtype; + onlyparsepara:=true; + end; + + { Only parse the parameters for recovery or + for recording in genericbuf } + if onlyparsepara then + begin consume(_LSHARPBRACKET); repeat pt2:=factor(false); @@ -108,7 +129,9 @@ implementation consume(_RSHARPBRACKET); exit; end; + consume(_LSHARPBRACKET); + old_block_type:=block_type; block_type:=bt_specialize; { Parse generic parameters, for each undefineddef in the symtable of the genericdef we need to have a new def } @@ -124,6 +147,11 @@ implementation end; if not assigned(st) then internalerror(200511182); + + { Parse type parameters } + if not assigned(genericdef.typesym) then + internalerror(200710173); + specializename:=genericdef.typesym.realname; for i:=0 to st.SymList.Count-1 do begin sym:=tsym(st.SymList[i]); @@ -141,6 +169,9 @@ implementation Message(parser_e_no_generics_as_params); generictype:=ttypesym.create(sym.realname,pt2.resultdef); generictypelist.add(generictype); + if not assigned(pt2.resultdef.typesym) then + internalerror(200710172); + specializename:=specializename+'$'+pt2.resultdef.typesym.realname; end else begin @@ -150,52 +181,89 @@ implementation pt2.free; end; end; + uspecializename:=upper(specializename); { force correct error location if too much type parameters are passed } if token<>_RSHARPBRACKET then consume(_RSHARPBRACKET); - { Setup symtablestack a definition time - to get types right, however this is not perfect, we should probably record - the resolved symbols } - oldsymtablestack:=symtablestack; - symtablestack:=tsymtablestack.create; - if not assigned(genericdef) then - internalerror(200705151); - hmodule:=find_module_from_symtable(genericdef.owner); - if hmodule=nil then - internalerror(200705152); - pu:=tused_unit(hmodule.used_units.first); - while assigned(pu) do + { Special case if we are referencing the current defined object } + if assigned(aktobjectdef) and + (aktobjectdef.objname^=uspecializename) then + tt:=aktobjectdef; + + { Can we reuse an already specialized type? } + if not assigned(tt) then begin - if not assigned(pu.u.globalsymtable) then - internalerror(200705153); - symtablestack.push(pu.u.globalsymtable); - pu:=tused_unit(pu.next); + srsym:=tsym(tsymtable(current_module.localsymtable).find(uspecializename)); + if assigned(srsym) then + begin + if srsym.typ<>typesym then + internalerror(200710171); + tt:=ttypesym(srsym).typedef; + end; end; - if assigned(hmodule.globalsymtable) then - symtablestack.push(hmodule.globalsymtable); - - { hacky, but necessary to insert the newly generated class properly } - symtablestack.push(oldsymtablestack.top); - - { Reparse the original type definition } - if not err then + if not assigned(tt) then begin - if not assigned(genericdef.generictokenbuf) then - internalerror(200511171); - current_scanner.startreplaytokens(genericdef.generictokenbuf); - read_named_type(pt1.resultdef,name,genericdef,generictypelist,false); - { Consume the semicolon if it is also recorded } - try_to_consume(_SEMICOLON); - end; + { Setup symtablestack at definition time + to get types right, however this is not perfect, we should probably record + the resolved symbols } + oldsymtablestack:=symtablestack; + symtablestack:=tsymtablestack.create; + if not assigned(genericdef) then + internalerror(200705151); + hmodule:=find_module_from_symtable(genericdef.owner); + if hmodule=nil then + internalerror(200705152); + pu:=tused_unit(hmodule.used_units.first); + while assigned(pu) do + begin + if not assigned(pu.u.globalsymtable) then + internalerror(200705153); + symtablestack.push(pu.u.globalsymtable); + pu:=tused_unit(pu.next); + end; - { Restore symtablestack } - symtablestack.free; - symtablestack:=oldsymtablestack; + if assigned(hmodule.globalsymtable) then + symtablestack.push(hmodule.globalsymtable); + + { hacky, but necessary to insert the newly generated class properly } + symtablestack.push(oldsymtablestack.top); + + { Reparse the original type definition } + if not err then + begin + { Firsta new typesym so we can reuse this specialization and + references to this specialization can be handled } + srsym:=ttypesym.create(specializename,generrordef); + current_module.localsymtable.insert(srsym); + + if not assigned(genericdef.generictokenbuf) then + internalerror(200511171); + current_scanner.startreplaytokens(genericdef.generictokenbuf); + read_named_type(tt,specializename,genericdef,generictypelist,false); + ttypesym(srsym).typedef:=tt; + tt.typesym:=srsym; + { Consume the semicolon if it is also recorded } + try_to_consume(_SEMICOLON); + + { Build VMT indexes for classes } + if (tt.typ=objectdef) then + begin + vmtbuilder:=TVMTBuilder.Create(tobjectdef(tt)); + vmtbuilder.generate_vmt; + vmtbuilder.free; + end; + end; + + { Restore symtablestack } + symtablestack.free; + symtablestack:=oldsymtablestack; + end; generictypelist.free; consume(_RSHARPBRACKET); + block_type:=old_block_type; end; @@ -280,8 +348,10 @@ implementation procedure single_type(var def:tdef;isforwarddef:boolean); var t2 : tdef; + dospecialize, again : boolean; begin + dospecialize:=false; repeat again:=false; case token of @@ -304,9 +374,7 @@ implementation begin if try_to_consume(_SPECIALIZE) then begin - if block_type<>bt_type then - Message(parser_f_no_anonymous_specializations); - block_type:=bt_specialize; + dospecialize:=true; again:=true; end else @@ -320,6 +388,16 @@ implementation end; end; until not again; + if dospecialize then + generate_specialization(def) + else + begin + if (df_generic in def.defoptions) then + begin + Message(parser_e_no_generics_as_types); + def:=generrordef; + end; + end; end; { reads a record declaration } @@ -373,8 +451,10 @@ implementation pt1,pt2 : tnode; lv,hv : TConstExprInt; old_block_type : tblock_type; + dospecialize : boolean; begin old_block_type:=block_type; + dospecialize:=false; { use of current parsed object: - classes can be used also in classes - objects can be parameters } @@ -392,14 +472,10 @@ implementation end; { Generate a specialization? } if try_to_consume(_SPECIALIZE) then - begin - if name='' then - Message(parser_f_no_anonymous_specializations); - block_type:=bt_specialize; - end; + dospecialize:=true; { we can't accept a equal in type } pt1:=comp_expr(false); - if (block_type<>bt_specialize) and + if not dospecialize and try_to_consume(_POINTPOINT) then begin { get high value of range } @@ -451,13 +527,16 @@ implementation { a simple type renaming or generic specialization } if (pt1.nodetype=typen) then begin - if (block_type=bt_specialize) then - generate_specialization(pt1,name); def:=ttypenode(pt1).resultdef; - if (block_type<>bt_specialize) and (df_generic in def.defoptions) then + if dospecialize then + generate_specialization(def) + else begin - Message(parser_e_no_generics_as_types); - def:=generrordef; + if (df_generic in def.defoptions) then + begin + Message(parser_e_no_generics_as_types); + def:=generrordef; + end; end; end else @@ -847,10 +926,13 @@ implementation write_persistent_type_info(trecorddef(def).symtable); objectdef : begin + { Skip generics and forward defs } + if (df_generic in def.defoptions) or + (oo_is_forward in tobjectdef(def).objectoptions) then + continue; write_persistent_type_info(tobjectdef(def).symtable); - { Write also VMT } - if not(ds_vmt_written in def.defstates) and - not(oo_is_forward in tobjectdef(def).objectoptions) then + { Write also VMT if not done yet } + if not(ds_vmt_written in def.defstates) then begin vmtwriter:=TVMTWriter.create(tobjectdef(def)); if is_interface(tobjectdef(def)) then diff --git a/tests/test/tgeneric1.pp b/tests/test/tgeneric1.pp index 7927e84b18..1290f1f646 100644 --- a/tests/test/tgeneric1.pp +++ b/tests/test/tgeneric1.pp @@ -13,10 +13,12 @@ end; type TMyIntList = specialize TList; + TMyIntList2 = specialize TList; TMyStringList = specialize TList; var ilist : TMyIntList; + ilist2 : TMyIntList2; slist : TMyStringList; someInt : integer; begin @@ -27,6 +29,13 @@ begin if ilist.data<>10 then halt(1); + someInt:=20; + ilist2 := TMyIntList2.Create; + ilist2.Add(someInt); + writeln(ilist2.data); + if ilist2.data<>20 then + halt(1); + slist := TMyStringList.Create; slist.Add('Test'); writeln(slist.data); diff --git a/tests/test/tgeneric10.pp b/tests/test/tgeneric10.pp index 7578c74e09..cd0c9fc9a3 100644 --- a/tests/test/tgeneric10.pp +++ b/tests/test/tgeneric10.pp @@ -6,7 +6,7 @@ uses type TMyIntList = specialize TList; -function CompareInt(Item1, Item2: Integer): Integer; +function CompareInt(const Item1, Item2: Integer): Integer; begin Result := Item2 - Item1; end; diff --git a/tests/test/tgeneric11.pp b/tests/test/tgeneric11.pp index 4f35f1502b..3b4d9585f6 100644 --- a/tests/test/tgeneric11.pp +++ b/tests/test/tgeneric11.pp @@ -2,10 +2,10 @@ type generic TList<_T>=class(TObject) - var public + var public data : _T; procedure Add(item: _T); - procedure Assign(Source: TList); + procedure Assign(Source: specialize TList<_T>); end; procedure TList.Add(item: _T); @@ -13,7 +13,7 @@ begin data:=item; end; -procedure TList.Assign(Source: TList); +procedure TList.Assign(Source: specialize TList<_T>); begin data:=Source.data; end; diff --git a/tests/test/tgeneric14.pp b/tests/test/tgeneric14.pp index 7339ce6801..94b67cde47 100644 --- a/tests/test/tgeneric14.pp +++ b/tests/test/tgeneric14.pp @@ -1,7 +1,11 @@ +{ %fail } + {$mode objfpc} { we test the context sensitivity of generics here, by checking whether names - are looked up at specialization or at definition time } + are looked up at specialization or at definition time. + For the moment this fails, because the assembler symbols are not global and + therefor not accessible from other .o files } uses ugeneric14; diff --git a/tests/test/tgeneric4.pp b/tests/test/tgeneric4.pp index 9873031ed5..99e17e338e 100644 --- a/tests/test/tgeneric4.pp +++ b/tests/test/tgeneric4.pp @@ -1,3 +1,5 @@ +{ %fail } + uses ugeneric4; procedure LocalFill; @@ -5,6 +7,11 @@ begin globaldata:='Program'; end; +{ The next specialization should not find the LocalFill + defined in the program. It should found the LocalFill + in ugeneric4, but for the moment that is not allowed since + the assembler symbol is not global and will therefor + generate a failure a linking time (PFV) } type TMyStringList = specialize TList; @@ -14,6 +21,6 @@ begin slist := TMyStringList.Create; slist.Fill; writeln(slist.data); - if slist.data<>'Program' then + if slist.data<>'Unit' then halt(1); end. diff --git a/tests/test/tgeneric7.pp b/tests/test/tgeneric7.pp index e3773b6770..fbfe2f5a20 100644 --- a/tests/test/tgeneric7.pp +++ b/tests/test/tgeneric7.pp @@ -5,7 +5,7 @@ {$R-} uses - tugeneric7; + ugeneric7; type tmytype = specialize tgeneric; diff --git a/tests/test/tugeneric7.pp b/tests/test/ugeneric7.pp similarity index 95% rename from tests/test/tugeneric7.pp rename to tests/test/ugeneric7.pp index 25b580c710..597f45bfd0 100644 --- a/tests/test/tugeneric7.pp +++ b/tests/test/ugeneric7.pp @@ -1,6 +1,6 @@ {$mode objfpc} -unit tugeneric7; +unit ugeneric7; interface