From 17d6dded6615dd283e55eaa3692020d7fddd79d3 Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 20 Oct 2001 19:28:37 +0000 Subject: [PATCH] * interface 2 guid support * guid constants support --- compiler/msg/errore.msg | 1 + compiler/msgidx.inc | 5 +- compiler/msgtxt.inc | 369 ++++++++++++++++++++-------------------- compiler/nadd.pas | 17 +- compiler/ncgcon.pas | 35 +++- compiler/ncnv.pas | 17 +- compiler/ncon.pas | 66 ++++++- compiler/nobj.pas | 12 +- compiler/node.pas | 12 +- compiler/pdecl.pas | 23 ++- compiler/pexpr.pas | 8 +- compiler/types.pas | 22 ++- 12 files changed, 383 insertions(+), 204 deletions(-) diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 0ce356a1d6..d5d37e1bb2 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -930,6 +930,7 @@ parser_e_varargs_need_cdecl_and_external=03178_E_VarArgs directive without CDecl parser_e_self_call_by_value=03179_E_Self must be a normal (call-by-value) parameter % You can't declare self as a const or var parameter, it must always be % a call-by-value parameter +parser_e_interface_has_no_guid=03180_E_Interface "$1" has no interface identification % \end{description} # # Type Checking diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index f6871aa92c..3561539561 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -257,6 +257,7 @@ const parser_h_skipped_fields_after=03177; parser_e_varargs_need_cdecl_and_external=03178; parser_e_self_call_by_value=03179; + parser_e_interface_has_no_guid=03180; type_e_mismatch=04000; type_e_incompatible_types=04001; type_e_not_equal_types=04002; @@ -599,9 +600,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 33501; + MsgTxtSize = 33556; MsgIdxMax : array[1..20] of longint=( - 17,61,180,38,41,41,98,17,35,42, + 17,61,181,38,41,41,98,17,35,42, 30,1,1,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 90bc6e0508..33e6bd6203 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -291,363 +291,366 @@ const msgtxt : array[0..000139,1..240] of char=( '03177_H_Som','e fields coming after "$1" weren'#039't initialized'#000+ '03178_E_VarArgs directive without CDecl and External'#000+ '03179_E_Self must be a normal (call-by-value) parameter'#000+ + '03180_E_Interface "$1" has no interface identification'#000+ '04000_E_Type mismatch'#000+ - '04001_E_Incompatible types: got "$1" expected "$2"'#000+ - '04002_E_Typ','e mismatch between "$1" and "$2"'#000+ + '04001_E','_Incompatible types: got "$1" expected "$2"'#000+ + '04002_E_Type mismatch between "$1" and "$2"'#000+ '04003_E_Type identifier expected'#000+ '04004_E_Variable identifier expected'#000+ '04005_E_Integer expression expected, but got "$1"'#000+ - '04006_E_Boolean expression expected, but got "$1"'#000+ + '04006_E_Boolean expression expec','ted, but got "$1"'#000+ '04007_E_Ordinal expression expected'#000+ - '0','4008_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+ '04010_E_Variable or type indentifier expected'#000+ '04011_E_Can'#039't evaluate constant expression'#000+ - '04012_E_Set elements are not compatible'#000+ - '04013_E_Operation not impl','emented for sets'#000+ + '04012_E_Set',' elements are not compatible'#000+ + '04013_E_Operation not implemented for sets'#000+ '04014_W_Automatic type conversion from floating type to COMP which is '+ 'an integer type'#000+ '04015_H_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 wi','th assignments not possible'#000+ + '04016_E_string types doesn'#039't matc','h, because of $V+ mode'#000+ + '04017_E_succ or pred on enums with assignments not possible'#000+ '04018_E_Can'#039't read or write variables of this type'#000+ '04019_E_Can'#039't use readln or writeln on typed file'#000+ '04020_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+ + '04021_E','_Type conflict between set elements'#000+ + '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+ '04023_E_Integer or real expression expected'#000+ '04024_E_Wrong type "$1" in array constructor'#000+ - '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+ - '04026_E_Method (variable) and Procedure (v','ariable) are not compatibl'+ - 'e'#000+ + '04025_E_Incompatible type for arg no. $1: Got "$2", e','xpected "$3"'#000+ + '04026_E_Method (variable) and Procedure (variable) are not compatible'#000+ '04027_E_Illegal constant passed to internal math function'#000+ '04028_E_Can'#039't get the address of constants'#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+ + '04030_E_Can'#039't assi','gn local procedure/function to procedure varia'+ + 'ble'#000+ + '04031_E_Can'#039't assign values to an address'#000+ '04032_E_Can'#039't assign values to const variable'#000+ '04033_E_Array type required'#000+ '04034_E_interface type expected, but got "$1"'#000+ - '04035_W_Mixing signed expressions and cardinals gives a 64bit result'#000+ - '04036_W_Mixing',' signed expressions and cardinals here may cause a ran'+ - 'ge check error'#000+ + '04035_W_Mixing signed expres','sions and cardinals 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+ '05000_E_Identifier not found "$1"'#000+ - '05001_F_Internal Error in SymTableStack()'#000+ - '05002_E_Duplicate identifier "$1"'#000, + '05001_F_Internal Erro','r 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+ '05006_F_Identifier type already defined as type'#000+ - '05007_E_Error in type definition'#000+ - '05008_E_Type identifier not def','ined'#000+ + '05007_E_E','rror in type definition'#000+ + '05008_E_Type identifier not defined'#000+ '05009_E_Forward type not resolved "$1"'#000+ '05010_E_Only static variables can be used in static methods or outside'+ ' methods'#000+ '05011_E_Invalid call to tvarsym.mangledname()'#000+ - '05012_F_record or class type expected'#000+ - '05013_E_Instances of classes or o','bjects with an abstract method are '+ - 'not allowed'#000+ + '05012_F_record o','r class type expected'#000+ + '05013_E_Instances of classes or objects with an abstract method are no'+ + 't allowed'#000+ '05014_W_Label not defined "$1"'#000+ '05015_E_Label used but not defined "$1"'#000+ '05016_E_Illegal label declaration'#000+ - '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+ + '05017_E_GOTO and LABEL are not su','pported (use switch -Sg)'#000+ '05018_E_Label not found'#000+ - '05019_','E_identifier isn'#039't a label'#000+ + '05019_E_identifier 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 i','n $2'#000+ '05024_H_Parameter "$1" not used'#000+ - '05025_N_Local vari','able "$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 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 ide','ntifier "$1"'#000+ + '05034_W_Type "$1" is not aligned correctly i','n current record for C'#000+ + '05035_E_Unknown record field identifier "$1"'#000+ '05036_W_Local variable "$1" does not seem to be initialized'#000+ '05037_W_Variable "$1" does not seem to be initialized'#000+ '05038_E_identifier idents no member "$1"'#000+ - '05039_B_Found declaration: $1'#000+ - '05040_E_Data segment too large (max. 2GB)'#000, + '05039_B_Found dec','laration: $1'#000+ + '05040_E_Data segment too large (max. 2GB)'#000+ '06000_E_BREAK not allowed'#000+ '06001_E_CONTINUE not allowed'#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 limi','t'#000+ + '06005_E_Ille','gal qualifier'#000+ + '06006_E_High range limit < low range limit'#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'#000+ - '06011_D_Conversion between ordinals and pointers is not portable ac','r'+ + '06011_D_Conv','ersion between ordinals and pointers is not portable acr'+ 'oss platforms'#000+ '06012_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 co','nstructor or destructor (doesn'#039+ - 't match to this context)'#000+ + '06015_E_EXPORT declared functi','ons can'#039't be called'#000+ + '06016_W_Possible illegal call of constructor or destructor (doesn'#039't'+ + ' match to this context)'#000+ '06017_N_Inefficient code'#000+ '06018_W_unreachable code'#000+ '06019_E_procedure call with stackframe ESP/SP'#000+ - '06020_E_Abstract methods can'#039't be called directly'#000+ - '06021_F_Internal Error in getfloatreg(','), allocation failure'#000+ + '06020_E_Abstract methods can'#039't be',' called directly'#000+ + '06021_F_Internal Error in getfloatreg(), allocation failure'#000+ '06022_F_Unknown float type'#000+ '06023_F_SecondVecn() base defined twice'#000+ '06024_F_Extended cg68k not supported'#000+ '06025_F_32-bit unsigned not supported in MC68000 mode'#000+ - '06026_F_Internal Error in secondinline()'#000+ - '06027_D_Register $1',' weight $2 $3'#000+ + '06026','_F_Internal Error in secondinline()'#000+ + '06027_D_Register $1 weight $2 $3'#000+ '06028_E_Stack limit excedeed in local routine'#000+ '06029_D_Stack frame is omitted'#000+ '06031_E_Object or class methods can'#039't be inline.'#000+ '06032_E_Procvar calls can'#039't be inline.'#000+ - '06033_E_No code for inline procedure stored'#000+ - '06034_E_Direct ca','ll of interrupt procedure "$1" is not possible'#000+ + '06033_','E_No code for inline procedure stored'#000+ + '06034_E_Direct call of interrupt procedure "$1" is not possible'#000+ '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+ 'sed, use (set)length instead'#000+ - '06036_E_Include and exclude not implemented in this case'#000+ - '06037_E_Constructors or destructors can n','ot be called inside a '#039'w'+ - 'ith'#039' clause'#000+ + '06036_E_Include and exclude not implemented',' in this case'#000+ + '06037_E_Constructors or destructors can not be called inside a '#039'wi'+ + 'th'#039' clause'#000+ '06038_E_Cannot call message handler method 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+ - '07000_D_Starting $1 styled assembler ','parsing'#000+ + '06040_E_Control flow statements aren'#039't allowed i','n a finally bloc'+ + 'k'#000+ + '07000_D_Starting $1 styled assembler parsing'#000+ '07001_D_Finished $1 styled assembler parsing'#000+ '07002_E_Non-label pattern contains @'#000+ '07003_W_Override operator not supported'#000+ '07004_E_Error building record offset'#000+ - '07005_E_OFFSET used without identifier'#000+ - '07006_E_TYPE used without identifi','er'#000+ + '07005_E_OFFSET use','d without identifier'#000+ + '07006_E_TYPE used without identifier'#000+ '07007_E_Cannot use local variable or parameters here'#000+ '07008_E_need to use OFFSET here'#000+ '07009_E_need to use $ here'#000+ '07010_E_Cannot use multiple relocatable symbols'#000+ - '07011_E_Relocatable symbol can only be added'#000+ - '07012_E_Invalid constant express','ion'#000+ + '07011_E_Relocatable sy','mbol 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+ - '07018_W_Possi','ble error in object field handling'#000+ + '0701','7_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 @DATA not supported'#000+ - '07024_E_Null label',' references are not allowed'#000+ + '0','7023_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+ - '07030_W_$1 without op','erand translated into $1P'#000+ + '07029_W_Fwait can cau','se 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+ - '07035_E_Error converting',' decimal $1'#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+ - '07040_W_$1 is associated to an overloaded function'#000+ - '07041_E_Cannot use SELF outside a method',#000+ + '07040_W_$1 is associated to an overl','oaded function'#000+ + '07041_E_Cannot use SELF outside a method'#000+ '07042_E_Cannot use OLDEBP outside a nested procedure'#000+ '07043_W_Procedures can'#039't return any value in asm code'#000+ '07044_E_SEG not supported'#000+ - '07045_E_Size suffix and destination or source size do not match'#000+ - '07046_W_Size suffix and destination or sou','rce size do not match'#000+ + '07045_E_Size suffix and destination or source size ','do not match'#000+ + '07046_W_Size suffix and destination or source size do not match'#000+ '07047_E_Assembler syntax error'#000+ '07048_E_Invalid combination of opcode and operands'#000+ '07049_E_Assembler syntax error in operand'#000+ - '07050_E_Assembler syntax error in constant'#000+ + '07050_E_Assembler syntax error in const','ant'#000+ '07051_E_Invalid String expression'#000+ - '07052_W_constant ','with symbol $1 for not 32bit address'#000+ + '07052_W_constant with symbol $1 for not 32bit address'#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 override and opcode: $1'#000+ - '07057_E_Too many operands on l','ine'#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+ '07063_E_Invalid register name'#000+ - '07064_E_Invalid floating point register name'#000+ - '07065_E_NOR not ','supported'#000+ + '07064_','E_Invalid floating point register name'#000+ + '07065_E_NOR 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 with a register'#000+ - '07071_E_Invalid segment over','ride 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+ + '07075_E_assembler code not returned to text section'#000, '07076_E_Not a directive or local symbol $1'#000+ - '07077_E_Usin','g a defined name as a local label'#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+ + '07080_N_.align is target specific, use .balign or .p2alig','n'#000+ '07081_E_Can'#039't access fields directly for parameters'#000+ - '0','7082_E_Can'#039't access fields of objects/classes directly'#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+ - '07085_H_RESULT is register $1'#000+ - '07086_W_"$1" without operand translat','ed into "$1 %st,%st(1)"'#000+ + '07085_H_RESU','LT is register $1'#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 allowe','d here'#000+ '07091_W_XDEF not supported'#000+ - '07092_E_Invalid XDEF ','syntax'#000+ + '07092_E_Invalid XDEF syntax'#000+ '07093_W_ALIGN not supported'#000+ '07094_E_Inc and Dec cannot be together'#000+ '07095_E_Invalid reglist for movem'#000+ '07096_E_Reglist invalid for opcode'#000+ '07097_E_68020 mode required'#000+ - '08000_F_Too many assembler files'#000+ - '08001_F_Selected assembler output no','t supported'#000+ + '08000_F_Too ma','ny 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+ '08005_F_No binary writer selected'#000+ - '08006_E_Asm: Opcode $1 not in table'#000+ - '08007_E_Asm: $1 invalid com','bination of opcode and operands'#000+ + '08006_E_','Asm: Opcode $1 not in table'#000+ + '08007_E_Asm: $1 invalid combination of opcode and operands'#000+ '08008_E_Asm: 16 Bit references not supported'#000+ '08009_E_Asm: Invalid effective address'#000+ '08010_E_Asm: Immediate or reference expected'#000+ - '08011_E_Asm: $1 value exceeds bounds $2'#000+ - '08012_E_Asm: Short jump is out of range',' $1'#000+ + '08011_E_Asm: $1 value ex','ceeds bounds $2'#000+ + '08012_E_Asm: Short jump is out of range $1'#000+ '08013_E_Asm: Undefined label $1'#000+ '08014_E_Asm: Comp type not supported for this target'#000+ '08015_E_Asm: Extended type not supported for this target'#000+ '08016_E_Asm: Duplicate label $1'#000+ - '09000_W_Source operating system redefined'#000+ - '09001_I_Assembling (','pipe) $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+ '09003_E_Can'#039't create object file: $1'#000+ '09004_E_Can'#039't create archive file: $1'#000+ - '09005_E_Assembler $1 not found, switching to external assembling'#000+ + '09005_E_Assembler $1 not found, switching to external assembli','ng'#000+ '09006_T_Using assembler: $1'#000+ - '09007_E_Error while asse','mbling exitcode $1'#000+ + '09007_E_Error while assembling exitcode $1'#000+ '09008_E_Can'#039't call the assembler, error $1 switching to external a'+ 'ssembling'#000+ '09009_I_Assembling $1'#000+ '09010_I_Assembling smartlink $1'#000+ - '09011_W_Object $1 not found, Linking may fail !'#000+ - '09012_W_Library $1 not found, Linking may f','ail !'#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+ '09015_I_Linking $1'#000+ '09016_E_Util $1 not found, switching to external linking'#000+ - '09017_T_Using util $1'#000+ + '09017_T_Using ','util $1'#000+ '09018_E_Creation of Executables not supported'#000+ - '0','9019_E_Creation of Dynamic/Shared Libraries not supported'#000+ + '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+ '09020_I_Closing script $1'#000+ '09021_E_resource compiler not found, switching to external mode'#000+ '09022_I_Compiling resource $1'#000+ - '09023_T_unit $1 can'#039't be static linked, switching to smart lin','ki'+ + '09023_T','_unit $1 can'#039't be static linked, switching to smart linki'+ 'ng'#000+ '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+ #000+ '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+ 'g'#000+ - '09026_E_unit $1 can'#039't be smart or static linked'#000+ + '09026_E_unit $1 can'#039't be smart or static link','ed'#000+ '09027_E_unit $1 can'#039't be shared or static linked'#000+ - '090','28_F_Can'#039't post process executable $1'#000+ + '09028_F_Can'#039't post process executable $1'#000+ '09029_F_Can'#039't open executable $1'#000+ '09030_X_Size of Code: $1 bytes'#000+ '09031_X_Size of initialized data: $1 bytes'#000+ - '09032_X_Size of uninitialized data: $1 bytes'#000+ + '09032_X_Size of uninitialized data: $1 b','ytes'#000+ '09033_X_Stack space reserved: $1 bytes'#000+ - '09034_X_Sta','ck space commited: $1 bytes'#000+ + '09034_X_Stack space commited: $1 bytes'#000+ '10000_T_Unitsearch: $1'#000+ '10001_T_PPU Loading $1'#000+ '10002_U_PPU Name: $1'#000+ '10003_U_PPU Flags: $1'#000+ '10004_U_PPU Crc: $1'#000+ '10005_U_PPU Time: $1'#000+ - '10006_U_PPU File too short'#000+ + '10006_U_PPU File too short'#000, '10007_U_PPU Invalid Header (no PPU at the begin)'#000+ - '10008_','U_PPU Invalid Version $1'#000+ + '10008_U_PPU Invalid Version $1'#000+ '10009_U_PPU is compiled for an other 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+ + '10013_F_Can'#039't Write PPU-Fil','e'#000+ '10014_F_Error reading PPU-File'#000+ - '10015_F_unexpected end',' of PPU-File'#000+ + '10015_F_unexpected end of PPU-File'#000+ '10016_F_Invalid PPU-File entry: $1'#000+ '10017_F_PPU Dbx count problem'#000+ '10018_E_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+ + '1002','1_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 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+ + '10026_F_There were $1 err','ors compiling module, stopping'#000+ + '10027_U_Load from $1 ($2) unit $3'#000+ '10028_U_Recompiling $1, checksum changed for $2'#000+ '10029_U_Recompiling $1, source found only'#000+ '10030_U_Recompiling unit, static lib is older than ppufile'#000+ - '10031_U_Recompiling unit, shared lib is older than ppufile'#000+ - '10032_U_Recompiling un','it, obj and asm are older than ppufile'#000+ + '10031_U_Recompiling unit, ','shared lib is older than ppufile'#000+ + '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+ '10033_U_Recompiling unit, obj is older than asm'#000+ '10034_U_Parsing interface of $1'#000+ '10035_U_Parsing implementation of $1'#000+ - '10036_U_Second load for unit $1'#000+ + '10036_U_Second load for unit ','$1'#000+ '10037_U_PPU Check file $1 time $2'#000+ - '10038_H_Conditiona','l $1 was not set at startup in last compilation of'+ - ' $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+ + '10040_W_Can'#039't recompile unit $1, but found modifed include file','s'+ + #000+ '10041_H_File $1 is newer than Release PPU file $2'#000+ - '110','00_$1 [options] [options]'#000+ + '11000_$1 [options] [options]'#000+ '11001_W_Only one source file supported'#000+ '11002_W_DEF file can be created only for OS/2'#000+ '11003_E_nested response files are not supported'#000+ - '11004_F_No source file name in command line'#000+ - '11005_N_No option inside ','$1 config file'#000+ + '11004_F_No sou','rce file name in command line'#000+ + '11005_N_No option inside $1 config file'#000+ '11006_E_Illegal parameter: $1'#000+ '11007_H_-? writes help pages'#000+ '11008_F_Too many config files nested'#000+ '11009_F_Unable to open file $1'#000+ '11010_D_Reading further options from $1'#000+ - '11011_W_Target is already set to: $1'#000+ - '11012_W_Shared libs n','ot supported on DOS platform, reverting to stat'+ - 'ic'#000+ + '110','11_W_Target is already set to: $1'#000+ + '11012_W_Shared libs not supported on DOS platform, reverting to static'+ + #000+ '11013_F_too many IF(N)DEFs'#000+ '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 recomp','iling with -dGDB'#000+ + '11016_W_Debug information generation',' is not supported by this execut'+ + 'able'#000+ + '11017_H_Try recompiling with -dGDB'#000+ '11018_E_You are using the obsolete switch $1'#000+ '11019_E_You are using the obsolete switch $1, please use $2'#000+ - '11020_N_Switching assembler to default source writing assembler'#000+ - '11021_W_Assembler output selected "$1" is not compatib','le 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+ - '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] fo','r $FPCTARGET'+ + '1','1023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'+ #010+ 'Copyright (c) 1993-2000 by Florian Klaempfl'#000+ '11024_Free Pascal Compiler version $FPCVER'#010+ @@ -656,166 +659,166 @@ const msgtxt : array[0..000139,1..240] of char=( 'Compiler Target: $FPCTARGET'#010+ #010+ 'Supported targets:'#010+ - ' $OSTARGETS'#010+ + ' $OSTARGE','TS'#010+ #010+ - 'This program comes under the GNU General Public Lic','ence'#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'+ + '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 a','ssembler file'#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+ - '**1b_generate browser info'#010+ - '**2bl_generate local symbol info'#010, + '**1b_','generate browser 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+ '**2Ch_ bytes heap (between 1023 and 67107840)'#010+ '**2Ci_IO-checking'#010+ - '**2Cn_omit linking stage'#010+ - '**2Co_check overflow of integer operati','ons'#010+ + '**2Cn_omi','t linking stage'#010+ + '**2Co_check overflow of integer operations'#010+ '**2Cr_range checking'#010+ '**2Cs_set stack size to '#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+ + '*O2Dd_set d','escription to '#010+ '*O2Dw_PM application'#010+ - '**1e_set path',' to executable'#010+ + '**1e_set path to executable'#010+ '**1E_same as -Cn'#010+ '**1F_set file names and paths:'#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+ + '**2FE_set e','xe/unit output path to '#010+ + '**2Fi_adds to include path'#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_genera','te debugger information:'#010+ + '**2FU','_set unit output path to , overrides -FE'#010+ + '*g1g_generate debugger information:'#010+ '*g2gg_use gsym'#010+ '*g2gd_use dbx'#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+ + '*g2gc_generate chec','ks for pointers'#010+ '**1i_information'#010+ - '**2iD_return compiler ','date'#010+ + '**2iD_return compiler date'#010+ '**2iV_return compiler version'#010+ '**2iSO_return compiler OS'#010+ '**2iSP_return compiler processor'#010+ '**2iTO_return target OS'#010+ '**2iTP_return target processor'#010+ '**1I_adds to include path'#010+ - '**1k_Pass to the linker'#010+ + '**1','k_Pass to the linker'#010+ '**1l_write logo'#010+ - '**1n_don'#039't ','read the default config file'#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 tem','porary assembler files'#010+ '**1S_syntax options:'#010+ - '**2S2_sw','itch some Delphi 2 extensions on'#010+ + '**2S2_switch some Delphi 2 extensions on'#010+ '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+ '**2Sa_include assertion code.'#010+ '**2Sd_tries to be Delphi compatible'#010+ - '**2Se_compiler stops after the errors (default is 1)'#010+ + '**2Se_compiler stops after the errors (default is 1)'#010+ '**2Sg_allow LABEL and GOTO'#010+ - '**2S','h_Use ansistrings'#010+ + '**2Sh_Use ansistrings'#010+ '**2Si_support C++ styled INLINE'#010+ '**2Sm_support macros like C (global)'#010+ '**2So_tries to be TP/BP 7.0 compatible'#010+ '**2Sp_tries to be gpc compatible'#010+ - '**2Ss_constructor name must be init (destructor must be done)'#010+ - '**2St_allow static ','keyword in objects'#010+ + '**2Ss_constructor name mus','t be init (destructor must be done)'#010+ + '**2St_allow static keyword in objects'#010+ '**1s_don'#039't call assembler and linker (only with -a)'#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+ + '**2Ur_generate release unit fi','les'#010+ '**2Us_compile a system unit'#010+ - '**1v_Be verbose. ',' is a combination of the following letters:'#010+ + '**1v_Be verbose. is a combination of the following letters:'#010+ '**2*_e : Show errors (default) d : Show debug info'#010+ '**2*_w : Show warnings u : Show unit info'#010+ - '**2*_n : Show notes t : Show tried/used files'#010+ - '**2*_h : Show hints ',' m : Show defined macros'#010+ + '**2*_n : Show notes ',' t : Show tried/used files'#010+ + '**2*_h : Show 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 everything 0 : Show nothing (except errors)'#010+ - '**2*','_b : Show all procedure r : Rhide/GCC compatibility mod'+ - 'e'#010+ + '**2*_a : Show every','thing 0 : Show nothing (except errors'+ + ')'#010+ + '**2*_b : Show all procedure r : Rhide/GCC compatibility mode'#010+ '**2*_ declarations if an error x : Executable info (Win32 only)'#010+ '**2*_ occurs'#010+ '**1X_executable options:'#010+ - '*L2Xc_link with the c library'#010+ - '**2Xs_strip all symbols from exec','utable'#010+ + '*L2Xc_li','nk 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_STATIC)'#010+ - '**2XX_try to link smart (defines FPC_LINK_SMART)'#010+ + '**2XX_try to link smart (defines FPC_LINK_SM','ART)'#010+ '**0*_Processor specific options:'#010+ - '3*1A_output fo','rmat:'#010+ + '3*1A_output format:'#010+ '3*2Aas_assemble using GNU AS'#010+ '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#010+ '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+ '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+ - '3*2Anasmobj_obj file using Nasm'#010+ - '3*2Amasm_obj file using Masm (Microso','ft)'#010+ + '3*2Anasmobj_ob','j 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*2Apecoff_pecoff (Win32) using internal writer'#010+ '3*1R_assembler reading style:'#010+ - '3*2Ratt_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+ '3*2Rdirect_copy assembler text directly to assembler file'#010+ '3*1O_optimizations:'#010+ '3*2Og_generate smaller code'#010+ '3*2OG_generate faster code (default)'#010+ - '3*2Or_keep certain variables in registers'#010+ + '3*2Or_keep certain variables in registe','rs'#010+ '3*2Ou_enable uncertain optimizations (see docs)'#010+ - '3*2O','1_level 1 optimizations (quick optimizations)'#010+ + '3*2O1_level 1 optimizations (quick optimizations)'#010+ '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+ '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+ - '3*2Op_target processor:'#010+ + '3*2Op_target processo','r:'#010+ '3*3Op1_set target processor to 386/486'#010+ - '3*3Op2_set ta','rget processor to Pentium/PentiumMMX (tm)'#010+ + '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+ '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+ '3*1T_Target operating system:'#010+ '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#010+ - '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+ - '3*2TLINUX_Linux',#010+ + '3*2TGO32','V2_version 2 of DJ Delorie DOS extender'#010+ + '3*2TLINUX_Linux'#010+ '3*2Tnetware_Novell Netware Module (experimental)'#010+ '3*2TOS2_OS/2 2.x'#010+ '3*2TSUNOS_SunOS/Solaris'#010+ '3*2TWin32_Windows 32 Bit'#010+ '3*1W_Win32 target options'#010+ - '3*2WB_Set Image base to Hexadecimal value'#010+ + '3*2WB_Set Image base to Hexadecimal <','x> value'#010+ '3*2WC_Specify console type application'#010+ - '3*2WD_U','se DEFFILE to export functions of DLL or EXE'#010+ + '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+ '3*2WF_Specify full-screen type application (OS/2 only)'#010+ '3*2WG_Specify graphic type application'#010+ - '3*2WN_Do not generate relocation code (necessary for debugging)'#010+ + '3*2WN_Do not generate relocation code (necessa','ry 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_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*2Oa_turn on the opt','imizer'#010+ '6*2Og_generate smaller code'#010+ - '6*2OG_generate faste','r code (default)'#010+ + '6*2OG_generate faster code (default)'#010+ '6*2Ox_optimize maximum (still BUGGY!!!)'#010+ '6*2O2_set target processor to a MC68020+'#010+ '6*1R_assembler reading style:'#010+ '6*2RMOT_read motorola style assembler'#010+ - '6*1T_Target operating system:'#010+ + '6*1T_Target o','perating system:'#010+ '6*2TAMIGA_Commodore Amiga'#010+ - '6*2TATARI_At','ari ST/STe/TT'#010+ + '6*2TATARI_Atari ST/STe/TT'#010+ '6*2TMACOS_Macintosh m68k'#010+ '6*2TLINUX_Linux-68k'#010+ '6*2TPALMOS_PalmOS'#010+ diff --git a/compiler/nadd.pas b/compiler/nadd.pas index 64da915d27..c8538faf81 100644 --- a/compiler/nadd.pas +++ b/compiler/nadd.pas @@ -445,8 +445,14 @@ implementation (left.nodetype=setconstn) and not assigned(tsetconstnode(left).left) then begin - { check types } + { check if size adjusting is needed, only for left + to right as the other way is checked in the typeconv } + if (tsetdef(right.resulttype.def).settype=smallset) and + (tsetdef(left.resulttype.def).settype<>smallset) then + tsetdef(right.resulttype.def).changesettype(normset); + { check base types } inserttypeconv(left,right.resulttype); + if codegenerror then begin { recover by only returning the left part } @@ -1120,7 +1126,6 @@ implementation tempn: tnode; paras: tcallparanode; srsym: ttypesym; - createset: boolean; begin { get the sym that represents the fpc_normal_set type } if not searchsystype('FPC_NORMAL_SET',srsym) then @@ -1278,7 +1283,7 @@ implementation { create helper calls mul } if nodetype <> muln then exit; - + { make sure that if there is a constant, that it's on the right } if left.nodetype = ordconstn then begin @@ -1585,7 +1590,11 @@ begin end. { $Log$ - Revision 1.40 2001-10-12 13:51:51 jonas + Revision 1.41 2001-10-20 19:28:37 peter + * interface 2 guid support + * guid constants support + + Revision 1.40 2001/10/12 13:51:51 jonas * fixed internalerror(10) due to previous fpu overflow fixes ("merged") * fixed bug in n386add (introduced after compilerproc changes for string operations) where calcregisters wasn't called for shortstring addnodes diff --git a/compiler/ncgcon.pas b/compiler/ncgcon.pas index cc0908f6cc..5150007dba 100644 --- a/compiler/ncgcon.pas +++ b/compiler/ncgcon.pas @@ -55,6 +55,10 @@ interface procedure pass_2;override; end; + tcgguidconstnode = class(tguidconstnode) + procedure pass_2;override; + end; + implementation @@ -477,6 +481,30 @@ implementation location.reference.offset:=0; end; + +{***************************************************************************** + TCGPOINTERCONSTNODE +*****************************************************************************} + + procedure tcgguidconstnode.pass_2; + var + tmplabel : TAsmLabel; + i : integer; + begin + location.loc:=LOC_MEM; + { label for GUID } + getdatalabel(tmplabel); + consts.concat(Tai_label.Create(tmplabel)); + consts.concat(Tai_const.Create_32bit(value.D1)); + consts.concat(Tai_const.Create_16bit(value.D2)); + consts.concat(Tai_const.Create_16bit(value.D3)); + for i:=Low(value.D4) to High(value.D4) do + consts.concat(Tai_const.Create_8bit(value.D4[i])); + reset_reference(location.reference); + location.reference.symbol:=tmplabel; + end; + + begin crealconstnode:=tcgrealconstnode; cordconstnode:=tcgordconstnode; @@ -484,10 +512,15 @@ begin cstringconstnode:=tcgstringconstnode; csetconstnode:=tcgsetconstnode; cnilnode:=tcgnilnode; + cguidconstnode:=tcgguidconstnode; end. { $Log$ - Revision 1.1 2001-09-30 16:17:17 jonas + Revision 1.2 2001-10-20 19:28:37 peter + * interface 2 guid support + * guid constants support + + Revision 1.1 2001/09/30 16:17:17 jonas * made most constant and mem handling processor independent } diff --git a/compiler/ncnv.pas b/compiler/ncnv.pas index 8409c33c38..6c94c7f855 100644 --- a/compiler/ncnv.pas +++ b/compiler/ncnv.pas @@ -53,6 +53,7 @@ interface function resulttype_char_to_char : tnode; function resulttype_arrayconstructor_to_set : tnode; function resulttype_pchar_to_string : tnode; + function resulttype_interface_to_guid : tnode; function resulttype_call_helper(c : tconverttype) : tnode; protected function first_int_to_int : tnode;virtual; @@ -703,6 +704,14 @@ implementation end; + function ttypeconvnode.resulttype_interface_to_guid : tnode; + + begin + if tobjectdef(left.resulttype.def).isiidguidvalid then + result:=cguidconstnode.create(tobjectdef(left.resulttype.def).iidguid); + end; + + function ttypeconvnode.resulttype_call_helper(c : tconverttype) : tnode; const @@ -730,7 +739,7 @@ implementation { load_smallset } nil, { cord_2_pointer } @ttypeconvnode.resulttype_cord_to_pointer, { intf_2_string } nil, - { intf_2_guid } nil, + { intf_2_guid } @ttypeconvnode.resulttype_interface_to_guid, { class_2_intf } nil, { char_2_char } @ttypeconvnode.resulttype_char_to_char, { nomal_2_smallset} nil @@ -1586,7 +1595,11 @@ begin end. { $Log$ - Revision 1.40 2001-10-20 17:21:54 peter + Revision 1.41 2001-10-20 19:28:37 peter + * interface 2 guid support + * guid constants support + + Revision 1.40 2001/10/20 17:21:54 peter * fixed size of constset when change from small to normalset Revision 1.39 2001/09/30 16:12:46 jonas diff --git a/compiler/ncon.pas b/compiler/ncon.pas index c285927a47..04858dcbd5 100644 --- a/compiler/ncon.pas +++ b/compiler/ncon.pas @@ -104,12 +104,23 @@ interface end; tnilnodeclass = class of tnilnode; + tguidconstnode = class(tnode) + value : tguid; + constructor create(const g:tguid);virtual; + function getcopy : tnode;override; + function pass_1 : tnode;override; + function det_resulttype:tnode;override; + function docompare(p: tnode) : boolean; override; + end; + tguidconstnodeclass = class of tguidconstnode; + var crealconstnode : trealconstnodeclass; cordconstnode : tordconstnodeclass; cpointerconstnode : tpointerconstnodeclass; cstringconstnode : tstringconstnodeclass; csetconstnode : tsetconstnodeclass; + cguidconstnode : tguidconstnodeclass; cnilnode : tnilnodeclass; function genintconstnode(v : TConstExprInt) : tordconstnode; @@ -136,7 +147,7 @@ implementation uses cutils,verbose,globals,systems, - types,cpubase,nld; + types,cpubase,nld,symtable; function genintconstnode(v : TConstExprInt) : tordconstnode; @@ -184,7 +195,7 @@ implementation function is_constnode(p : tnode) : boolean; begin - is_constnode:=(p.nodetype in [ordconstn,realconstn,stringconstn,setconstn]); + is_constnode:=(p.nodetype in [ordconstn,realconstn,stringconstn,setconstn,guidconstn]); end; @@ -654,6 +665,50 @@ implementation location.loc:=LOC_MEM; end; +{***************************************************************************** + TGUIDCONSTNODE +*****************************************************************************} + + constructor tguidconstnode.create(const g:tguid); + + begin + inherited create(guidconstn); + value:=g; + end; + + function tguidconstnode.getcopy : tnode; + + var + n : tguidconstnode; + + begin + n:=tguidconstnode(inherited getcopy); + n.value:=value; + getcopy:=n; + end; + + function tguidconstnode.det_resulttype:tnode; + var + srsym : ttypesym; + begin + result:=nil; + resulttype.setdef(rec_tguid); + end; + + function tguidconstnode.pass_1 : tnode; + begin + result:=nil; + location.loc:=LOC_MEM; + end; + + function tguidconstnode.docompare(p: tnode): boolean; + begin + docompare := + inherited docompare(p) and + (guid2string(value) = guid2string(tguidconstnode(p).value)); + end; + + begin crealconstnode:=trealconstnode; cordconstnode:=tordconstnode; @@ -661,10 +716,15 @@ begin cstringconstnode:=tstringconstnode; csetconstnode:=tsetconstnode; cnilnode:=tnilnode; + cguidconstnode:=tguidconstnode; end. { $Log$ - Revision 1.23 2001-09-17 21:29:12 peter + Revision 1.24 2001-10-20 19:28:38 peter + * interface 2 guid support + * guid constants support + + Revision 1.23 2001/09/17 21:29:12 peter * merged netbsd, fpu-overflow from fixes branch Revision 1.22 2001/09/02 21:12:06 peter diff --git a/compiler/nobj.pas b/compiler/nobj.pas index 263471bc1f..7c5eae225a 100644 --- a/compiler/nobj.pas +++ b/compiler/nobj.pas @@ -760,8 +760,10 @@ implementation { generates a tree of all used methods } do_genvmt(_class); - if has_virtual_method and not(has_constructor) then - Message1(parser_w_virtual_without_constructor,_class.objname^); + if not(is_interface(_class)) and + has_virtual_method and + not(has_constructor) then + Message1(parser_w_virtual_without_constructor,_class.objname^); end; @@ -1273,7 +1275,11 @@ initialization end. { $Log$ - Revision 1.5 2001-10-20 17:20:14 peter + Revision 1.6 2001-10-20 19:28:38 peter + * interface 2 guid support + * guid constants support + + Revision 1.5 2001/10/20 17:20:14 peter * fixed generation of rtti for virtualmethods Revision 1.4 2001/09/19 11:04:42 michael diff --git a/compiler/node.pas b/compiler/node.pas index fed6fec507..6b0e3179d8 100644 --- a/compiler/node.pas +++ b/compiler/node.pas @@ -123,7 +123,8 @@ interface { added for optimizations where we cannot suppress } addoptn, nothingn, - loadvmtn + loadvmtn, + guidconstn ); const @@ -209,7 +210,8 @@ interface 'temprefn', 'addoptn', 'nothingn', - 'loadvmtn'); + 'loadvmtn', + 'guidconstn'); type { all boolean field of ttree are now collected in flags } @@ -801,7 +803,11 @@ implementation end. { $Log$ - Revision 1.19 2001-08-23 14:28:36 jonas + Revision 1.20 2001-10-20 19:28:38 peter + * interface 2 guid support + * guid constants support + + Revision 1.19 2001/08/23 14:28:36 jonas + tempcreate/ref/delete nodes (allows the use of temps in the resulttype and first pass) * made handling of read(ln)/write(ln) processor independent diff --git a/compiler/pdecl.pas b/compiler/pdecl.pas index 9c9edcc6f2..b632de4039 100644 --- a/compiler/pdecl.pas +++ b/compiler/pdecl.pas @@ -68,6 +68,7 @@ implementation p : tnode; ps : pconstset; pd : pbestreal; + pg : pguid; sp : pchar; storetokenpos : tfileposinfo; begin @@ -121,6 +122,22 @@ implementation begin hp:=tconstsym.create_ord_typed(orgname,constnil,0,p.resulttype); end; + typen : + begin + if is_interface(p.resulttype.def) then + begin + if tobjectdef(p.resulttype.def).isiidguidvalid then + begin + new(pg); + pg^:=tobjectdef(p.resulttype.def).iidguid; + hp:=tconstsym.create_ptr(orgname,constguid,pg); + end + else + Message1(parser_e_interface_has_no_guid,tobjectdef(p.resulttype.def).objname^); + end + else + Message(cg_e_illegal_expression); + end; else Message(cg_e_illegal_expression); end; @@ -593,7 +610,11 @@ implementation end. { $Log$ - Revision 1.35 2001-10-20 17:20:13 peter + Revision 1.36 2001-10-20 19:28:39 peter + * interface 2 guid support + * guid constants support + + Revision 1.35 2001/10/20 17:20:13 peter * fixed generation of rtti for virtualmethods Revision 1.34 2001/09/19 11:06:03 michael diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas index c8e9c7a87c..4e4e22cc94 100644 --- a/compiler/pexpr.pas +++ b/compiler/pexpr.pas @@ -1202,6 +1202,8 @@ implementation do_resulttypepass(p1); p1.resulttype:=cansistringtype; end; + constguid : + p1:=cguidconstnode.create(pguid(tconstsym(srsym).valueptr)^); end; end; @@ -2327,7 +2329,11 @@ implementation end. { $Log$ - Revision 1.43 2001-10-18 16:30:38 jonas + Revision 1.44 2001-10-20 19:28:39 peter + * interface 2 guid support + * guid constants support + + Revision 1.43 2001/10/18 16:30:38 jonas * property parameters are now fully parsed by the firstcall code to check for the correct amount and types (merged) diff --git a/compiler/types.pas b/compiler/types.pas index ed6210ec04..13747c025f 100644 --- a/compiler/types.pas +++ b/compiler/types.pas @@ -1741,6 +1741,22 @@ implementation end end; + recorddef : + begin + { interface -> guid } + if is_interface(def_from) and + (def_to=rec_tguid) then + begin + doconv:=tc_intf_2_guid; + b:=1; + end + else + begin + { assignment overwritten ?? } + if assignment_overloaded(def_from,def_to)<>nil then + b:=2; + end; + end; else begin { assignment overwritten ?? } @@ -1781,7 +1797,11 @@ implementation end. { $Log$ - Revision 1.49 2001-10-17 22:41:05 florian + Revision 1.50 2001-10-20 19:28:39 peter + * interface 2 guid support + * guid constants support + + Revision 1.49 2001/10/17 22:41:05 florian * several widechar fixes, case works now Revision 1.48 2001/10/16 17:15:44 jonas