diff --git a/compiler/htypechk.pas b/compiler/htypechk.pas index b10134a147..0a57995277 100644 --- a/compiler/htypechk.pas +++ b/compiler/htypechk.pas @@ -116,6 +116,8 @@ interface {$endif def extdebug} allow_array_constructor : boolean = false; + function node2opstr(nt:tnodetype):string; + { check operator args and result type } function isbinaryoperatoroverloadable(treetyp:tnodetype;ld:tdef;lt:tnodetype;rd:tdef;rt:tnodetype) : boolean; function isoperatoracceptable(pf : tprocdef; optoken : ttoken) : boolean; @@ -159,6 +161,19 @@ implementation TValidAssigns=set of TValidAssign; + function node2opstr(nt:tnodetype):string; + var + i : integer; + begin + for i:=1 to tok2nodes do + if tok2node[i].nod=nt then + begin + result:=tokeninfo^[tok2node[i].tok].str; + break; + end; + end; + + function isbinaryoperatoroverloadable(treetyp:tnodetype;ld:tdef;lt:tnodetype;rd:tdef;rt:tnodetype) : boolean; function internal_check(treetyp:tnodetype;ld:tdef;lt:tnodetype;rd:tdef;rt:tnodetype;var allowed:boolean):boolean; @@ -173,8 +188,7 @@ implementation end; procvardef : begin - if (rd.deftype in [pointerdef,procdef,procvardef]) and - (treetyp in [equaln,unequaln]) then + if (rd.deftype in [pointerdef,procdef,procvardef]) then begin allowed:=false; exit; @@ -183,16 +197,8 @@ implementation end; pointerdef : begin - if ((rd.deftype in [pointerdef,classrefdef,procvardef]) or - is_class_or_interface(rd)) and - (treetyp in [equaln,unequaln,gtn,gten,ltn,lten,addn,subn]) then - begin - allowed:=false; - exit; - end; - - { don't allow operations on pointer/integer } - if is_integer(rd) then + if ((rd.deftype in [orddef,pointerdef,classrefdef,procvardef]) or + is_class_or_interface(rd)) then begin allowed:=false; exit; @@ -200,10 +206,14 @@ implementation { don't allow pchar+string } if is_pchar(ld) and - (treetyp in [addn,equaln,unequaln,gtn,gten,ltn,lten]) and - (is_chararray(rd) or - is_char(rd) or - (rd.deftype=stringdef)) then + (is_char(rd) or + is_widechar(rd) or + is_pchar(rd) or + is_pwidechar(rd) or + is_integer(rd) or + (rd.deftype=stringdef) or + is_chararray(rd) or + is_widechararray(rd)) then begin allowed:=false; exit; @@ -221,7 +231,6 @@ implementation end; { not chararray+[(wide)char,(wide)string,(wide)chararray] } if is_chararray(ld) and - (treetyp in [addn,equaln,unequaln,gtn,gten,ltn,lten]) and (is_char(rd) or is_widechar(rd) or is_pchar(rd) or @@ -264,8 +273,7 @@ implementation is_pchar(rd) or is_pwidechar(rd) or is_chararray(rd) or - is_widechararray(rd)) and - (treetyp in [addn,equaln,unequaln,gtn,gten,ltn,lten]) then + is_widechararray(rd)) then begin allowed:=false; exit; @@ -1912,7 +1920,11 @@ implementation end. { $Log$ - Revision 1.82 2004-02-26 16:11:09 peter + Revision 1.83 2004-03-18 16:19:03 peter + * fixed operator overload allowing for pointer-string + * replaced some type_e_mismatch with more informational messages + + Revision 1.82 2004/02/26 16:11:09 peter * return cnothingn and give error when the operator is not overloaded Revision 1.81 2004/02/24 16:12:39 peter diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index db2b4cb080..a4de4d4870 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -1123,6 +1123,8 @@ type_e_operator_not_allowed=04051_E_The operator is not applicable for the opera % operands type_e_constant_expr_expected=04052_E_Constant Expression expected % The compiler expects an constant expression, but gets a variable expression. +type_e_operator_not_supported_for_types=04053_E_Operation "$1" not supported types "$2" and "$3" +% The operation is not allowed for the supplied types % \end{description} # # Symtable diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 875905ce06..a8ffa944c2 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -307,6 +307,7 @@ const type_e_cant_take_address_of_abstract_method=04050; type_e_operator_not_allowed=04051; type_e_constant_expr_expected=04052; + type_e_operator_not_supported_for_types=04053; sym_e_id_not_found=05000; sym_f_internal_error_in_symtablestack=05001; sym_e_duplicate_id=05002; @@ -633,9 +634,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 36051; + MsgTxtSize = 36108; MsgIdxMax : array[1..20] of longint=( - 17,63,197,53,57,44,99,20,35,60, + 17,63,197,54,57,44,99,20,35,60, 40,1,1,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 2226968546..26c0e36417 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -343,537 +343,537 @@ const msgtxt : array[0..000150,1..240] of char=( '04050_E_The address of an abstract method can'#039't be taken'#000+ '04051_E_The operator is not applicable for the operand type'#000+ '04052_E_Constant Expression expected'#000+ - '05000_E_Identifier not foun','d "$1"'#000+ + '04053_E_Operation "$1" not ','supported types "$2" and "$3"'#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+ - '05007_E_Error in type definit','ion'#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 class type expected'#000+ - '05013_E_Instances of classes or objects with an abstract method are no'+ - 't allowed'#000, + '05013_E_Instances of cl','asses 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 supported (use switch -Sg)'#000+ - '05018_E_Label not found'#000+ + '05018_E_Label not fo','und'#000+ '05019_E_identifier isn'#039't a label'#000+ - '05020_E_label alread','y defined'#000+ + '05020_E_label already defined'#000+ '05021_E_illegal type declaration of set elements'#000+ '05022_E_Forward class definition not resolved "$1"'#000+ '05023_H_Unit "$1" not used in $2'#000+ '05024_H_Parameter "$1" not used'#000+ - '05025_N_Local variable "$1" not used'#000+ - '05026_H_Value parameter "$1"',' is assigned but never used'#000+ + '05025_N_','Local variable "$1" not used'#000+ + '05026_H_Value parameter "$1" is 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+ - '05031_N_Private method',' "$1.$2" never used'#000+ + '05030_N_Private field ','"$1.$2" is assigned but never used'#000+ + '05031_N_Private method "$1.$2" never used'#000+ '05032_E_Set type expected'#000+ '05033_W_Function result does not seem to be set'#000+ '05034_W_Type "$1" is not aligned correctly in current record for C'#000+ - '05035_E_Unknown record field identifier "$1"'#000+ - '05036_W_Local variable "$1" does n','ot seem to be initialized'#000+ + '05035_E_Unknown record',' field identifier "$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 declaration: $1'#000+ '05040_E_Data element too large'#000+ - '05042_E_No matching implementation for interface method "$','1" found'#000+ + '0','5042_E_No matching 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 unique type from this type'#000+ - '06000_E_BREAK not allowed'#000+ + '06000_E_BREAK not',' allowed'#000+ '06001_E_CONTINUE not allowed'#000+ - '06002_E_Expression ','too complicated - FPU stack overflow'#000+ + '06002_E_Expression too complicated - FPU stack overflow'#000+ '06003_E_Illegal expression'#000+ '06004_E_Invalid integer expression'#000+ '06005_E_Illegal qualifier'#000+ '06006_E_High range limit < low range limit'#000+ - '06007_E_Illegal counter variable'#000+ - '06008_E_Can'#039't determine which overloade','d function to call'#000+ + '06007_E_Illegal',' counter variable'#000+ + '06008_E_Can'#039't determine which overloaded function to call'#000+ '06009_E_Parameter list size exceeds 65535 bytes'#000+ '06010_E_Illegal type conversion: "$1" to "$2"'#000+ '06011_H_Conversion between ordinals and pointers are not portable'#000+ - '06012_E_File types must be var parameters'#000+ - '06013_E_The use of ','a far pointer isn'#039't allowed there'#000+ + '0601','2_E_File types must be var parameters'#000+ + '06013_E_The use of a far pointer isn'#039't allowed there'#000+ '06014_E_illegal call by reference parameters'#000+ '06015_E_EXPORT declared functions can'#039't be called'#000+ - '06016_W_Possible illegal call of constructor or destructor'#000+ + '06016_W_Possible illegal call of constructor or destru','ctor'#000+ '06017_N_Inefficient code'#000+ '06018_W_unreachable code'#000+ - '06','020_E_Abstract methods can'#039't be called directly'#000+ + '06020_E_Abstract methods can'#039't be called directly'#000+ '06027_DL_Register $1 weight $2 $3'#000+ '06029_DL_Stack frame is omitted'#000+ '06031_E_Object or class methods can'#039't be inline.'#000+ - '06032_E_Procvar calls cannot be inline.'#000+ - '06033_E_No code for inline procedure ','stored'#000+ + '06032_E_Procvar call','s cannot be inline.'#000+ + '06033_E_No code for inline procedure stored'#000+ '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+ 'sed, use (set)length instead'#000+ '06037_E_Constructors or destructors can not be called inside a '#039'wi'+ 'th'#039' clause'#000+ - '06038_E_Cannot call message handler methods directly'#000+ - '06039_E_','Jump in or outside of an exception block'#000+ + '0603','8_E_Cannot call message handler methods directly'#000+ + '06039_E_Jump in or outside of an exception block'#000+ '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+ '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+ - '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+ - '06043_E_Local vari','ables size exceeds supported limit'#000+ + '06042_W_Local variab','le size exceed limit for certain cpu'#039's'#000+ + '06043_E_Local variables size exceeds supported limit'#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 without identifier'#000, + '07004_E_Error build','ing record offset'#000+ + '07005_E_OFFSET used without identifier'#000+ '07006_E_TYPE used without identifier'#000+ '07007_E_Cannot use local variable or parameters here'#000+ '07008_E_need to use OFFSET here'#000+ '07009_E_need to use $ here'#000+ - '07010_E_Cannot use multiple relocatable symbols'#000+ - '07011_E_Relocatable symbol can only be adde','d'#000+ + '07010_E_Cannot use multiple reloca','table 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/labels aren'#039't allowed as references'#000+ - '07017_E_Invalid base and ','index register usage'#000+ + '07016_E_Local symbols/labe','ls aren'#039't allowed as references'#000+ + '07017_E_Invalid base and index register usage'#000+ '07018_W_Possible error in object field handling'#000+ '07019_E_Wrong scale factor specified'#000+ '07020_E_Multiple index register usage'#000+ '07021_E_Invalid operand type'#000+ - '07022_E_Invalid string as opcode operand: $1'#000+ - '07023_W_@CODE and @DAT','A not supported'#000+ + '07022_E_In','valid 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+ - '07029_W_Fwait can cause emulation problems',' with emu387'#000+ + '07028_E_Invalid sy','mbol 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_Unsupported symbol type for operand'#000+ - '07034_E_Constant value out ','of bounds'#000+ + '07033_E_Unsupp','orted 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+ + '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+ + '07041_E_Cannot use SELF outside a method'#000+ '07042_E_Cannot use OLDEBP outside a nested procedure'#000+ '07043_W_Procedures can'#039't return any value in asm code'#000+ '07044_E_SEG 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 su','ffix 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+ - '07050_E_Assembler syntax error in constant'#000+ - '07051_E_Invalid S','tring expression'#000+ + '070','50_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 of prefix and opcode: $1'#000+ - '07056_E_Invalid combination of over','ride and opcode: $1'#000+ + '07055_E_Invalid combination of ','prefix and opcode: $1'#000+ + '07056_E_Invalid combination of override and opcode: $1'#000+ '07057_E_Too many operands on line'#000+ '07058_W_NEAR ignored'#000+ '07059_W_FAR ignored'#000+ '07060_E_Duplicate local symbol $1'#000+ '07061_E_Undefined local symbol $1'#000+ - '07062_E_Unknown label identifier $1'#000+ + '07062_E_Unknown labe','l identifier $1'#000+ '07063_E_Invalid register name'#000+ - '07064_E_Inv','alid floating point register name'#000+ + '07064_E_Invalid floating point register name'#000+ '07066_W_Modulo not supported'#000+ '07067_E_Invalid floating point constant $1'#000+ '07068_E_Invalid floating point expression'#000+ '07069_E_Wrong symbol type'#000+ - '07070_E_Cannot index a local var or parameter with a register'#000+ - '0707','1_E_Invalid segment override expression'#000+ + '07070_E_C','annot 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 loca','l symbol $1'#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 specific, use .balign or .p2align'#000+ - '07081_E_Can'#039't access fields d','irectly for parameters'#000+ + '07080_N_.align is target specif','ic, 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 in this function'#000+ - '07086_W_"$1" without operand translated int','o "$1 %st,%st(1)"'#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+ + '07090_E_Char > not allowed he','re'#000+ '07093_W_ALIGN not supported'#000+ - '07094_E_Inc and Dec cannot',' be together'#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+ - '08000_F_Too many asse','mbler files'#000+ + '07098_W_No size specified and unable to determine the size of t','he op'+ + 'erands, using DWORD as default'#000+ + '08000_F_Too many assembler files'#000+ '08001_F_Selected assembler output not supported'#000+ '08002_F_Comp not supported'#000+ '08003_F_Direct not support for binary writers'#000+ - '08004_E_Allocating of data is only allowed in bss section'#000+ + '08004_E_Allocating of data is only allowed in bss ','section'#000+ '08005_F_No binary writer selected'#000+ - '08006_E_Asm: Op','code $1 not in table'#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 b','ounds $2'#000+ + '08010_E_Asm: Immedi','ate 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+ + '08015_E_Asm: Extended type not supported for t','his target'#000+ '08016_E_Asm: Duplicate label $1'#000+ - '08017_E_Asm: R','edefined label $1'#000+ + '08017_E_Asm: Redefined label $1'#000+ '08018_E_Asm: First defined here'#000+ '08019_E_Asm: Invalid register $1'#000+ '09000_W_Source operating system redefined'#000+ '09001_I_Assembling (pipe) $1'#000+ - '09002_E_Can'#039't create assember file: $1'#000+ + '09002_E_Can'#039't create assember',' file: $1'#000+ '09003_E_Can'#039't create object file: $1'#000+ - '09004_E_Ca','n'#039't create archive file: $1'#000+ + '09004_E_Can'#039't create archive file: $1'#000+ '09005_E_Assembler $1 not found, switching to external assembling'#000+ '09006_T_Using assembler: $1'#000+ '09007_E_Error while assembling exitcode $1'#000+ - '09008_E_Can'#039't call the assembler, error $1 switching to external a'+ - 'ssembling'#000, + '09008_E_Can'#039't call ','the assembler, error $1 switching to external'+ + ' assembling'#000+ '09009_I_Assembling $1'#000+ '09010_I_Assembling with smartlinking $1'#000+ '09011_W_Object $1 not found, Linking may fail !'#000+ '09012_W_Library $1 not found, Linking may fail !'#000+ - '09013_E_Error while linking'#000+ - '09014_E_Can'#039't call the linker, switching to external ','linking'#000+ + '09013_E_Error while link','ing'#000+ + '09014_E_Can'#039't call the linker, switching to external linking'#000+ '09015_I_Linking $1'#000+ '09016_E_Util $1 not found, switching to external linking'#000+ '09017_T_Using util $1'#000+ '09018_E_Creation of Executables not supported'#000+ - '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+ + '09019_E_Creation of Dynamic/Sha','red Libraries not supported'#000+ '09020_I_Closing script $1'#000+ - '090','21_E_resource compiler not found, switching to external mode'#000+ + '09021_E_resource compiler not found, switching to external mode'#000+ '09022_I_Compiling resource $1'#000+ '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+ 'king'#000+ - '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+ - #000+ - '09025_T_uni','t $1 can'#039't be shared linked, switching to static link'+ - 'ing'#000+ + '09024_T_unit $1 can'#039't',' be smart linked, switching to static linki'+ + 'ng'#000+ + '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+ + 'g'#000+ '09026_E_unit $1 can'#039't be smart or static linked'#000+ '09027_E_unit $1 can'#039't be shared or static linked'#000+ - '09028_F_Can'#039't post process executable $1'#000+ + '09028_F_Can'#039't post process ex','ecutable $1'#000+ '09029_F_Can'#039't open executable $1'#000+ - '09030_X_Size',' of Code: $1 bytes'#000+ + '09030_X_Size of Code: $1 bytes'#000+ '09031_X_Size of initialized data: $1 bytes'#000+ '09032_X_Size of uninitialized data: $1 bytes'#000+ '09033_X_Stack space reserved: $1 bytes'#000+ - '09034_X_Stack space commited: $1 bytes'#000+ + '09034_X_Stack space commited: $1 byte','s'#000+ '10000_T_Unitsearch: $1'#000+ '10001_T_PPU Loading $1'#000+ - '10002_U_P','PU 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+ + '1','0009_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+ + '10016_F_Invali','d PPU-File entry: $1'#000+ '10017_F_PPU Dbx count problem'#000+ - '10018_','E_Illegal unit name: $1'#000+ + '10018_E_Illegal unit name: $1'#000+ '10019_F_Too much units'#000+ '10020_F_Circular unit reference between $1 and $2'#000+ '10021_F_Can'#039't compile unit $1, no sources available'#000+ '10022_F_Can'#039't find unit $1'#000+ - '10023_W_Unit $1 was not found but $2 exists'#000+ - '10024_F_Unit $1 sear','ched 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_Recompiling $1, checksum changed for $2'#000+ - '10029_U_Recompiling $1, so','urce found only'#000+ + '10028_U_Recompili','ng $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 older than ppufile'#000+ - '10033_U_Recompiling unit, obj is older than a','sm'#000+ + '10032_U_Recompiling unit, obj and asm are older t','han ppufile'#000+ + '10033_U_Recompiling unit, obj is older than asm'#000+ '10034_U_Parsing interface of $1'#000+ '10035_U_Parsing implementation of $1'#000+ '10036_U_Second load for unit $1'#000+ '10037_U_PPU Check file $1 time $2'#000+ - '10038_H_Conditional $1 was not set at startup in last compilation of $'+ - '2'#000+ - '10039_H_Conditional $1 was set',' at startup in last compilation of $2'#000+ + '10038_H_Conditional $1 was not set at startup',' in last compilation of'+ + ' $2'#000+ + '10039_H_Conditional $1 was set at startup in last compilation of $2'#000+ '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+ '10041_H_File $1 is newer than Release PPU file $2'#000+ - '10042_U_Using a unit which was not compiled with correct FPU mode'#000+ - '10043_U_Loading inter','face units from $1'#000+ + '10042_U_Using a unit which was',' not compiled with correct FPU mode'#000+ + '10043_U_Loading interface units from $1'#000+ '10044_U_Loading implementation units from $1'#000+ '10045_U_Interface CRC changed for unit $1'#000+ '10046_U_Implementation CRC changed for unit $1'#000+ - '10047_U_Finished compiling unit $1'#000+ + '10047_U_Finished compiling uni','t $1'#000+ '10048_U_Add dependency of $1 to $2'#000+ - '10049_U_No reload',', is caller: $1'#000+ + '10049_U_No reload, is caller: $1'#000+ '10050_U_No reload, already in second compile: $1'#000+ '10051_U_Flag for reload: $1'#000+ '10052_U_Forced reloading'#000+ '10053_U_Previous state of $1: $2'#000+ - '10054_U_Already compiling $1, setting second compile'#000+ + '10054_U_Already compiling $1, se','tting second compile'#000+ '10055_U_Loading unit $1'#000+ - '10056_U_Fini','shed loading unit $1'#000+ + '10056_U_Finished loading unit $1'#000+ '10057_U_Registering new unit $1'#000+ '10058_U_Re-resolving unit $1'#000+ '10059_U_Skipping re-resolving unit $1, still loading used units'#000+ - '11000_$1 [options] [options]'#000+ + '11000_$1 [options] [optio','ns]'#000+ '11001_W_Only one source file supported'#000+ - '11002_W_DEF fi','le can be created only for OS/2'#000+ + '11002_W_DEF file can be created only for OS/2'#000+ '11003_E_nested response files are not supported'#000+ '11004_F_No source file name in command line'#000+ '11005_N_No option inside $1 config file'#000+ - '11006_E_Illegal parameter: $1'#000+ + '11006_E_Illegal par','ameter: $1'#000+ '11007_H_-? writes help pages'#000+ - '11008_F_Too many ','config files nested'#000+ + '11008_F_Too many config files nested'#000+ '11009_F_Unable to open file $1'#000+ '11010_D_Reading further options from $1'#000+ '11011_W_Target is already set to: $1'#000+ - '11012_W_Shared libs not supported on DOS platform, reverting to static'+ - #000+ + '11012_W_Shared libs not supported on DOS platform, reve','rting to stat'+ + 'ic'#000+ '11013_F_too many IF(N)DEFs'#000+ - '11014_F_too ma','ny ENDIFs'#000+ + '11014_F_too many ENDIFs'#000+ '11015_F_open conditional at the end of the file'#000+ '11016_W_Debug information generation is not supported by this executab'+ 'le'#000+ '11017_H_Try recompiling with -dGDB'#000+ - '11018_E_You are using the obsolete switch $1'#000+ - '11019_E_You are using the obs','olete switch $1, please use $2'#000+ + '11018_E_You are u','sing the obsolete switch $1'#000+ + '11019_E_You are using the obsolete switch $1, please use $2'#000+ '11020_N_Switching assembler to default source writing assembler'#000+ '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+ - '11022_W_"$1" assembler use forced'#000+ + '11022_W_"$1" assemble','r use forced'#000+ '11026_T_Reading options from file $1'#000+ - '11027_T','_Reading options from environment $1'#000+ + '11027_T_Reading options from environment $1'#000+ '11028_D_Handling option "$1"'#000+ '11029__*** press enter ***'#000+ '11030_H_Start of reading config file $1'#000+ '11031_H_End of reading config file $1'#000+ - '11032_D_interpreting option "$1"'#000+ - '11036_D_interpreting firstpass optio','n "$1"'#000+ + '11032_D_inte','rpreting option "$1"'#000+ + '11036_D_interpreting firstpass option "$1"'#000+ '11033_D_interpreting file option "$1"'#000+ '11034_D_Reading config file "$1"'#000+ '11035_D_found source file name "$1"'#000+ '11037_D_Defining symbol $1'#000+ '11038_D_Undefining symbol $1'#000+ - '11039_E_Unknown code page'#000+ - '11023_Free Pascal Compiler version $FPCVER [','$FPCDATE] for $FPCTARGET'+ - #010+ + '11039_E_Unkno','wn code page'#000+ + '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+ 'Copyright (c) 1993-2004 by Florian Klaempfl'#000+ '11024_Free Pascal Compiler version $FPCVER'#010+ #010+ 'Compiler Date : $FPCDATE'#010+ 'Compiler Target: $FPCTARGET'#010+ #010+ - 'Supported targets:'#010+ + 'Supported targe','ts:'#010+ ' $OSTARGETS'#010+ #010+ - 'This program comes under the GNU Genera','l Public Licence'#010+ + 'This program comes under the GNU General Public Licence'#010+ 'For more information read COPYING.FPC'#010+ #010+ 'Report bugs,suggestions etc to:'#010+ ' bugrep@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',' generated assembler file'#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+ '**2ar_list register allocation/release info in assembler file'#010+ - '**2at_list temp allocation/release info in assembler file'#010+ + '**2at_list temp allocation/release info in assemb','ler file'#010+ '**1b_generate browser info'#010+ - '**2bl_generate local ','symbol info'#010+ + '**2bl_generate local symbol info'#010+ '**1B_build all modules'#010+ '**1C_code generation options:'#010+ '**2CD_create also dynamic library (not supported)'#010+ '**2Ce_Compilation with emulated floating point opcodes'#010+ - '**2Cf_Select fpu instruction set to use'#010+ + '**2Cf_Sele','ct fpu instruction set to use'#010+ '**2Cg_Generate PIC code'#010+ - '**2','Ch_ bytes heap (between 1023 and 67107840)'#010+ + '**2Ch_ bytes heap (between 1023 and 67107840)'#010+ '**2Ci_IO-checking'#010+ '**2Cn_omit linking stage'#010+ '**2Co_check overflow of integer operations'#010+ '**2Cr_range checking'#010+ - '**2CR_verify object method call validity'#010+ + '**2CR_verify object method ','call validity'#010+ '**2Cs_set stack size to '#010+ - '**2Ct_stack ','checking'#010+ + '**2Ct_stack checking'#010+ '**2CX_create also smartlinked library'#010+ '**1d_defines the symbol '#010+ '*O1D_generate a DEF file'#010+ '*O2Dd_set description to '#010+ '*O2Dw_PM application'#010+ - '**1e_set path to executable'#010+ + '**1e_set path to executa','ble'#010+ '**1E_same as -Cn'#010+ '**1F_set file names and paths:'#010+ - '**','2FD_sets the directory where to search for compiler utilities'#010+ + '**2FD_sets the directory where to search for compiler utilities'#010+ '**2Fe_redirect error output to '#010+ '**2FE_set exe/unit output path to '#010+ '**2Fi_adds to include path'#010+ - '**2Fl_adds to library path'#010+ - '*L2FL_uses as dynamic',' linker'#010+ + '**2Fl','_adds to library path'#010+ + '*L2FL_uses as dynamic linker'#010+ '**2Fo_adds to object path'#010+ '**2Fr_load error message file '#010+ '**2Fu_adds to unit path'#010+ '**2FU_set unit output path to , overrides -FE'#010+ - '*g1g_generate debugger information:'#010+ + '*g1g_generate debugger',' information:'#010+ '*g2gg_use gsym'#010+ '*g2gd_use dbx'#010+ - '*g2gh_use heap',' trace unit (for memory leak debugging)'#010+ + '*g2gh_use heap trace unit (for memory leak debugging)'#010+ '*g2gl_use line info unit to show more info for backtraces'#010+ '*g2gc_generate checks for pointers'#010+ '**1i_information'#010+ '**2iD_return compiler date'#010+ - '**2iV_return compiler version'#010+ + '**2iV_','return compiler version'#010+ '**2iSO_return compiler OS'#010+ - '**2iSP_','return compiler processor'#010+ + '**2iSP_return compiler processor'#010+ '**2iTO_return target OS'#010+ '**2iTP_return target processor'#010+ '**1I_adds to include path'#010+ '**1k_Pass to the linker'#010+ '**1l_write logo'#010+ - '**1M_set language mode to '#010+ + '**1M_set language m','ode to '#010+ '**2Mfpc_free pascal dialect (default)'#010+ - '**2Mobjf','pc_switch some Delphi 2 extensions on'#010+ + '**2Mobjfpc_switch some Delphi 2 extensions on'#010+ '**2Mdelphi_tries to be Delphi compatible'#010+ '**2Mtp_tries to be TP/BP 7.0 compatible'#010+ '**2Mgpc_tries to be gpc compatible'#010+ - '**2Mmac_tries to be compatible to the macintosh pascal dialects'#010+ - '**1n_don'#039't read the de','fault config file'#010+ + '**2Mmac_tries to be compatibl','e to the macintosh pascal dialects'#010+ + '**1n_don'#039't read the default config file'#010+ '**1o_change the name of the executable produced to '#010+ '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+ - '*L1P_use pipes instead of creating temporary assembler files'#010+ + '*L1P_use pipes instead of creating temporary as','sembler files'#010+ '**1S_syntax options:'#010+ - '**2S2_same as -Mobj','fpc'#010+ + '**2S2_same as -Mobjfpc'#010+ '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+ '**2Sa_include assertion code.'#010+ '**2Sd_same as -Mdelphi'#010+ '**2Se_compiler stops after the errors (default is 1)'#010+ - '**2Sg_allow LABEL and GOTO'#010+ + '**2Sg_allow LABE','L and GOTO'#010+ '**2Sh_Use ansistrings'#010+ - '**2Si_support C++ styled',' INLINE'#010+ + '**2Si_support C++ styled INLINE'#010+ '**2Sm_support macros like C (global)'#010+ '**2So_same as -Mtp'#010+ '**2Sp_same as -Mgpc'#010+ '**2Ss_constructor name must be init (destructor must be done)'#010+ - '**2St_allow static keyword in objects'#010+ + '**2St_allow static keyword in objects',#010+ '**1s_don'#039't call assembler and linker'#010+ - '**2sh_Generate scri','pt to link on host'#010+ + '**2sh_Generate script to link on host'#010+ '**2st_Generate script to link on target'#010+ '**2sr_Skip register allocation phase (optimizations will be disabled)'#010+ '**1u_undefines the symbol '#010+ '**1U_unit options:'#010+ - '**2Un_don'#039't check the unit name'#010+ - '**2Ur_generate release unit',' files'#010+ + '**','2Un_don'#039't check the unit name'#010+ + '**2Ur_generate release unit files'#010+ '**2Us_compile a system unit'#010+ '**1v_Be verbose. is a combination of the following letters:'#010+ '**2*_e : Show errors (default) d : Show debug info'#010+ - '**2*_w : Show warnings u : Show unit info'#010+ - '**2*_n : Show notes ',' t : Show tried/used files'#010+ + '**2*_w : Show warnings ',' u : Show unit info'#010+ + '**2*_n : Show notes t : Show tried/used files'#010+ '**2*_h : Show hints m : Show defined macros'#010+ '**2*_i : Show general info p : Show compiled procedures'#010+ - '**2*_l : Show linenumbers c : Show conditionals'#010+ - '**2*_a : Show ev','erything 0 : Show nothing (except errors'+ - ')'#010+ + '**2*_l : Show line','numbers c : Show conditionals'#010+ + '**2*_a : Show everything 0 : Show nothing (except errors)'#010+ '**2*_b : Show all procedure r : Rhide/GCC compatibility mode'#010+ - '**2*_ declarations if an error x : Executable info (Win32 only)'#010+ + '**2*_ declarations if an error x : Executable info (W','in32 only'+ + ')'#010+ '**2*_ occurs'#010+ - '**1V_write fpcdebug.txt file w','ith lots of debugging info'#010+ + '**1V_write fpcdebug.txt file with lots of debugging info'#010+ '**1X_executable options:'#010+ '*L2Xc_link with the c library'#010+ '**2Xs_strip all symbols from executable'#010+ - '**2XD_try to link dynamic (defines FPC_LINK_DYNAMIC)'#010+ - '**2XS_try to link static (default) (defines FPC_LINK_STA','TIC)'#010+ + '**2XD_try to link dynamic (defines FPC_LINK_DYNAMIC)',#010+ + '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#010+ '**2XX_try to link smart (defines FPC_LINK_SMART)'#010+ '**0*_Processor specific options:'#010+ '3*1A_output format:'#010+ '3*2Aas_assemble using GNU AS'#010+ - '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+ + '3*2Anasmcoff_coff (Go32v2) file u','sing Nasm'#010+ '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+ - '3*2Aw','asm_obj file using Wasm (Watcom)'#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*2Acoff_coff (Go32v2) using internal writer'#010+ + '3*2Acoff_coff (Go32v2) using internal ','writer'#010+ '3*2Apecoff_pecoff (Win32) using internal writer'#010+ - '3*','1R_assembler reading style:'#010+ + '3*1R_assembler reading style:'#010+ '3*2Ratt_read AT&T style assembler'#010+ '3*2Rintel_read Intel style assembler'#010+ '3*2Rdirect_copy assembler text directly to assembler file'#010+ - '3*1O_optimizations:'#010+ + '3*1O_optimizations:'#010, '3*2Og_generate smaller code'#010+ - '3*2OG_generate faster code (d','efault)'#010+ + '3*2OG_generate faster code (default)'#010+ '3*2Or_keep certain variables in registers'#010+ '3*2Ou_enable uncertain optimizations (see docs)'#010+ '3*2O1_level 1 optimizations (quick optimizations)'#010+ - '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+ - '3*2O3_level 3 optimizations (-O2 re','peatedly, max 5 times)'#010+ + '3*2O2_level 2 optimizations (-O1 + ','slower optimizations)'#010+ + '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+ '3*2Op_target processor:'#010+ '3*3Op1_set target processor to 386/486'#010+ '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+ - '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+ + '3*3Op3_set target processor to PPro/PII','/c6x86/K6 (tm)'#010+ '3*1T_Target operating system:'#010+ - '3*2Temx_O','S/2 via EMX (including EMX/RSX extender)'#010+ + '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+ '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ '3*2Tlinux_Linux'#010+ '3*2Tnetware_Novell Netware Module (clib)'#010+ '3*2Tos2_OS/2 / eComStation'#010+ - '3*2Tsunos_SunOS/Solaris'#010+ + '3*2Tsunos_','SunOS/Solaris'#010+ '3*2Twatcom_Watcom compatible DOS extender'#010+ - '3','*2Twdosx_WDOSX DOS extender'#010+ + '3*2Twdosx_WDOSX DOS extender'#010+ '3*2Twin32_Windows 32 Bit'#010+ '3*1W_Win32-like target options'#010+ '3*2WB_Set Image base to Hexadecimal value'#010+ '3*2WC_Specify console type application'#010+ - '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+ - '3*2WF_Specify',' full-screen type application (OS/2 only)'#010+ + '3*2WD_Us','e DEFFILE to export functions of DLL or EXE'#010+ + '3*2WF_Specify full-screen type application (OS/2 only)'#010+ '3*2WG_Specify graphic type application'#010+ '3*2WN_Do not generate relocation code (necessary for debugging)'#010+ '3*2WR_Generate relocation code'#010+ - '6*1A_output format'#010+ + '6*1A','_output format'#010+ '6*2Aas_Unix o-file using GNU AS'#010+ - '6*2Agas_GN','U Motorola assembler'#010+ + '6*2Agas_GNU Motorola assembler'#010+ '6*2Amit_MIT Syntax (old GAS)'#010+ '6*2Amot_Standard Motorola assembler'#010+ '6*1O_optimizations:'#010+ '6*2Oa_turn on the optimizer'#010+ '6*2Og_generate smaller code'#010+ - '6*2OG_generate faster code (default)'#010+ + '6*2OG_generate faster',' code (default)'#010+ '6*2Ox_optimize maximum (still BUGGY!!!)'#010+ - '6','*2O0_set target processor to a MC68000'#010+ + '6*2O0_set target processor to a MC68000'#010+ '6*2O2_set target processor to a MC68020+ (default)'#010+ '6*1R_assembler reading style:'#010+ '6*2RMOT_read motorola style assembler'#010+ - '6*1T_Target operating system:'#010+ + '6*1T_Target operati','ng system:'#010+ '6*2Tamiga_Commodore Amiga'#010+ - '6*2Tatari_Atari ST/S','Te/TT'#010+ + '6*2Tatari_Atari ST/STe/TT'#010+ '6*2Tlinux_Linux-68k'#010+ '6*2Tmacos_Macintosh m68k'#010+ '6*2Tpalmos_PalmOS'#010+ 'P*1T_Target operating system:'#010+ 'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+ 'P*2Tlinux_Linux on PowerPC'#010+ - 'P*2Tmacos_MacOS (classic) on PowerPC'#010+ + 'P*2Tmacos_Mac','OS (classic) on PowerPC'#010+ 'P*2Tmorphos_MorphOS'#010+ '**1*_'#010+ - '**1?_sh','ows this help'#010+ + '**1?_shows this help'#010+ '**1h_shows this help without waiting'#000 ); diff --git a/compiler/nadd.pas b/compiler/nadd.pas index da329444bf..d9c4fc1fd6 100644 --- a/compiler/nadd.pas +++ b/compiler/nadd.pas @@ -268,7 +268,7 @@ implementation begin if not(cs_extsyntax in aktmoduleswitches) and not(nodetype in [equaln,unequaln]) then - CGMessage(type_e_mismatch) + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename) else if (nodetype <> subn) and is_voidpointer(rd) then @@ -366,7 +366,7 @@ implementation end; else begin - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); t:=cnothingnode.create; end; end; @@ -415,7 +415,7 @@ implementation t:=cordconstnode.create(ord(lvd<>rvd),booltype,true); else begin - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); t:=cnothingnode.create; end; end; @@ -457,7 +457,7 @@ implementation t:=cordconstnode.create(byte(comparewidestrings(ws1,ws2)<>0),booltype,true); else begin - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); t:=cnothingnode.create; end; end; @@ -715,7 +715,7 @@ implementation end; end; else - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end; end { Both are chars? } @@ -946,7 +946,7 @@ implementation IncompatibleTypes(ld,rd); end else - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end; subn: begin @@ -960,7 +960,7 @@ implementation IncompatibleTypes(ld,rd); end else - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); resulttype:=sinttype; exit; end; @@ -976,12 +976,12 @@ implementation IncompatibleTypes(ld,rd); end else - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); resulttype:=sinttype; exit; end; else - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end; end @@ -994,82 +994,92 @@ implementation ((is_pchar(rd) or is_chararray(rd) or is_char(rd)) and (is_pchar(ld) or is_chararray(ld) or is_char(ld))) then begin - if is_widestring(rd) or is_widestring(ld) then + if (nodetype in [addn,equaln,unequaln,lten,gten,ltn,gtn]) then begin - if not(is_widestring(rd)) then - inserttypeconv(right,cwidestringtype); - if not(is_widestring(ld)) then - inserttypeconv(left,cwidestringtype); - end - else if is_ansistring(rd) or is_ansistring(ld) then - begin - if not(is_ansistring(rd)) then - inserttypeconv(right,cansistringtype); - if not(is_ansistring(ld)) then - inserttypeconv(left,cansistringtype); - end - else if is_longstring(rd) or is_longstring(ld) then - begin - if not(is_longstring(rd)) then - inserttypeconv(right,clongstringtype); - if not(is_longstring(ld)) then - inserttypeconv(left,clongstringtype); + if is_widestring(rd) or is_widestring(ld) then + begin + if not(is_widestring(rd)) then + inserttypeconv(right,cwidestringtype); + if not(is_widestring(ld)) then + inserttypeconv(left,cwidestringtype); + end + else if is_ansistring(rd) or is_ansistring(ld) then + begin + if not(is_ansistring(rd)) then + inserttypeconv(right,cansistringtype); + if not(is_ansistring(ld)) then + inserttypeconv(left,cansistringtype); + end + else if is_longstring(rd) or is_longstring(ld) then + begin + if not(is_longstring(rd)) then + inserttypeconv(right,clongstringtype); + if not(is_longstring(ld)) then + inserttypeconv(left,clongstringtype); + end + else + begin + if not(is_shortstring(ld)) then + inserttypeconv(left,cshortstringtype); + { don't convert char, that can be handled by the optimized node } + if not(is_shortstring(rd) or is_char(rd)) then + inserttypeconv(right,cshortstringtype); + end; end else - begin - if not(is_shortstring(ld)) then - inserttypeconv(left,cshortstringtype); - { don't convert char, that can be handled by the optimized node } - if not(is_shortstring(rd) or is_char(rd)) then - inserttypeconv(right,cshortstringtype); - end; - + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end { class or interface equation } else if is_class_or_interface(rd) or is_class_or_interface(ld) then begin - if is_class_or_interface(rd) and is_class_or_interface(ld) then - begin - if tobjectdef(rd).is_related(tobjectdef(ld)) then - inserttypeconv(right,left.resulttype) - else - inserttypeconv(left,right.resulttype); - end - else if is_class_or_interface(rd) then - inserttypeconv(left,right.resulttype) + if (nodetype in [equaln,unequaln]) then + begin + if is_class_or_interface(rd) and is_class_or_interface(ld) then + begin + if tobjectdef(rd).is_related(tobjectdef(ld)) then + inserttypeconv(right,left.resulttype) + else + inserttypeconv(left,right.resulttype); + end + else if is_class_or_interface(rd) then + inserttypeconv(left,right.resulttype) + else + inserttypeconv(right,left.resulttype); + end else - inserttypeconv(right,left.resulttype); - - if not(nodetype in [equaln,unequaln]) then - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end else if (rd.deftype=classrefdef) and (ld.deftype=classrefdef) then begin - if tobjectdef(tclassrefdef(rd).pointertype.def).is_related( - tobjectdef(tclassrefdef(ld).pointertype.def)) then - inserttypeconv(right,left.resulttype) + if (nodetype in [equaln,unequaln]) then + begin + if tobjectdef(tclassrefdef(rd).pointertype.def).is_related( + tobjectdef(tclassrefdef(ld).pointertype.def)) then + inserttypeconv(right,left.resulttype) + else + inserttypeconv(left,right.resulttype); + end else - inserttypeconv(left,right.resulttype); - - if not(nodetype in [equaln,unequaln]) then - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end { allows comperasion with nil pointer } else if is_class_or_interface(rd) or (rd.deftype=classrefdef) then begin - inserttypeconv(left,right.resulttype); - if not(nodetype in [equaln,unequaln]) then - CGMessage(type_e_mismatch); + if (nodetype in [equaln,unequaln]) then + inserttypeconv(left,right.resulttype) + else + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end else if is_class_or_interface(ld) or (ld.deftype=classrefdef) then begin - inserttypeconv(right,left.resulttype); - if not(nodetype in [equaln,unequaln]) then - CGMessage(type_e_mismatch); + if (nodetype in [equaln,unequaln]) then + inserttypeconv(right,left.resulttype) + else + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end { support procvar=nil,procvar<>nil } @@ -1077,7 +1087,7 @@ implementation ((rd.deftype=procvardef) and (lt=niln)) then begin if not(nodetype in [equaln,unequaln]) then - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end { support dynamicarray=nil,dynamicarray<>nil } @@ -1085,7 +1095,7 @@ implementation (is_dynamic_array(rd) and (lt=niln)) then begin if not(nodetype in [equaln,unequaln]) then - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end {$ifdef SUPPORT_MMX} @@ -1102,9 +1112,9 @@ implementation { mul is a little bit restricted } muln: if not(mmx_type(ld) in [mmxu16bit,mmxs16bit,mmxfixed16]) then - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); else - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end; end {$endif SUPPORT_MMX} @@ -1123,14 +1133,14 @@ implementation begin if not(cs_extsyntax in aktmoduleswitches) or (not(is_pchar(ld)) and not(m_add_pointer in aktmodeswitches)) then - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); if (rd.deftype=pointerdef) and (tpointerdef(rd).pointertype.def.size>1) then left:=caddnode.create(muln,left, cordconstnode.create(tpointerdef(rd).pointertype.def.size,sinttype,true)); end else - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end else if (ld.deftype=pointerdef) or is_zero_based_array(ld) then @@ -1145,35 +1155,38 @@ implementation begin if not(cs_extsyntax in aktmoduleswitches) or (not(is_pchar(ld)) and not(m_add_pointer in aktmodeswitches)) then - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); if (ld.deftype=pointerdef) and (tpointerdef(ld).pointertype.def.size>1) then right:=caddnode.create(muln,right, cordconstnode.create(tpointerdef(ld).pointertype.def.size,sinttype,true)); end else - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end else if (rd.deftype=procvardef) and (ld.deftype=procvardef) and equal_defs(rd,ld) then begin - if not (nodetype in [equaln,unequaln]) then - CGMessage(type_e_mismatch); - { convert both to voidpointer, because methodpointers are 8 bytes } - { even though only the first 4 bytes must be compared (JM) } - inserttypeconv_explicit(left,voidpointertype); - inserttypeconv_explicit(right,voidpointertype); + if (nodetype in [equaln,unequaln]) then + begin + { convert both to voidpointer, because methodpointers are 8 bytes } + { even though only the first 4 bytes must be compared (JM) } + inserttypeconv_explicit(left,voidpointertype); + inserttypeconv_explicit(right,voidpointertype); + end + else + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end { enums } else if (ld.deftype=enumdef) and (rd.deftype=enumdef) then begin - if not(equal_defs(ld,rd)) then - inserttypeconv(right,left.resulttype); - if not(nodetype in [equaln,unequaln,ltn,lten,gtn,gten]) then - CGMessage(type_e_mismatch); + if (nodetype in [equaln,unequaln,ltn,lten,gtn,gten]) then + inserttypeconv(right,left.resulttype) + else + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename); end { generic conversion, this is for error recovery } @@ -1535,7 +1548,7 @@ implementation notnode := true; end; else - CGMessage(type_e_mismatch); + CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),left.resulttype.def.typename,right.resulttype.def.typename); end; { convert the arguments (explicitely) to fpc_normal_set's } result := ccallnode.createintern(procname,ccallparanode.create(right, @@ -1913,7 +1926,11 @@ begin end. { $Log$ - Revision 1.112 2004-02-21 22:08:46 daniel + Revision 1.113 2004-03-18 16:19:03 peter + * fixed operator overload allowing for pointer-string + * replaced some type_e_mismatch with more informational messages + + Revision 1.112 2004/02/21 22:08:46 daniel * Avoid memory allocation and string copying Revision 1.111 2004/02/20 21:55:59 peter diff --git a/compiler/ncnv.pas b/compiler/ncnv.pas index 3493a7e3be..9df1e15339 100644 --- a/compiler/ncnv.pas +++ b/compiler/ncnv.pas @@ -2180,11 +2180,10 @@ implementation { the operands must be related } if (not(tobjectdef(left.resulttype.def).is_related(tobjectdef(right.resulttype.def)))) and (not(tobjectdef(right.resulttype.def).is_related(tobjectdef(left.resulttype.def)))) then - CGMessage(type_e_mismatch); + CGMessage2(type_e_classes_not_related,left.resulttype.def.typename,right.resulttype.def.typename); end else CGMessage1(type_e_class_type_expected,left.resulttype.def.typename); - { call fpc_do_is helper } paras := ccallparanode.create( left, @@ -2379,7 +2378,11 @@ begin end. { $Log$ - Revision 1.141 2004-02-21 16:03:10 florian + Revision 1.142 2004-03-18 16:19:03 peter + * fixed operator overload allowing for pointer-string + * replaced some type_e_mismatch with more informational messages + + Revision 1.141 2004/02/21 16:03:10 florian * message about illegal type conversion reports now the types Revision 1.140 2004/02/20 21:55:59 peter diff --git a/compiler/nflw.pas b/compiler/nflw.pas index 842e9335c3..706784ee62 100644 --- a/compiler/nflw.pas +++ b/compiler/nflw.pas @@ -401,7 +401,7 @@ implementation exit; if not is_boolean(left.resulttype.def) then begin - CGMessage(type_e_mismatch); + CGMessage1(type_e_boolean_expr_expected,left.resulttype.def.typename); exit; end; end; @@ -1210,7 +1210,7 @@ implementation if codegenerror then exit; if not(is_class(left.resulttype.def)) then - CGMessage(type_e_mismatch); + CGMessage1(type_e_class_type_expected,left.resulttype.def.typename); { insert needed typeconvs for addr,frame } if assigned(right) then begin @@ -1415,7 +1415,7 @@ implementation result:=nil; resulttype:=voidtype; if not(is_class(excepttype)) then - CGMessage(type_e_mismatch); + CGMessage1(type_e_class_type_expected,excepttype.typename); if assigned(left) then resulttypepass(left); if assigned(right) then @@ -1475,7 +1475,11 @@ begin end. { $Log$ - Revision 1.94 2004-02-05 01:24:08 florian + Revision 1.95 2004-03-18 16:19:03 peter + * fixed operator overload allowing for pointer-string + * replaced some type_e_mismatch with more informational messages + + Revision 1.94 2004/02/05 01:24:08 florian * several fixes to compile x86-64 system Revision 1.93 2004/02/03 22:32:54 peter diff --git a/compiler/ninl.pas b/compiler/ninl.pas index 2772567145..e0a29c8f4c 100644 --- a/compiler/ninl.pas +++ b/compiler/ninl.pas @@ -880,7 +880,7 @@ implementation ((codepara.resulttype.def.deftype <> orddef) or is_64bitint(codepara.resulttype.def)) then begin - CGMessagePos(codepara.fileinfo,type_e_mismatch); + CGMessagePos1(codepara.fileinfo,type_e_integer_expr_expected,codepara.resulttype.def.typename); exit; end; @@ -1272,21 +1272,21 @@ implementation in_const_swap_long : begin if isreal then - CGMessage(type_e_mismatch) + CGMessage1(type_e_integer_expr_expected,left.resulttype.def.typename) else hp:=cordconstnode.create((vl and $ffff) shl 16+(vl shr 16),left.resulttype,true); end; in_const_swap_qword : begin if isreal then - CGMessage(type_e_mismatch) + CGMessage1(type_e_integer_expr_expected,left.resulttype.def.typename) else hp:=cordconstnode.create((vl and $ffff) shl 32+(vl shr 32),left.resulttype,true); end; in_const_ptr : begin if isreal then - CGMessage(type_e_mismatch) + CGMessage1(type_e_integer_expr_expected,left.resulttype.def.typename) else hp:=cpointerconstnode.create((vl2 shl 4)+vl,voidfarpointertype); end; @@ -1378,7 +1378,7 @@ implementation end; set_varstate(left,vs_used,true); if not is_integer(left.resulttype.def) then - CGMessage(type_e_mismatch); + CGMessage1(type_e_integer_expr_expected,left.resulttype.def.typename); case inlinenumber of in_lo_word, in_hi_word : @@ -1458,7 +1458,7 @@ implementation result:=hp; end; uvoid : - CGMessage(type_e_mismatch) + CGMessage1(type_e_ordinal_expr_expected,left.resulttype.def.typename); else begin { all other orddef need no transformation } @@ -1475,7 +1475,7 @@ implementation result:=hp; end; else - CGMessage(type_e_mismatch); + CGMessage1(type_e_ordinal_expr_expected,left.resulttype.def.typename); end; end; @@ -1976,7 +1976,7 @@ implementation inserttypeconv(tcallparanode(tcallparanode(left).right).left,cshortstringtype); end else - CGMessage(type_e_mismatch); + CGMessage1(type_e_boolean_expr_expected,left.resulttype.def.typename); end else CGMessage(type_e_mismatch); @@ -2374,7 +2374,11 @@ begin end. { $Log$ - Revision 1.132 2004-02-20 21:55:59 peter + Revision 1.133 2004-03-18 16:19:03 peter + * fixed operator overload allowing for pointer-string + * replaced some type_e_mismatch with more informational messages + + Revision 1.132 2004/02/20 21:55:59 peter * procvar cleanup Revision 1.131 2004/02/04 18:45:29 jonas diff --git a/compiler/nmem.pas b/compiler/nmem.pas index b9cc68a406..1330dac2fd 100644 --- a/compiler/nmem.pas +++ b/compiler/nmem.pas @@ -696,7 +696,7 @@ implementation begin { check type of the index value } if (compare_defs(right.resulttype.def,tarraydef(left.resulttype.def).rangetype.def,right.nodetype)=te_incompatible) then - CGMessage(type_e_mismatch); + IncompatibleTypes(right.resulttype.def,tarraydef(left.resulttype.def).rangetype.def); resulttype:=tarraydef(left.resulttype.def).elementtype; end; pointerdef : @@ -975,7 +975,11 @@ begin end. { $Log$ - Revision 1.80 2004-02-20 21:55:59 peter + Revision 1.81 2004-03-18 16:19:03 peter + * fixed operator overload allowing for pointer-string + * replaced some type_e_mismatch with more informational messages + + Revision 1.80 2004/02/20 21:55:59 peter * procvar cleanup Revision 1.79 2004/02/03 22:32:54 peter diff --git a/compiler/nset.pas b/compiler/nset.pas index 0cd97d1e15..8e168eabaf 100644 --- a/compiler/nset.pas +++ b/compiler/nset.pas @@ -116,7 +116,7 @@ implementation uses globtype,systems, verbose, - symconst,symdef,symsym,defutil,defcmp, + symconst,symdef,symsym,symtable,defutil,defcmp, htypechk,pass_1, nbas,ncnv,ncon,nld,cgobj,cgbase; @@ -347,7 +347,7 @@ implementation exit; { both types must be compatible } if compare_defs(left.resulttype.def,right.resulttype.def,left.nodetype)=te_incompatible then - CGMessage(type_e_mismatch); + IncompatibleTypes(left.resulttype.def,right.resulttype.def); { Check if only when its a constant set } if (left.nodetype=ordconstn) and (right.nodetype=ordconstn) then begin @@ -694,7 +694,11 @@ begin end. { $Log$ - Revision 1.52 2004-02-03 22:32:54 peter + Revision 1.53 2004-03-18 16:19:03 peter + * fixed operator overload allowing for pointer-string + * replaced some type_e_mismatch with more informational messages + + Revision 1.52 2004/02/03 22:32:54 peter * renamed xNNbittype to xNNinttype * renamed registers32 to registersint * replace some s32bit,u32bit with torddef([su]inttype).def.typ diff --git a/compiler/powerpc/nppcadd.pas b/compiler/powerpc/nppcadd.pas index b97ed70180..e989202f3a 100644 --- a/compiler/powerpc/nppcadd.pas +++ b/compiler/powerpc/nppcadd.pas @@ -412,7 +412,7 @@ interface falselabel:=ofl; end; else - CGMessage(type_e_mismatch); + internalerror(200403181); end; secondpass(right); maketojumpbool(exprasmlist,right,lr_load_regvars); @@ -452,7 +452,7 @@ interface cmpop:=true; end; else - CGMessage(type_e_mismatch); + internalerror(200403182); end; // get the operands in the correct order, there are no special cases @@ -1169,7 +1169,7 @@ interface andn: op:=A_PAND; else - CGMessage(type_e_mismatch); + internalerror(200403183); end; { left and right no register? } @@ -1494,7 +1494,11 @@ begin end. { $Log$ - Revision 1.42 2004-01-06 21:37:41 peter + Revision 1.43 2004-03-18 16:19:03 peter + * fixed operator overload allowing for pointer-string + * replaced some type_e_mismatch with more informational messages + + Revision 1.42 2004/01/06 21:37:41 peter * fixed too long ie number Revision 1.41 2003/12/29 11:35:19 jonas