From 030eae46ded46cde47f2ab06811d6df299172426 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 9 Aug 2002 07:33:01 +0000 Subject: [PATCH] * a couple of interface related fixes --- compiler/i386/cpupara.pas | 12 +- compiler/i386/n386obj.pas | 18 +-- compiler/msg/errore.msg | 3 + compiler/msgidx.inc | 5 +- compiler/msgtxt.inc | 314 +++++++++++++++++++------------------- compiler/ncnv.pas | 9 +- compiler/nobj.pas | 39 ++++- compiler/paramgr.pas | 23 +-- compiler/pdecobj.pas | 71 ++++++--- compiler/ppu.pas | 7 +- compiler/symdef.pas | 17 ++- 11 files changed, 300 insertions(+), 218 deletions(-) diff --git a/compiler/i386/cpupara.pas b/compiler/i386/cpupara.pas index a5c0e78c3b..b6ecb82b34 100644 --- a/compiler/i386/cpupara.pas +++ b/compiler/i386/cpupara.pas @@ -41,6 +41,7 @@ unit cpupara; ti386paramanager = class(tparamanager) function getintparaloc(nr : longint) : tparalocation;override; procedure create_param_loc_info(p : tabstractprocdef);override; + function getselflocation(p : tabstractprocdef) : tparalocation;override; end; implementation @@ -60,13 +61,22 @@ unit cpupara; } end; + function ti386paramanager.getselflocation(p : tabstractprocdef) : tparalocation; + begin + getselflocation.loc:=LOC_REFERENCE; + getselflocation.reference.index:=R_ESP; + getselflocation.reference.offset:=4; + end; begin paramanager:=ti386paramanager.create; end. { $Log$ - Revision 1.2 2002-07-11 14:41:32 florian + Revision 1.3 2002-08-09 07:33:04 florian + * a couple of interface related fixes + + Revision 1.2 2002/07/11 14:41:32 florian * start of the new generic parameter handling Revision 1.1 2002/07/07 09:52:33 florian diff --git a/compiler/i386/n386obj.pas b/compiler/i386/n386obj.pas index 38e8585f0c..05f4bf1d32 100644 --- a/compiler/i386/n386obj.pas +++ b/compiler/i386/n386obj.pas @@ -107,15 +107,6 @@ procedure ti386classheader.cgintfwrapper(asmlist: TAAsmoutput; procdef: tprocdef Internalerror(200006139); end; - procedure adjustselfvalue(ioffset: longint); - var - href : treference; - begin - { sub $ioffset,offset(%esp) } - reference_reset_base(href,R_ESP,getselfoffsetfromsp(procdef)); - emit_const_ref(A_SUB,S_L,ioffset,href); - end; - procedure getselftoeax(offs: longint); var href : treference; @@ -183,7 +174,7 @@ begin exprasmList.concat(Tai_symbol.Createname(labelname,0)); { set param1 interface to self } - adjustselfvalue(ioffset); + adjustselfvalue(procdef,ioffset); { case 1 or 2 } if (po_clearstack in procdef.procoptions) then @@ -197,7 +188,7 @@ begin else { case 1 } cg.a_call_name(exprasmlist,procdef.mangledname); { restore param1 value self to interface } - adjustselfvalue(-ioffset); + adjustselfvalue(procdef,-ioffset); end { case 3 } else if [po_virtualmethod,po_saveregisters]*procdef.procoptions=[po_virtualmethod,po_saveregisters] then @@ -237,7 +228,10 @@ initialization end. { $Log$ - Revision 1.12 2002-07-16 15:34:21 florian + Revision 1.13 2002-08-09 07:33:04 florian + * a couple of interface related fixes + + Revision 1.12 2002/07/16 15:34:21 florian * exit is now a syssym instead of a keyword Revision 1.11 2002/07/01 18:46:33 peter diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index deec5b0664..40f5aeedef 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -1233,6 +1233,9 @@ sym_b_param_list=05039_B_Found declaration: $1 % listed, with their parameter lists. sym_e_segment_too_large=05040_E_Data segment too large (max. 2GB) % You get this when you declare an array whose size exceeds the 2GB limit. +sym_e_no_matching_implementation_found=05041_E_No matching implementation for interface method "$1" found +% There was no matching method found which could implement the interface +% method. Check argument types and result type of the methods. % \end{description} # # Codegenerator diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index fabb34d6e1..9ded4df264 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -344,6 +344,7 @@ const sym_e_id_no_member=05038; sym_b_param_list=05039; sym_e_segment_too_large=05040; + sym_e_no_matching_implementation_found=05041; cg_e_break_not_allowed=06000; cg_e_continue_not_allowed=06001; cg_e_too_complex_expr=06002; @@ -608,9 +609,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 34117; + MsgTxtSize = 34184; MsgIdxMax : array[1..20] of longint=( - 17,62,184,42,41,41,98,17,35,42, + 17,62,184,42,42,41,98,17,35,42, 31,1,1,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index d21840971b..7485b0f401 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -386,454 +386,456 @@ const msgtxt : array[0..000142,1..240] of char=( '05038_E_identifier idents no member "$1"'#000+ '05039_B_Found declaration: $1'#000+ '05040_E_Data segment too large (m','ax. 2GB)'#000+ + '05041_E_No matching implementation for interface method "$1" found'#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+ + '06004_E_Invalid integer ex','pression'#000+ '06005_E_Illegal qualifier'#000+ - '06006_E_High range limit < low r','ange limit'#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 po','rtable acr'+ - 'oss platforms'#000+ + '06010_E_Illegal type co','nversion'#000+ + '06011_D_Conversion between ordinals and pointers is not portable acros'+ + 's 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 c','all of constructor or destructor (doesn'#039+ - 't match to this context)'#000+ + '06015_E_E','XPORT declared functions 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 get','floatreg(), allocation failure'#000+ + '06020_E_Abst','ract 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+ + '06025_F_32-bit unsigned not supported ','in MC68000 mode'#000+ '06026_F_Internal Error in secondinline()'#000+ - '06027_D_Re','gister $1 weight $2 $3'#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+ + '06032_E_Procvar calls ca','n'#039't be inline.'#000+ '06033_E_No code for inline procedure stored'#000+ - '06034_E_','Direct call of interrupt procedure "$1" is not possible'#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 destruct','ors can not be called inside a '#039'w'+ - 'ith'#039' clause'#000+ + '06036_E_Include and ex','clude 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 a','ssembler parsing'#000+ + '06040_E_Control flow statem','ents aren'#039't allowed in 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+ + '07004_E_Error building record offs','et'#000+ '07005_E_OFFSET used without identifier'#000+ - '07006_E_TYPE used without',' identifier'#000+ + '07006_E_TYPE used without identifier'#000+ '07007_E_Cannot use local variable or parameters here'#000+ '07008_E_need to use OFFSET here'#000+ '07009_E_need to use $ here'#000+ '07010_E_Cannot use multiple relocatable symbols'#000+ - '07011_E_Relocatable symbol can only be added'#000+ - '07012_E_Invalid constan','t expression'#000+ + '0','7011_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+ + '07016_E_Local symbols/labels aren'#039't allow','ed as references'#000+ '07017_E_Invalid base and index register usage'#000+ - '0701','8_W_Possible error in object field handling'#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+ + '07022_E_Invalid string as',' opcode operand: $1'#000+ '07023_W_@CODE and @DATA not supported'#000+ - '07024_E_N','ull label references are not allowed'#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+ + '07028_E_Invalid symbol reference'#000, '07029_W_Fwait can cause emulation problems with emu387'#000+ - '07030_W_$1 w','ithout operand translated into $1P'#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+ + '07033_E_Unsupported symbol ty','pe for operand'#000+ '07034_E_Constant value out of bounds'#000+ - '07035_E_Error c','onverting decimal $1'#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 a','ssociated to an overloaded function'#000+ + '07041_E_Cannot use SELF outside a method'#000+ '07042_E_Cannot use OLDEBP outside a nested procedure'#000+ '07043_W_Procedures can'#039't return any value in asm code'#000+ '07044_E_SEG not supported'#000+ - '07045_E_Size suffix and destination or source size do not match'#000+ - '07046_W_Size suffix and destinati','on or source size do not match'#000+ + '07045_E_Size suffix and destin','ation 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 constant'#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 oper','ands on line'#000+ + '07056_E_I','nvalid 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+ + '07063_E_Invalid',' register name'#000+ '07064_E_Invalid floating point register name'#000+ - '07065_E','_NOR not supported'#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 seg','ment override expression'#000+ + '07070_E_Cannot',' index a local var or parameter with a register'#000+ + '07071_E_Invalid segment override expression'#000+ '07072_W_Identifier $1 supposed external'#000+ '07073_E_Strings not allowed as constants'#000+ '07074_No type of variable specified'#000+ - '07075_E_assembler code not returned to text section'#000+ + '07075_E_assembler code not retu','rned to text section'#000+ '07076_E_Not a directive or local symbol $1'#000+ - '070','77_E_Using 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+ - '07081_E_Can'#039't access fields directly for par','ameters'#000+ + '07080_N_.align is target specific, u','se .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+ + '07084_E_Cannot use RESULT in this ','function'#000+ '07085_H_RESULT is register $1'#000+ - '07086_W_"$1" without operand',' translated into "$1 %st,%st(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+ + '0709','0_E_Char > not allowed here'#000+ '07091_W_XDEF not supported'#000+ - '07092_E_Inva','lid 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+ + '07097_E_68020 mode re','quired'#000+ '08000_F_Too many assembler files'#000+ - '08001_F_Selected assembler ','output not supported'#000+ + '08001_F_Selected assembler output not supported'#000+ '08002_F_Comp not supported'#000+ '08003_F_Direct not support for binary writers'#000+ '08004_E_Allocating of data is only allowed in bss section'#000+ - '08005_F_No binary writer selected'#000+ + '08005_F_No binary wri','ter selected'#000+ '08006_E_Asm: Opcode $1 not in table'#000+ - '08007_E_Asm: $1 in','valid combination of opcode and operands'#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+ + '080','11_E_Asm: $1 value exceeds bounds $2'#000+ + '08012_E_Asm: Short jump is out of range $1'#000+ '08013_E_Asm: Undefined label $1'#000+ '08014_E_Asm: Comp type not supported for this target'#000+ '08015_E_Asm: Extended type not supported for this target'#000+ - '08016_E_Asm: Duplicate label $1'#000+ + '08016_E_Asm: Dupli','cate label $1'#000+ '09000_W_Source operating system redefined'#000+ - '09001_I_Ass','embling (pipe) $1'#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 assembling'#000+ '09006_T_Using assembler: $1'#000+ - '09007_E_Error w','hile assembling 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, Link','ing may fail !'#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+ + '09016_E_Util $1 not found, switching to external l','inking'#000+ '09017_T_Using util $1'#000+ - '09018_E_Creation of Executables not su','pported'#000+ + '09018_E_Creation of Executables not supported'#000+ '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+ '09020_I_Closing script $1'#000+ '09021_E_resource 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 linki'+ - 'ng'#000+ + '09022_I_Compilin','g resource $1'#000+ + '09023_T_unit $1 can'#039't be static linked, switching to smart linking'+ + #000+ '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+ #000+ '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+ 'g'#000+ - '09026_E_unit $1 can'#039't be smart or static linked'#000+ - '09027_E_unit $1 can'#039't be shared or static l','inked'#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+ '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 uni','nitialized data: $1 bytes'#000+ '09033_X_Stack space reserved: $1 bytes'#000+ - '09','034_X_Stack 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+ - '10007_U_PPU Invalid Header (no PPU at the begi','n)'#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 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-File'#000+ '10014_F_Error reading PPU-File'#000+ - '10015_F_unexp','ected 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 availabl','e'#000+ + '10020_F_Circular unit reference b','etween $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 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 fr','om $1 ($2) unit $3'#000+ + '1002','6_F_There were $1 errors compiling module, stopping'#000+ + '10027_U_Load from $1 ($2) unit $3'#000+ '10028_U_Recompiling $1, checksum changed for $2'#000+ '10029_U_Recompiling $1, source found only'#000+ '10030_U_Recompiling unit, static lib is older than ppufile'#000+ - '10031_U_Recompiling unit, shared lib is older than ppufile'#000+ - '10032_U_Recom','piling unit, 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_C','onditional $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+ - '10041_H_File $1 is newer than Release PPU fi','le $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+ '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+ + '11003_E_nested response files are not sup','ported'#000+ '11004_F_No source file name in command line'#000+ - '11005_N_No optio','n inside $1 config file'#000+ + '11005_N_No option inside $1 config file'#000+ '11006_E_Illegal parameter: $1'#000+ '11007_H_-? writes help pages'#000+ '11008_F_Too many config files nested'#000+ '11009_F_Unable to open file $1'#000+ - '11010_D_Reading further options from $1'#000+ + '11010_D_Reading furthe','r options from $1'#000+ '11011_W_Target is already set to: $1'#000+ - '11012_W_Shar','ed libs not supported on DOS platform, reverting to stat'+ - 'ic'#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_T','ry recompiling with -dGDB'#000+ + '11016_W_Debug i','nformation 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',' compatible with "$2"'#000+ + '11020_N_Switching assembler to default sou','rce writing assembler'#000+ + '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+ '11022_W_"$1" assembler use forced'#000+ '11026_T_Reading options from file $1'#000+ '11027_T_Reading options from environment $1'#000+ '11028_D_Handling option "$1"'#000+ - '11029__*** press enter ***'#000+ + '11029__','*** press enter ***'#000+ '11030_E_Unknown code page'#000+ - '11023_Free Pascal Com','piler version $FPCVER [$FPCDATE] for $FPCTARGET'+ - #010+ + '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+ 'Copyright (c) 1993-2002 by Florian Klaempfl'#000+ '11024_Free Pascal Compiler version $FPCVER'#010+ #010+ 'Compiler Date : $FPCDATE'#010+ - 'Compiler Target: $FPCTARGET'#010+ + 'Compiler Ta','rget: $FPCTARGET'#010+ #010+ 'Supported targets:'#010+ ' $OSTARGETS'#010+ #010+ - 'This program com','es under the GNU General 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 comp','iler 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+ - '**1b_generate browser inf','o'#010+ + '**2at_list temp ','allocation/release info in assembler file'#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+ + '**2Ch_ bytes heap (between',' 1023 and 67107840)'#010+ '**2Ci_IO-checking'#010+ '**2Cn_omit linking stage'#010+ - '**2C','o_check overflow of integer operations'#010+ + '**2Co_check overflow of integer operations'#010+ '**2Cr_range checking'#010+ '**2CR_verify object method call validity'#010+ '**2Cs_set stack size to '#010+ '**2Ct_stack checking'#010+ - '**2CX_create also smartlinked library'#010+ + '**2CX_create also sm','artlinked library'#010+ '**1d_defines the symbol '#010+ - '*O1D_generate a DE','F file'#010+ + '*O1D_generate a DEF file'#010+ '*O2Dd_set description to '#010+ '*O2Dw_PM application'#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+ + '**2FD_sets the directory whe','re 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+ - '**2Fo_adds to object path'#010+ + '**2Fo_adds to ','object path'#010+ '**2Fr_load error message file '#010+ - '**2Fu_adds ','to unit path'#010+ + '**2Fu_adds to unit path'#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 backtrace','s'#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+ '**2iSO_return compiler OS'#010+ '**2iSP_return compiler processor'#010+ - '**2iTO_return target OS'#010+ + '**2','iTO_return target OS'#010+ '**2iTP_return target processor'#010+ - '**1I_adds to include path'#010+ + '**1I_adds to include path'#010+ '**1k_Pass to the linker'#010+ '**1l_write logo'#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 in','stead of creating temporary assembler files'#010+ + '**1pg_gene','rate profile code for gprof (defines FPC_PROFILE)'#010+ + '*L1P_use pipes instead of creating temporary assembler files'#010+ '**1S_syntax options:'#010+ '**2S2_switch some Delphi 2 extensions on'#010+ '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+ - '**2Sa_include assertion code.'#010+ + '**2Sa_include ','assertion code.'#010+ '**2Sd_tries to be Delphi compatible'#010+ - '**2Se_compil','er stops after the errors (default is 1)'#010+ + '**2Se_compiler stops after the errors (default is 1)'#010+ '**2Sg_allow LABEL and GOTO'#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+ + '**2So_trie','s 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+ + '**2Ss_constructor name must be init (destructor must be done)'#010+ '**2St_allow static keyword in objects'#010+ '**1s_don'#039't call assembler and linker (only with -a)'#010+ - '**2st_Generate script to link on target'#010+ + '**2st_Generate script to l','ink on target'#010+ '**2sh_Generate script to link on host'#010+ - '**1u_undefin','es the symbol '#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+ '**2Us_compile a system unit'#010+ - '**1v_Be verbose. is a combination of the following letters:'#010+ - '**2*_e : Show errors (default) d : S','how debug info'#010+ + '**1v_Be verbose. is a combination o','f 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*_i : Show general info p : Show',' compiled procedures'#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 mode'#010+ - '**2*_ declaration','s if an error x : Executable info (Win32 only'+ - ')'#010+ + '**2*_b : Show all proce','dure r : Rhide/GCC compatibility mod'+ + 'e'#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 executable'#010+ - '**2XD_try to link dynamic (defines FPC_LINK_DYNAMIC)'#010+ - '**2XS_try to link',' static (default) (defines FPC_LINK_STATIC)'#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*2Aasaout_assemble using GNU AS for aout (Go32v1)'#010, + '3*2Aas_assemb','le 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 (Microsoft)'#010+ - '3*2Atasm_obj file using Tasm (Borland)'#010+ - '3*2Acoff_coff (Go32v2) using internal write','r'#010+ + '3*2Atasm_obj fi','le 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*2Rdirect_copy assembler text directly to assembler file'#010+ + '3*2Rdirect_copy ass','embler text directly to assembler file'#010+ '3*1O_optimizations:'#010+ - '3*2Og','_generate smaller code'#010+ + '3*2Og_generate smaller code'#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 + slowe','r optimizations)'#010+ + '3*2O1_level 1 optimizat','ions (quick optimizations)'#010+ + '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+ '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+ '3*2Op_target processor:'#010+ '3*3Op1_set target processor to 386/486'#010+ - '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+ - '3*3Op3_set target processor to PPro/PII/c6x8','6/K6 (tm)'#010+ + '3*3Op2_set target processor to P','entium/PentiumMMX (tm)'#010+ + '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+ '3*1T_Target operating system:'#010+ '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+ '3*2TWDOSX DOS 32 Bit Extender'#010+ '3*2TLINUX_Linux'#010+ - '3*2Tnetware_Novell Netware Module (experimental)'#010+ + '3*2Tnetware_Novell Netware Module (e','xperimental)'#010+ '3*2TOS2_OS/2 2.x'#010+ '3*2TSUNOS_SunOS/Solaris'#010+ - '3*2TWin32_Win','dows 32 Bit'#010+ + '3*2TWin32_Windows 32 Bit'#010+ '3*1W_Win32 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*2WD_Use DEFFILE to export functions of DLL',' or EXE'#010+ '3*2WF_Specify full-screen type application (OS/2 only)'#010+ - '3*2W','G_Specify graphic type application'#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*2Aas_Unix o-file using GNU AS'#010+ + '6*2Aas_Unix o-file us','ing GNU AS'#010+ '6*2Agas_GNU Motorola assembler'#010+ - '6*2Amit_MIT Syntax (old G','AS)'#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*2Ox_optimize maximum (still BUGGY!!!)'#010+ + '6*2Ox_optimize maxim','um (still BUGGY!!!)'#010+ '6*2O2_set target processor to a MC68020+'#010+ - '6*1R_assembler reading style:'#010+ + '6*1R_assembler reading style:'#010+ '6*2RMOT_read motorola style assembler'#010+ '6*1T_Target operating system:'#010+ '6*2TAMIGA_Commodore Amiga'#010+ '6*2TATARI_Atari ST/STe/TT'#010+ - '6*2TMACOS_Macintosh m68k'#010+ + '6*2TMACOS_Macintosh m68','k'#010+ '6*2TLINUX_Linux-68k'#010+ '6*2TPALMOS_PalmOS'#010+ '**1*_'#010+ - '**1?_shows this help'#010, + '**1?_shows this help'#010+ '**1h_shows this help without waiting'#000 ); diff --git a/compiler/ncnv.pas b/compiler/ncnv.pas index bebcea9a8d..f16a47162b 100644 --- a/compiler/ncnv.pas +++ b/compiler/ncnv.pas @@ -1863,9 +1863,9 @@ implementation if (right.nodetype=typen) then begin if tobjectdef(left.resulttype.def).isiidguidvalid then - right:=cguidconstnode.create(tobjectdef(left.resulttype.def).iidguid) + right:=cguidconstnode.create(tobjectdef(left.resulttype.def).iidguid) else - internalerror(200206282); + internalerror(200206282); resulttypepass(right); end; end @@ -1893,7 +1893,10 @@ begin end. { $Log$ - Revision 1.65 2002-07-29 21:23:42 florian + Revision 1.66 2002-08-09 07:33:01 florian + * a couple of interface related fixes + + Revision 1.65 2002/07/29 21:23:42 florian * more fixes for the ppc + wrappers for the tcnvnode.first_* stuff introduced diff --git a/compiler/nobj.pas b/compiler/nobj.pas index 81f7fd0f25..da4d6bfdaa 100644 --- a/compiler/nobj.pas +++ b/compiler/nobj.pas @@ -28,7 +28,7 @@ unit nobj; interface uses - cutils,cclasses, + cutils,cclasses,cpuinfo, symdef,aasmbase,aasmtai,aasmcpu; type @@ -99,6 +99,11 @@ interface procedure gintfdoonintf(intf: tobjectdef; intfindex: longint); procedure gintfwalkdowninterface(intf: tobjectdef; intfindex: longint); protected + { adjusts the self value with ioffset when casting a interface + to a class + } + procedure adjustselfvalue(procdef: tprocdef;ioffset: aword);virtual; + { generates the wrapper for a call to a method via an interface } procedure cgintfwrapper(asmlist: TAAsmoutput; procdef: tprocdef; const labelname: string; ioffset: longint);virtual;abstract; public constructor create(c:tobjectdef); @@ -135,11 +140,11 @@ implementation strings, {$endif} globtype,globals,verbose, - symtable,symconst,symtype,symsym,defbase, + symtable,symconst,symtype,symsym,defbase,paramgr, {$ifdef GDB} gdb, {$endif GDB} - cpuinfo + cpubase,cgbase,cginfo,cgobj,rgobj ; @@ -793,7 +798,7 @@ implementation proccount:=implintf.implproccount(intfindex); for i:=1 to proccount do begin - tmps:=implintf.implprocs(intfindex,i).mangledname+'_$_'+curintf.objname^; + tmps:=mangledname_prefix('WRPR',_class.owner)+_class.objname^+'_$_'+curintf.objname^+'_$_'+implintf.implprocs(intfindex,i).mangledname; { create wrapper code } cgintfwrapper(rawcode,implintf.implprocs(intfindex,i),tmps,implintf.ioffsets(intfindex)^); { create reference } @@ -1031,7 +1036,7 @@ implementation if assigned(implprocdef) then _class.implementedinterfaces.addimplproc(intfindex,implprocdef) else - Message1(sym_e_id_not_found,procname); + Message1(sym_e_no_matching_implementation_found,proc.fullprocnamewithret); end; end; end; @@ -1263,13 +1268,35 @@ implementation dataSegment.concat(Tai_symbol_end.Createname(_class.vmt_mangledname)); end; + procedure tclassheader.adjustselfvalue(procdef: tprocdef;ioffset: aword); + var + href : treference; + l : tparalocation; + begin + l:=paramanager.getselflocation(procdef); + case l.loc of + LOC_REGISTER: + cg.a_op_const_reg(exprasmlist,OP_SUB,ioffset,l.register); + LOC_REFERENCE: + begin + reference_reset_base(href,l.reference.index,l.reference.offset); + cg.a_op_const_ref(exprasmlist,OP_SUB,OS_ADDR,ioffset,href); + end + else + internalerror(2002080801); + end; + end; + initialization cclassheader:=tclassheader; end. { $Log$ - Revision 1.22 2002-07-20 11:57:55 florian + Revision 1.23 2002-08-09 07:33:01 florian + * a couple of interface related fixes + + Revision 1.22 2002/07/20 11:57:55 florian * types.pas renamed to defbase.pas because D6 contains a types unit so this would conflicts if D6 programms are compiled + Willamette/SSE2 instructions to assembler added diff --git a/compiler/paramgr.pas b/compiler/paramgr.pas index 097b49f211..b56ccbc7de 100644 --- a/compiler/paramgr.pas +++ b/compiler/paramgr.pas @@ -33,9 +33,9 @@ unit paramgr; symtype,symdef; type - {# This class defines some methods to take care of routine + {# This class defines some methods to take care of routine parameters. It should be overriden for each new processor - } + } tparamanager = class {# Returns true if the return value can be put in accumulator } function ret_in_acc(def : tdef) : boolean;virtual; @@ -47,27 +47,29 @@ unit paramgr; function push_high_param(def : tdef) : boolean;virtual; - {# Returns true if a parameter is too large to copy and only + {# Returns true if a parameter is too large to copy and only the address is pushed } function push_addr_param(def : tdef) : boolean;virtual; {# Returns a structure giving the information on the storage of the parameter (which must be an integer parameter) - + @param(nr Parameter number of routine, starting from 1) - } + } function getintparaloc(nr : longint) : tparalocation;virtual;abstract; procedure create_param_loc_info(p : tabstractprocdef);virtual;abstract; - {# + {# Returns the location where the invisible parameter for structured function results will be passed. } function getfuncretloc(p : tabstractprocdef) : tparalocation;virtual;abstract; - { Returns the self pointer for the give procdef - function getfuncretloc(p : tabstractprocdef) : tparalocation;virtual;abstract; + { Returns the self pointer location for the given tabstractprocdef, + when the stack frame is already created. This is used by the code + generating the wrappers for implemented interfaces. } + function getselflocation(p : tabstractprocdef) : tparalocation;virtual;abstract; end; procedure setparalocs(p : tprocdef); @@ -173,7 +175,10 @@ end. { $Log$ - Revision 1.8 2002-08-06 20:55:21 florian + Revision 1.9 2002-08-09 07:33:02 florian + * a couple of interface related fixes + + Revision 1.8 2002/08/06 20:55:21 florian * first part of ppc calling conventions fix Revision 1.7 2002/08/05 18:27:48 carl diff --git a/compiler/pdecobj.pas b/compiler/pdecobj.pas index 007bd3671e..e7acbce35f 100644 --- a/compiler/pdecobj.pas +++ b/compiler/pdecobj.pas @@ -764,27 +764,34 @@ implementation end; end; + procedure handleimplementedinterface(implintf : tobjectdef); + + begin + if not is_interface(implintf) then + begin + Message1(type_e_interface_type_expected,implintf.typename); + exit; + end; + if aktclass.implementedinterfaces.searchintf(implintf)<>-1 then + Message1(sym_e_duplicate_id,implintf.name) + else + aktclass.implementedinterfaces.addintf(implintf); + end; + procedure readimplementedinterfaces; var - implintf: tobjectdef; tt : ttype; begin - while try_to_consume(_COMMA) do begin - id_type(tt,pattern,false); - implintf:=tobjectdef(tt.def); - if (tt.def.deftype<>objectdef) then begin - Message1(type_e_interface_type_expected,tt.def.typename); - Continue; { omit } + while try_to_consume(_COMMA) do + begin + id_type(tt,pattern,false); + if (tt.def.deftype<>objectdef) then + begin + Message1(type_e_interface_type_expected,tt.def.typename); + continue; + end; + handleimplementedinterface(tobjectdef(tt.def)); end; - if not is_interface(implintf) then begin - Message1(type_e_interface_type_expected,implintf.typename); - Continue; { omit } - end; - if aktclass.implementedinterfaces.searchintf(tt.def)<>-1 then - Message1(sym_e_duplicate_id,tt.def.name) - else - aktclass.implementedinterfaces.addintf(tt.def); - end; end; procedure readinterfaceiid; @@ -810,7 +817,10 @@ implementation procedure readparentclasses; + var + hp : tobjectdef; begin + hp:=nil; { reads the parent class } if token=_LKLAMMER then begin @@ -821,7 +831,7 @@ implementation (childof.deftype<>objectdef) then begin if assigned(childof) then - Message1(type_e_class_type_expected,childof.typename); + Message1(type_e_class_type_expected,childof.typename); childof:=nil; aktclass:=tobjectdef.create(classtype,n,nil); end @@ -831,9 +841,19 @@ implementation isn't allowed } case classtype of odt_class: - if not(is_class(childof)) and - not(is_interface(childof)) then - Message(parser_e_mix_of_classes_and_objects); + if not(is_class(childof)) then + begin + if is_interface(childof) then + begin + { we insert the interface after the child + is set, see below + } + hp:=childof; + childof:=class_tobject; + end + else + Message(parser_e_mix_of_classes_and_objects); + end; odt_interfacecorba, odt_interfacecom: if not(is_interface(childof)) then @@ -861,7 +881,11 @@ implementation else aktclass:=tobjectdef.create(classtype,n,childof); if aktclass.objecttype=odt_class then - readimplementedinterfaces; + begin + if assigned(hp) then + handleimplementedinterface(hp); + readimplementedinterfaces; + end; end; consume(_RKLAMMER); end @@ -1133,7 +1157,10 @@ implementation end. { $Log$ - Revision 1.47 2002-07-20 11:57:55 florian + Revision 1.48 2002-08-09 07:33:02 florian + * a couple of interface related fixes + + Revision 1.47 2002/07/20 11:57:55 florian * types.pas renamed to defbase.pas because D6 contains a types unit so this would conflicts if D6 programms are compiled + Willamette/SSE2 instructions to assembler added diff --git a/compiler/ppu.pas b/compiler/ppu.pas index c65d7da3a2..5485911151 100644 --- a/compiler/ppu.pas +++ b/compiler/ppu.pas @@ -41,7 +41,7 @@ type {$endif Test_Double_checksum} const - CurrentPPUVersion=27; + CurrentPPUVersion=28; { buffer sizes } maxentrysize = 1024; @@ -981,7 +981,10 @@ end; end. { $Log$ - Revision 1.20 2002-05-18 13:34:13 peter + Revision 1.21 2002-08-09 07:33:02 florian + * a couple of interface related fixes + + Revision 1.20 2002/05/18 13:34:13 peter * readded missing revisions Revision 1.19 2002/05/16 19:46:44 carl diff --git a/compiler/symdef.pas b/compiler/symdef.pas index 4aba0f7e8c..57d78f8db0 100644 --- a/compiler/symdef.pas +++ b/compiler/symdef.pas @@ -2561,7 +2561,7 @@ implementation function tformaldef.gettypename : string; begin - gettypename:='Var'; + gettypename:=''; end; {*************************************************************************** @@ -3251,7 +3251,11 @@ implementation begin if hp.paratyp in [vs_var,vs_const,vs_out] then s := s + ' '; - s:=s+hp.paratype.def.typesym.realname; + hs:=hp.paratype.def.typesym.realname; + if hs[1]<>'$' then + s:=s+hp.paratype.def.typesym.realname + else + s:=s+hp.paratype.def.gettypename; end; { default value } if assigned(hp.defaultvalue) then @@ -4135,7 +4139,7 @@ implementation if objecttype in [odt_interfacecom,odt_interfacecorba] then begin isiidguidvalid:=boolean(ppufile.getbyte); - ppufile.putguid(iidguid); + ppufile.getguid(iidguid); iidstr:=stringdup(ppufile.getstring); lastvtableindex:=ppufile.getlongint; end; @@ -4356,7 +4360,7 @@ implementation end;*) procedure Tobjectdef._searchdestructor(sym:Tnamedindexitem;arg:pointer); - + begin { if we found already a destructor, then we exit } if (sd=nil) and (Tsym(sym).typ=procsym) then @@ -5486,7 +5490,10 @@ implementation end. { $Log$ - Revision 1.85 2002-07-23 09:51:24 daniel + Revision 1.86 2002-08-09 07:33:03 florian + * a couple of interface related fixes + + Revision 1.85 2002/07/23 09:51:24 daniel * Tried to make Tprocsym.defs protected. I didn't succeed but the cleanups are worth comitting.