paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-15 17:39:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ ttertiarynode

Browse Source 
* traise node refactored using tertiarynode
* more dipatch stuff

git-svn-id: trunk@5215 -
This commit is contained in:
florian 2006-11-03 23:03:31 +00:00
parent 66cf666f65
commit c947295cb8
11 changed files with 467 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/defutil.pas
View File

@ -1002,6 +1002,8 @@ implementation
result:=tstringdef(p).stringtype in [st_ansistring,st_widestring];
variantdef:
result:=true;
arraydef:
result:=(ado_IsConstString in tarraydef(p).arrayoptions);
end;
end;

3
compiler/msg/errore.msg
View File

@ -1357,6 +1357,9 @@ type_e_cant_take_address_of_local_subroutine=04076_E_Can't take address of a sub
% The address of a subroutine marked as local can't be taken.
type_e_cant_export_local=04077_E_Can't export subroutine marked as local from a unit
% A subroutine marked as local can't be export from a unit.
type_e_not_automatable=04078_E_Type is not automatable: "$1"
% Only byte, integer, longint, smallint, currency, single, double, ansistring,
% widestring, tdatetime, variant, olevariant, wordbool and all interfaces are automatable.
#
# Symtable
#

5
compiler/msgidx.inc
View File

@ -377,6 +377,7 @@ const
type_w_untyped_arithmetic_unportable=04066;
type_e_cant_take_address_of_local_subroutine=04076;
type_e_cant_export_local=04077;
type_e_not_automatable=04078;
sym_e_id_not_found=05000;
sym_f_internal_error_in_symtablestack=05001;
sym_e_duplicate_id=05002;
@ -702,9 +703,9 @@ const
option_info=11024;
option_help_pages=11025;
MsgTxtSize = 41576;
MsgTxtSize = 41614;
MsgIdxMax : array[1..20] of longint=(
24,81,226,78,62,47,102,22,135,60,
24,81,226,79,62,47,102,22,135,60,
41,1,1,1,1,1,1,1,1,1
);

368
compiler/msgtxt.inc
View File

@ -424,243 +424,245 @@ const msgtxt : array[0..000173,1..240] of char=(
'gest typecast'#000+
'04076_E_Can'#039't take address of a subroutine marked as local'#000+
'04077_E_Can'#039't expor','t subroutine marked as local from a unit'#000+
'04078_E_Type is not automatable: "$1"'#000+
'05000_E_Identifier not found "$1"'#000+
'05001_F_Internal Error in SymTableStack()'#000+
'05002_E_Duplicate identifier "$1"'#000+
'05003_H_Identifier already defined in $1 at line $2'#000+
'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+
'05005_E_Forward declaration not solved "$1"'#000+
'05007_E_Error in type definition'#000+
'05009_E_Forward type not resolved "$1"'#000+
'05010_E_Only static variables can be used in static methods or outside'+
' methods'#000+
'05012_F_record or class type expected'#000+
'05013_E_Inst','ances of classes or objects with an abstract method are '+
'not allowed'#000+
'05012_F_reco','rd or 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+
'05018_E_L','abel not found'#000+
'05017_E_GOTO and LABEL are no','t supported (use switch -Sg)'#000+
'05018_E_Label not found'#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+
'05024_H_Parameter "$1" not us','ed'#000+
'05023_H_Unit "$1" not us','ed in $2'#000+
'05024_H_Parameter "$1" not used'#000+
'05025_N_Local variable "$1" not used'#000+
'05026_H_Value parameter "$1" is assigned but never used'#000+
'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_Pri','vate field "$1.$2" is assigned but never used'#000+
'05029_N_Private f','ield "$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_Unk','nown record field identifier "$1"'#000+
'05034_W_Type "$1" is not aligned correct','ly in 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_H_Found declaration: $1'#000+
'05040_E_Data element ','too large'#000+
'05039_H_Found',' declaration: $1'#000+
'05040_E_Data element too large'#000+
'05042_E_No matching implementation for interface method "$1" found'#000+
'05043_W_Symbol "$1" is deprecated'#000+
'05044_W_Symbol "$1" is not portable'#000+
'05055_W_Symbol "$1" is not implemented'#000+
'05056_E_Can'#039't create unique type from this type'#000+
'05057_','H_Local variable "$1" does not seem to be initialized'#000+
'05056_E_Can'#039't cr','eate unique type from this type'#000+
'05057_H_Local variable "$1" does not seem to be initialized'#000+
'05058_H_Variable "$1" does not seem to be initialized'#000+
'05059_W_Function result variable does not seem to initialized'#000+
'05060_H_Function result variable does not seem to be initialized'#000+
'05061','_W_Variable "$1" read but nowhere assigned'#000+
'05060_H_Function result variable',' does not seem to be initialized'#000+
'05061_W_Variable "$1" read but nowhere assigned'#000+
'06009_E_Parameter list size exceeds 65535 bytes'#000+
'06012_E_File types must be var parameters'#000+
'06013_E_The use of a far pointer isn'#039't allowed there'#000+
'06015_E_EXPORT declared functions can'#039't be called'#000+
'0601','6_W_Possible illegal call of constructor or destructor'#000+
'06015_E_EXPORT d','eclared functions can'#039't be called'#000+
'06016_W_Possible illegal call of constructor or destructor'#000+
'06017_N_Inefficient code'#000+
'06018_W_unreachable code'#000+
'06020_E_Abstract methods can'#039't be called directly'#000+
'06027_DL_Register $1 weight $2 $3'#000+
'06029_DL_Stack frame is omitted'#000+
'06031_E_Object or c','lass methods can'#039't be inline.'#000+
'06029_DL_Stac','k frame is omitted'#000+
'06031_E_Object or class methods can'#039't be inline.'#000+
'06032_E_Procvar calls cannot be inline.'#000+
'06033_E_No code for inline procedure stored'#000+
'06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
'sed, use (set)length instead'#000+
'06037_E_Constructors or destruc','tors can not be called inside a '#039'w'+
'ith'#039' clause'#000+
'sed, use (set)length i','nstead'#000+
'06037_E_Constructors or destructors can not be called inside a '#039'wi'+
'th'#039' clause'#000+
'06038_E_Cannot call message handler methods directly'#000+
'06039_E_Jump in or outside of an exception block'#000+
'06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
'06041_W_Parameters size ex','ceeds limit for certain cpu'#039's'#000+
'06040_E_Control flow statements aren'#039't allowed in a fi','nally bloc'+
'k'#000+
'06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+
'06042_W_Local variable size exceed limit for certain cpu'#039's'#000+
'06043_E_Local variables size exceeds supported limit'#000+
'06044_E_BREAK not allowed'#000+
'06045_E_CONTINUE not allowed'#000+
'06046_F_Unknown compilerproc "$1". Check if',' you use the correct run '+
'06046','_F_Unknown compilerproc "$1". Check if you use the correct run '+
'time library.'#000+
'07000_DL_Starting $1 styled assembler parsing'#000+
'07001_DL_Finished $1 styled assembler parsing'#000+
'07002_E_Non-label pattern contains @'#000+
'07004_E_Error building record offset'#000+
'07005_E_OFFSET used without identif','ier'#000+
'07004_E_Error building record offs','et'#000+
'07005_E_OFFSET used without identifier'#000+
'07006_E_TYPE used without identifier'#000+
'07007_E_Cannot use local variable or parameters here'#000+
'07008_E_need to use OFFSET here'#000+
'07009_E_need to use $ here'#000+
'07010_E_Cannot use multiple relocatable symbols'#000+
'07011_E_Relocatable symbol can only be ','added'#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+
'07017_E_Invalid base ','and index register usage'#000+
'07016_E_Local symbols/labels aren'#039't allow','ed as references'#000+
'07017_E_Invalid base and index register usage'#000+
'07018_W_Possible error in object field handling'#000+
'07019_E_Wrong scale factor specified'#000+
'07020_E_Multiple index register usage'#000+
'07021_E_Invalid operand type'#000+
'07022_E_Invalid string as opcode operand: $1'#000+
'07023_W_@CODE and ','@DATA not supported'#000+
'07022_E_Invalid string as',' opcode operand: $1'#000+
'07023_W_@CODE and @DATA not supported'#000+
'07024_E_Null label references are not allowed'#000+
'07025_E_Divide by zero in asm evaluator'#000+
'07026_E_Illegal expression'#000+
'07027_E_escape sequence ignored: $1'#000+
'07028_E_Invalid symbol reference'#000+
'07029_W_Fwait can cause emulation prob','lems with emu387'#000+
'07028_E_Invalid symbol reference'#000,
'07029_W_Fwait can cause emulation problems with emu387'#000+
'07030_W_$1 without operand translated into $1P'#000+
'07031_W_ENTER instruction is not supported by Linux kernel'#000+
'07032_W_Calling an overload function in assembler'#000+
'07033_E_Unsupported symbol type for operand'#000+
'07034_E_Constant value ','out of bounds'#000+
'07033_E_Unsupported symbol ty','pe for operand'#000+
'07034_E_Constant value out of bounds'#000+
'07035_E_Error converting decimal $1'#000+
'07036_E_Error converting octal $1'#000+
'07037_E_Error converting binary $1'#000+
'07038_E_Error converting hexadecimal $1'#000+
'07039_H_$1 translated to $2'#000+
'07040_W_$1 is associated to an overloaded function'#000+
'07','041_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+
'0704','6_W_Size suffix and destination 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+
'07051_E_Inval','id String expression'#000+
'07050_E_Assembler ','syntax error in constant'#000+
'07051_E_Invalid String expression'#000+
'07052_W_constant with symbol $1 for address which is not on a pointer'#000+
'07053_E_Unrecognized opcode $1'#000+
'07054_E_Invalid or missing opcode'#000+
'07055_E_Invalid combination of prefix and opcode: $1'#000+
'07056_E_Invalid combination of ','override and opcode: $1'#000+
'07055_E_Invalid combination of prefix and opco','de: $1'#000+
'07056_E_Invalid combination of override and opcode: $1'#000+
'07057_E_Too many operands on line'#000+
'07058_W_NEAR ignored'#000+
'07059_W_FAR ignored'#000+
'07060_E_Duplicate local symbol $1'#000+
'07061_E_Undefined local symbol $1'#000+
'07062_E_Unknown label identifier $1'#000+
'07062_E_Unknown label identifier $1',#000+
'07063_E_Invalid register name'#000+
'07064_E','_Invalid floating point register name'#000+
'07064_E_Invalid floating point register name'#000+
'07066_W_Modulo not supported'#000+
'07067_E_Invalid floating point constant $1'#000+
'07068_E_Invalid floating point expression'#000+
'07069_E_Wrong symbol type'#000+
'07070_E_Cannot index a local var or parameter with a register'#000,
'07070_E_Cannot index a l','ocal var or parameter with a register'#000+
'07071_E_Invalid segment override expression'#000+
'07072_W_Identifier $1 supposed external'#000+
'07073_E_Strings not allowed as constants'#000+
'07074_No type of variable specified'#000+
'07075_E_assembler code not returned to text section'#000+
'07076_E_Not a directive or ','local symbol $1'#000+
'07075_E_assembler code not returned to te','xt section'#000+
'07076_E_Not a directive or local symbol $1'#000+
'07077_E_Using a defined name as a local label'#000+
'07078_E_Dollar token is used without an identifier'#000+
'07079_W_32bit constant created for address'#000+
'07080_N_.align is target specific, use .balign or .p2align'#000+
'07081_E_Can'#039't access fiel','ds directly for parameters'#000+
'07080_N_.align is target specific, use .balign',' or .p2align'#000+
'07081_E_Can'#039't access fields directly for parameters'#000+
'07082_E_Can'#039't access fields of objects/classes directly'#000+
'07083_E_No size specified and unable to determine the size of the oper'+
'ands'#000+
'07084_E_Cannot use RESULT in this function'#000+
'07086_W_"$1" without operand translated',' into "$1 %st,%st(1)"'#000+
'0','7086_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+
'07093_W_ALIGN not supported'#000+
'07094_E_Inc and Dec ca','nnot be together'#000+
'07093_W_ALIG','N not supported'#000+
'07094_E_Inc and Dec cannot be together'#000+
'07095_E_Invalid reglist for movem'#000+
'07096_E_Reglist invalid for opcode'#000+
'07097_E_Higher cpu mode required ($1)'#000+
'07098_W_No size specified and unable to determine the size of the oper'+
'ands, using DWORD as default'#000+
'07099_E_Syntax er','ror while trying to parse a shifter operand'#000+
'ands, us','ing DWORD as default'#000+
'07099_E_Syntax error while trying to parse a shifter operand'#000+
'07100_E_Address of packed component is not at a byte boundary'#000+
'07101_W_No size specified and unable to determine the size of the oper'+
'ands, using BYTE as default'#000+
'ands, using BYTE as defaul','t'#000+
'08000_F_Too many assembler files'#000+
'080','01_F_Selected assembler output not supported'#000+
'08001_F_Selected assembler output not supported'#000+
'08002_F_Comp not supported'#000+
'08003_F_Direct not support for binary writers'#000+
'08004_E_Allocating of data is only allowed in bss section'#000+
'08005_F_No binary writer selected'#000+
'08006_E_Asm: Opcode $1 not in ','table'#000+
'08005_F_No binary writer s','elected'#000+
'08006_E_Asm: Opcode $1 not in table'#000+
'08007_E_Asm: $1 invalid combination of opcode and operands'#000+
'08008_E_Asm: 16 Bit references not supported'#000+
'08009_E_Asm: Invalid effective address'#000+
'08010_E_Asm: Immediate or reference expected'#000+
'08011_E_Asm: $1 value exceeds bounds $2'#000+
'08012_','E_Asm: Short jump is out of range $1'#000+
'08011_E_','Asm: $1 value exceeds bounds $2'#000+
'08012_E_Asm: Short jump is out of range $1'#000+
'08013_E_Asm: Undefined label $1'#000+
'08014_E_Asm: Comp type not supported for this target'#000+
'08015_E_Asm: Extended type not supported for this target'#000+
'08016_E_Asm: Duplicate label $1'#000+
'08017_E_Asm: Redefined label ','$1'#000+
'08016_E_Asm: Duplicate ','label $1'#000+
'08017_E_Asm: Redefined label $1'#000+
'08018_E_Asm: First defined here'#000+
'08019_E_Asm: Invalid register $1'#000+
'08020_E_Asm: 16 or 32 Bit references not supported'#000+
'08021_E_Asm: 64 Bit operands not supported'#000+
'09000_W_Source operating system redefined'#000+
'09000_W_Source operating system redefine','d'#000+
'09001_I_Assembling (pipe) $1'#000+
'09002_E','_Can'#039't create assembler file: $1'#000+
'09002_E_Can'#039't create assembler file: $1'#000+
'09003_E_Can'#039't create object file: $1'#000+
'09004_E_Can'#039't create archive file: $1'#000+
'09005_E_Assembler $1 not found, switching to external assembling'#000+
'09006_T_Using assembler: $1'#000+
'09007_E_Error while assembling exitcode',' $1'#000+
'0','9007_E_Error while assembling exitcode $1'#000+
'09008_E_Can'#039't call the assembler, error $1 switching to external a'+
'ssembling'#000+
'09009_I_Assembling $1'#000+
'09010_I_Assembling with smartlinking $1'#000+
'09011_W_Object $1 not found, Linking may fail !'#000+
'09012_W_Library $1 not found, Linking may fail !'#000+
'0','9013_E_Error while linking'#000+
'09012_W_Libr','ary $1 not found, Linking may fail !'#000+
'09013_E_Error while linking'#000+
'09014_E_Can'#039't call the linker, switching to external linking'#000+
'09015_I_Linking $1'#000+
'09016_E_Util $1 not found, switching to external linking'#000+
'09017_T_Using util $1'#000+
'09018_E_Creation of Executables not supported'#000+
'09019_E_','Creation of Dynamic/Shared Libraries not supported'#000+
'09018_E_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 statically linked, switching to smart lin'+
'kin','g'#000+
'09023_T_unit $1 can'#039't be static','ally linked, switching to smart l'+
'inking'#000+
'09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
#000+
'09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
'g'#000+
'09026_E_unit $1 can'#039't be smart or static linked'#000+
'09027_E_unit $1 can'#039't be shared or static linked'#000+
'09028_','D_Calling resource compiler "$1" with "$2" as command line'#000+
'09027_E_unit $1 c','an'#039't be shared or static linked'#000+
'09028_D_Calling resource compiler "$1" with "$2" as command line'#000+
'09128_F_Can'#039't post process executable $1'#000+
'09129_F_Can'#039't open executable $1'#000+
'09130_X_Size of Code: $1 bytes'#000+
'09131_X_Size of initialized data: $1 bytes'#000+
'09132_X_Size of uninitialized dat','a: $1 bytes'#000+
'09131_X_Size of initialized data: $1 b','ytes'#000+
'09132_X_Size of uninitialized data: $1 bytes'#000+
'09133_X_Stack space reserved: $1 bytes'#000+
'09134_X_Stack space committed: $1 bytes'#000+
'10000_T_Unitsearch: $1'#000+
@ -668,98 +670,98 @@ const msgtxt : array[0..000173,1..240] of char=(
'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 to','o short'#000+
'10','005_U_PPU Time: $1'#000+
'10006_U_PPU File too short'#000+
'10007_U_PPU Invalid Header (no PPU at the begin)'#000+
'10008_U_PPU Invalid Version $1'#000+
'10009_U_PPU is compiled for another processor'#000+
'10010_U_PPU is compiled for an other target'#000+
'10011_U_PPU Source: $1'#000+
'10012_U_Writing $1'#000+
'10013_F_Can'#039't Write ','PPU-File'#000+
'1','0012_U_Writing $1'#000+
'10013_F_Can'#039't Write PPU-File'#000+
'10014_F_Error reading PPU-File'#000+
'10015_F_unexpected end of PPU-File'#000+
'10016_F_Invalid PPU-File entry: $1'#000+
'10017_F_PPU Dbx count problem'#000+
'10018_E_Illegal unit name: $1'#000+
'10019_F_Too much units'#000+
'10020_F_Circular unit reference between $1 and ','$2'#000+
'10020_F_C','ircular unit reference between $1 and $2'#000+
'10021_F_Can'#039't compile unit $1, no sources available'#000+
'10022_F_Can'#039't find unit $1'#000+
'10023_W_Unit $1 was not found but $2 exists'#000+
'10024_F_Unit $1 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+
'10025_W_Compiling the system unit requ','ires the -Us switch'#000+
'10026_F_There were $1 errors compiling module, stopping'#000+
'10027_U_Load from $1 ($2) unit $3'#000+
'10028_U_Recompiling $1, checksum changed for $2'#000+
'10029_U_Recompiling $1, source found only'#000+
'10030_U_Recompiling unit, static lib is older than ppufile'#000+
'10031_U_Recompiling',' unit, shared lib is older than ppufile'#000+
'10030_U_Recompiling unit, static lib is ','older than ppufile'#000+
'10031_U_Recompiling unit, shared lib is older than ppufile'#000+
'10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
'10033_U_Recompiling unit, obj is older than asm'#000+
'10034_U_Parsing interface of $1'#000+
'10035_U_Parsing implementation of $1'#000+
'10036_U_Second load fo','r unit $1'#000+
'10035_U_Parsing imple','mentation of $1'#000+
'10036_U_Second load for unit $1'#000+
'10037_U_PPU Check file $1 time $2'#000+
'10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
'10041_U_File $1 is newer than PPU file $2'#000+
'10042_U_Using a unit which was not compiled with correct FPU mode'#000+
'10043_U_Loading interfa','ce units from $1'#000+
'10042_U_Using a unit which was not compiled with co','rrect FPU mode'#000+
'10043_U_Loading interface units from $1'#000+
'10044_U_Loading implementation units from $1'#000+
'10045_U_Interface CRC changed for unit $1'#000+
'10046_U_Implementation CRC changed for unit $1'#000+
'10047_U_Finished compiling unit $1'#000+
'10048_U_Add dependency of $1 to $2'#000+
'10049_U_No reload, ','is caller: $1'#000+
'10048_U_Add depe','ndency of $1 to $2'#000+
'10049_U_No reload, is caller: $1'#000+
'10050_U_No reload, already in second compile: $1'#000+
'10051_U_Flag for reload: $1'#000+
'10052_U_Forced reloading'#000+
'10053_U_Previous state of $1: $2'#000+
'10054_U_Already compiling $1, setting second compile'#000+
'10054_U_Already compiling $1, setting second compile'#000,
'10055_U_Loading unit $1'#000+
'10056_U_Finish','ed loading unit $1'#000+
'10056_U_Finished loading unit $1'#000+
'10057_U_Registering new unit $1'#000+
'10058_U_Re-resolving unit $1'#000+
'10059_U_Skipping re-resolving unit $1, still loading used units'#000+
'11000_O_$1 [options] <inputfile> [options]'#000+
'11001_W_Only one source file supported'#000+
'11002_W_DEF fi','le can be created only for OS/2'#000+
'11001_W_Only on','e 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+
'11006_E_Illegal parameter: $1'#000+
'11007_H_-? writes help pages'#000+
'11008_F_Too many ','config files nested'#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 not supported on DOS platform, reverting to static'+
#000+
'11013_F_too many IF(N)DEFs'#000+
'11014_F_too ma','ny ENDIFs'#000+
'110','13_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 recompiling with -dGDB'#000+
'11018_W_You are using the obsolete switch $1'#000+
'11019_W_You are using the obs','olete switch $1, please use $2'#000+
'11018_W_You are using the obsolete s','witch $1'#000+
'11019_W_You are using the obsolete switch $1, please use $2'#000+
'11020_N_Switching assembler to default source writing assembler'#000+
'11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
'11022_W_"$1" assembler use forced'#000+
'11026_T_Reading options from file $1'#000+
'11027_T','_Reading options from environment $1'#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+
'11030_H_Start of reading config file $1'#000+
'11031_H_End of reading config file $1'#000+
'11032_D_interpreting option "$1"'#000+
'11036_D_interpreting firstpass optio','n "$1"'#000+
'11032_D_interpreting option "$1','"'#000+
'11036_D_interpreting firstpass option "$1"'#000+
'11033_D_interpreting file option "$1"'#000+
'11034_D_Reading config file "$1"'#000+
'11035_D_found source file name "$1"'#000+
'11039_E_Unknown code page'#000+
'11040_F_Config file $1 is a directory'#000+
'11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] ','for $F'+
'11023_Free Pascal Compil','er version $FPCFULLVERSION [$FPCDATE] for $F'+
'PCCPU'#010+
'Copyright (c) 1993-2006 by Florian Klaempfl'#000+
'11024_Free Pascal Compiler version $FPCVERSION'#010+
@ -770,8 +772,8 @@ const msgtxt : array[0..000173,1..240] of char=(
'Supported targets:'#010+
' $OSTARGETS'#010+
#010+
'Supported CPU instruction sets:'#010+
' $INSTRUCT','IONSETS'#010+
'Suppo','rted CPU instruction sets:'#010+
' $INSTRUCTIONSETS'#010+
#010+
'Supported FPU instruction sets:'#010+
' $FPUINSTRUCTIONSETS'#010+
@ -781,163 +783,163 @@ const msgtxt : array[0..000173,1..240] of char=(
#010+
'This program comes under the GNU General Public Licence'#010+
'For more information read COPYING.FPC'#010+
#010+
#010,
'Report bugs,suggestions etc to:'#010+
' ',' bugs@freepascal.org'#000+
' bugs@freepascal.org'#000+
'11025_**0*_put + after a boolean switch option to enable it, - to disa'+
'ble it'#010+
'**1a_the compiler doesn'#039't delete the generated assembler file'#010+
'**2al_list sourcecode lines in assembler file'#010+
'**2an_list node info in ','assembler file'#010+
'**2al_list sourcecode lines in a','ssembler file'#010+
'**2an_list node info in assembler file'#010+
'*L2ap_use pipes instead of creating temporary assembler files'#010+
'**2ar_list register allocation/release info in assembler file'#010+
'**2at_list temp allocation/release info in assembler file'#010+
'**1A<x>_output format:'#010+
'**2Adefault_use defa','ult assembler'#010+
'**1A<','x>_output format:'#010+
'**2Adefault_use default assembler'#010+
'3*2Aas_assemble using GNU AS'#010+
'3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
'3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
'3*2Anasmwin32_Win32 object file using Nasm'#010+
'3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
'3*2Awasm_obj file us','ing Wasm (Watcom)'#010+
'3*2Anasmwdosx_Win32/WDOSX objec','t file using Nasm'#010+
'3*2Awasm_obj file using Wasm (Watcom)'#010+
'3*2Anasmobj_obj file using Nasm'#010+
'3*2Amasm_obj file using Masm (Microsoft)'#010+
'3*2Atasm_obj file using Tasm (Borland)'#010+
'3*2Aelf_elf32 (Linux) using internal writer'#010+
'3*2Acoff_coff (Go32v2) using internal writer'#010+
'3*2Apecoff_pecoff (Wi','n32) using internal writer'#010+
'3*2Acoff_coff (Go32v2) using',' internal writer'#010+
'3*2Apecoff_pecoff (Win32) using internal writer'#010+
'4*2Aas_assemble using GNU AS'#010+
'6*2Aas_Unix o-file using GNU AS'#010+
'6*2Agas_GNU Motorola assembler'#010+
'6*2Amit_MIT Syntax (old GAS)'#010+
'6*2Amot_Standard Motorola assembler'#010+
'A*2Aas_assemble using GNU AS'#010+
'P*2Aas_assemble using GNU A','S'#010+
'A*2Aas_assemble us','ing GNU AS'#010+
'P*2Aas_assemble using GNU AS'#010+
'S*2Aas_assemble using GNU AS'#010+
'**1b_generate browser info'#010+
'**2bl_generate local symbol info'#010+
'**1B_build all modules'#010+
'**1C<x>_code generation options:'#010+
'**2Cc<x>_set default calling convention to <x>'#010+
'**2CD_create also dynamic library (not support','ed)'#010+
'**2CD_cr','eate also dynamic library (not supported)'#010+
'**2Ce_Compilation with emulated floating point opcodes'#010+
'**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
'lues'#010+
'**2Cg_Generate PIC code'#010+
'**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
'**2Ch<n>_<n> bytes heap (between 1023 and 67','107840)'#010+
'**2Ci_IO-checking'#010+
'**2Cn_omit l','inking stage'#010+
'**2Cn_omit linking stage'#010+
'**2Co_check overflow of integer operations'#010+
'**2Cp<x>_select instruction set, see fpc -i for possible values'#010+
'**2Cr_range checking'#010+
'**2CR_verify object method call validity'#010+
'**2Cs<n>_set stack size to <n>'#010+
'**2Cs<n>_set stack s','ize to <n>'#010+
'**2Ct_stack checking'#010+
'**2CX_','create also smartlinked library'#010+
'**2CX_create also smartlinked library'#010+
'**1d<x>_defines the symbol <x>'#010+
'**1D_generate a DEF file'#010+
'**2Dd<x>_set description to <x>'#010+
'**2Dv<x>_set DLL version to <x>'#010+
'*O2Dw_PM application'#010+
'**1e<x>_set path to executable'#010+
'**1e<x>_set path to executabl','e'#010+
'**1E_same as -Cn'#010+
'**1F<x>_set file na','mes and paths:'#010+
'**1F<x>_set file names and paths:'#010+
'**2Fa<x>[,y]_for a program load first units <x> and [y] before uses is'+
' parsed'#010+
'**2Fc<x>_sets input codepage to <x>'#010+
'**2FD<x>_sets the directory where to search for compiler utilities'#010+
'**2Fe<x>_redirect error output to <x>'#010+
'**2FE<','x>_set exe/unit output path to <x>'#010+
'**2Fe<','x>_redirect error output to <x>'#010+
'**2FE<x>_set exe/unit output path to <x>'#010+
'**2Fi<x>_adds <x> to include path'#010+
'**2Fl<x>_adds <x> to library path'#010+
'**2FL<x>_uses <x> as dynamic linker'#010+
'**2Fo<x>_adds <x> to object path'#010+
'**2Fr<x>_load error message file <x>'#010+
'**2Fu<x>_adds <x> to unit path'#010,
'**2Fr<x>_load error message fi','le <x>'#010+
'**2Fu<x>_adds <x> to unit path'#010+
'**2FU<x>_set unit output path to <x>, overrides -FE'#010+
'*g1g_generate debugger information:'#010+
'*g2gc_generate checks for pointers'#010+
'*g2gd_use dbx'#010+
'*g2gg_use gsym'#010+
'*g2gh_use heap trace unit (for memory leak debugging)'#010+
'*g2gl_use line info unit to show m','ore info for backtraces'#010+
'*g2gh_use heap trace unit (for memory leak debuggi','ng)'#010+
'*g2gl_use line info unit to show more info for backtraces'#010+
'*g2gt_trash local variables (to detect uninitialized uses)'#010+
'*g2gv_generates programs traceable with valgrind'#010+
'*g2gw_generate dwarf debugging info'#010+
'**1i_information'#010+
'**2iD_return compiler date'#010+
'**2iV_return compiler versio','n'#010+
'**2iD_return comp','iler date'#010+
'**2iV_return compiler version'#010+
'**2iW_return full compiler version'#010+
'**2iSO_return compiler OS'#010+
'**2iSP_return compiler processor'#010+
'**2iTO_return target OS'#010+
'**2iTP_return target processor'#010+
'**1I<x>_adds <x> to include path'#010+
'**1k<x>_Pass <x> to the linker'#010+
'**1k<x>_Pass <x> t','o the linker'#010+
'**1l_write logo'#010+
'**1M<x>_s','et language mode to <x>'#010+
'**1M<x>_set language mode to <x>'#010+
'**2Mfpc_free pascal dialect (default)'#010+
'**2Mobjfpc_switch some Delphi 2 extensions on'#010+
'**2Mdelphi_tries to be Delphi compatible'#010+
'**2Mtp_tries to be TP/BP 7.0 compatible'#010+
'**2Mgpc_tries to be gpc compatible'#010+
'**2Mmacpas_tries',' to be compatible to the macintosh pascal dialects'#010+
'**2Mgpc_tries',' to be gpc compatible'#010+
'**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010+
'**1n_don'#039't read the default config file'#010+
'**1N<x>_node tree optimizations'#010+
'**2Nu_unroll loops'#010+
'**1o<x>_change the name of the executable produced to <x>'#010+
'**1O<x>_optimizations:'#010+
'**2O-_disable opt','imizations'#010+
'**','1O<x>_optimizations:'#010+
'**2O-_disable optimizations'#010+
'**2O1_level 1 optimizations (quick and debugger friendly)'#010+
'**2O2_level 2 optimizations (-O1 + quick optimizations)'#010+
'**2O3_level 3 optimizations (-O2 + slow optimizations)'#010+
'**2Oa<x>=<y>_set alignment'#010+
'**2Oo[NO]<x>_enable or disable op','timizations, see fpc -i for possibl'+
'e values'#010+
'**2Oa<x>=<y>_set align','ment'#010+
'**2Oo[NO]<x>_enable or disable optimizations, see fpc -i for possible '+
'values'#010+
'**2Op<x>_set target cpu for optimizing, see fpc -i for possible values'+
#010+
'**2Os_generate smaller code'#010+
'**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
'**1pg_generate profile code for gprof (defines FPC_PROFILE)',#010+
'**1R<x>_assembler reading style:'#010+
'**2R','default_use default assembler'#010+
'**2Rdefault_use default assembler'#010+
'3*2Ratt_read AT&T style assembler'#010+
'3*2Rintel_read Intel style assembler'#010+
'6*2RMOT_read motorola style assembler'#010+
'**1S<x>_syntax options:'#010+
'**2S2_same as -Mobjfpc'#010+
'**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
'**2S','a_include assertion code.'#010+
'**2Sc_supports o','perators like C (*=,+=,/= and -=)'#010+
'**2Sa_include assertion code.'#010+
'**2Sd_same as -Mdelphi'#010+
'**2Se<x>_error options. <x> is a combination of the following:'#010+
'**3*_<n> : compiler stops after the <n> errors (default is 1)'#010+
'**3*_w : compiler stops also after warnings'#010+
'**3*_n : compiler stop','s also after notes'#010+
'**3*_w : compiler stops also',' after warnings'#010+
'**3*_n : compiler stops also after notes'#010+
'**3*_h : compiler stops also after hints'#010+
'**2Sg_allow LABEL and GOTO'#010+
'**2Sh_Use ansistrings'#010+
'**2Si_support C++ styled INLINE'#010+
'**2Sk_load fpcylix unit'#010+
'**2SI<x>_set interface style to <x>'#010+
'**3SIcom_COM compatible interface (defa','ult)'#010+
'*','*3SIcom_COM compatible interface (default)'#010+
'**3SIcorba_CORBA compatible interface'#010+
'**2Sm_support macros like C (global)'#010+
'**2So_same as -Mtp'#010+
'**2Sp_same as -Mgpc'#010+
'**2Ss_constructor name must be init (destructor must be done)'#010+
'**2St_allow static keyword in objects'#010+
'**2Sx_enable exceptio','n keywords (default in Delphi/ObjFPC modes)'#010+
'**2St_allow static ke','yword in objects'#010+
'**2Sx_enable exception keywords (default in Delphi/ObjFPC modes)'#010+
'**1s_don'#039't call assembler and linker'#010+
'**2sh_Generate script to link on host'#010+
'**2st_Generate script to link on target'#010+
'**2sr_Skip register allocation phase (use with -alr)'#010+
'**1T<x>_Target operating sys','tem:'#010+
'**2sr_Skip register allocation phase (use w','ith -alr)'#010+
'**1T<x>_Target operating system:'#010+
'3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
'3*2Tfreebsd_FreeBSD'#010+
'3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
'3*2Tlinux_Linux'#010+
'3*2Tnetbsd_NetBSD'#010+
'3*2Tnetware_Novell Netware Module (clib)'#010+
'3*2Tnetwlibc_Novell Netware Module (libc)'#010,
'3*2T','netwlibc_Novell Netware Module (libc)'#010+
'3*2Topenbsd_OpenBSD'#010+
'3*2Tos2_OS/2 / eComStation'#010+
'3*2Tsunos_SunOS/Solaris'#010+
@ -945,67 +947,67 @@ const msgtxt : array[0..000173,1..240] of char=(
'3*2Twdosx_WDOSX DOS extender'#010+
'3*2Twin32_Windows 32 Bit'#010+
'3*2Twince_Windows CE'#010+
'4*2Tlinux_Linux'#010+
'4*2Tlinux_Linu','x'#010+
'6*2Tamiga_Commodore Amiga'#010+
'6*2Tatari_','Atari ST/STe/TT'#010+
'6*2Tatari_Atari ST/STe/TT'#010+
'6*2Tlinux_Linux/m68k'#010+
'6*2Tmacos_Macintosh m68k (not supported)'#010+
'6*2Tpalmos_PalmOS'#010+
'A*2Tlinux_Linux'#010+
'A*2Twince_Windows CE'#010+
'P*2Tamiga_AmigaOS on PowerPC'#010+
'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+
'P*2Tdarwin_Darwin and MacOS X on PowerPC',#010+
'P*2Tlinux_Linux on PowerPC'#010+
'P*2Tmacos_','MacOS (classic) on PowerPC'#010+
'P*2Tmacos_MacOS (classic) on PowerPC'#010+
'P*2Tmorphos_MorphOS'#010+
'S*2Tlinux_Linux'#010+
'**1u<x>_undefines the symbol <x>'#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<x>_Be verbose. <x> is a co','mbination of the following letters:'#010+
'**2Us_compile a syste','m unit'#010+
'**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
'**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+
'**2*_w : Show warnings u : Show unit info'#010+
'**2*_n : Show notes t : Show tried/used files'#010+
'**2*_h : Show h','ints c : Show conditionals'#010+
'**2*_n : Show notes t :',' Show tried/used files'#010+
'**2*_h : Show hints c : Show conditionals'#010+
'**2*_i : Show general info d : Show debug info'#010+
'**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+
'**2*_a : Show everything x : Executable info (Win32 only)',
#010+
'**2*_a : Show everything ',' x : Executable info (Win32 only'+
')'#010+
'**2*_b : Write file names messages with full path'#010+
'**2*_v : write fpcdebug.txt with p : Write tree.log with parse tre'+
'e'#010+
'**2*_ lots of debugging info'#010+
'3*1W<x>_Win32-like target options'#010+
'3*2WB_Create a relocatable image'#010+
'3*2WB<x>_Set Image',' base to Hexadecimal <x> value'#010+
'3*2WB_Create ','a relocatable image'#010+
'3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
'3*2WC_Specify console type application'#010+
'3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
'3*2WF_Specify full-screen type application (OS/2 only)'#010+
'3*2WG_Specify graphic type application'#010+
'3*2WN_Do not generate re','location code (necessary for debugging)'#010+
'3*2WG_Specify graphic typ','e application'#010+
'3*2WN_Do not generate relocation code (necessary for debugging)'#010+
'3*2WR_Generate relocation code'#010+
'P*2WC_Specify console type application (MacOS only)'#010+
'P*2WG_Specify graphic type application (MacOS only)'#010+
'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+
'**1X_e','xecutable options:'#010+
'P*2WT_Specify tool type app','lication (MPW tool, MacOS only)'#010+
'**1X_executable options:'#010+
'**2Xc_pass --shared to the linker (Unix only)'#010+
'**2Xd_don'#039't use standard library search path (needed for cross com'+
'pile)'#010+
'**2Xe_use external linker'#010+
'**2XD_try to link units dynamic (defines FPC_LINK_DYNAMIC)'#010+
'**2Xi_use',' internal linker'#010+
'**2XD_try to link units dynamic ',' (defines FPC_LINK_DYNAMIC)'#010+
'**2Xi_use internal linker'#010+
'**2Xm_generate link map'#010+
'**2XM<x>_set the name of the '#039'main'#039' program routine (default i'+
's '#039'main'#039')'#010+
'**2XP<x>_prepend the binutils names with the prefix <x>'#010+
'**2Xr<x>_set library search path to <x> (needed for cross compile)'#010+
'**2X','s_strip all symbols from executable'#010+
'**2Xr<x>_set library search path ','to <x> (needed for cross compile)'#010+
'**2Xs_strip all symbols from executable'#010+
'**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+
'**2Xt_link with static libraries (-static is passed to linker)'#010+
'**2XX_try to link units smart (defines FPC_LINK_SMART)'#010+
'**2XX_try to link units smart ',' (defines FPC_LINK_SMART)'#010+
'**1*_'#010+
'**','1?_shows this help'#010+
'**1?_shows this help'#010+
'**1h_shows this help without waiting'#000
);

140
compiler/ncal.pas
View File

@ -143,9 +143,8 @@ interface
);
tcallparaflags = set of tcallparaflag;
tcallparanode = class(tbinarynode)
tcallparanode = class(ttertiarynode)
public
named : tnode;
callparaflags : tcallparaflags;
parasym : tparavarsym;
used_by_callnode : boolean;
@ -164,6 +163,10 @@ interface
procedure secondcallparan;virtual;abstract;
function docompare(p: tnode): boolean; override;
procedure printnodetree(var t:text);override;
property value : tnode read left write left;
property nextpara : tnode read right write right;
property parametername : tnode read third write third;
end;
tcallparanodeclass = class of tcallparanode;
@ -191,7 +194,7 @@ implementation
cgbase
;
type
type
tobjectinfoitem = class(tlinkedlistitem)
objinfo : tobjectdef;
constructor create(def : tobjectdef);
@ -221,19 +224,144 @@ type
function translate_vardisp_call(p1,p2 : tnode) : tnode;
const
DISPATCH_METHOD = $1;
DISPATCH_PROPERTYGET = $2;
DISPATCH_PROPERTYPUT = $4;
DISPATCH_PROPERTYPUTREF = $8;
DISPATCH_CONSTRUCT = $4000;
var
statements : tstatementnode;
result_data : ttempcreatenode;
result_data,
params : ttempcreatenode;
paramssize : longint;
calldescnode : tdataconstnode;
para : tcallparanode;
currargpos,
namedparacount,
paracount : longint;
vardatadef,
pvardatadef : tdef;
calldesc : packed record
calltype,argcount,namedargcount : byte;
argtypes : array[0..255] of byte;
end;
names : ansistring;
procedure increase_paramssize;
begin
case para.value.resultdef.typ of
variantdef:
inc(paramssize,para.value.resultdef.size);
else
inc(paramssize,sizeof(voidpointertype.size ));
end;
end;
begin
result:=internalstatements(statements);
fillchar(calldesc,sizeof(calldesc),0);
{ get temp for the result }
result_data:=ctempcreatenode.create(colevarianttype,colevarianttype.size,tt_persistent,true);
addstatement(statements,result_data);
{ build parameters }
{ first, count and check parameters }
para:=tcallparanode(p2);
paracount:=0;
namedparacount:=0;
paramssize:=0;
while assigned(para) do
begin
inc(paracount);
typecheckpass(para.value);
{ first, count parameters }
{ insert some extra casts }
if is_constintnode(para.value) and not(is_64bitint(para.value.resultdef)) then
begin
para.value:=ctypeconvnode.create_internal(para.value,s32inttype);
typecheckpass(para.value);
end
else if para.value.nodetype=stringconstn then
begin
para.value:=ctypeconvnode.create_internal(para.value,cwidestringtype);
typecheckpass(para.value);
end;
if assigned(para.parametername) then
begin
typecheckpass(para.value);
inc(namedparacount);
end;
if para.value.nodetype<>nothingn then
if not is_automatable(para.value.resultdef) then
CGMessagePos1(para.value.fileinfo,type_e_not_automatable,para.value.resultdef.typename);
{ we've to know the parameter size to allocate the temp. space }
increase_paramssize;
para:=tcallparanode(para.nextpara);
end;
calldesc.calltype:=DISPATCH_METHOD;
calldesc.argcount:=paracount;
{ allocate space }
params:=ctempcreatenode.create(voidtype,paramssize,tt_persistent,true);
addstatement(statements,params);
calldescnode:=cdataconstnode.create;
{ build up parameters and description }
para:=tcallparanode(p2);
currargpos:=0;
while assigned(para) do
begin
if assigned(para.parametername) then
begin
if para.parametername.nodetype=stringconstn then
names:=names+tstringconstnode(para.parametername).value_str+#0
else
internalerror(200611041);
end;
{ assign the argument/parameter to the temporary location }
if para.value.nodetype<>nothingn then
addstatement(statements,cassignmentnode.create(
ctypeconvnode.create_internal(cderefnode.create(caddnode.create(addn,
caddrnode.create(ctemprefnode.create(params)),
cordconstnode.create(paramssize,ptrinttype,false)
)),para.value.resultdef),
para.value));
increase_paramssize;
para.value:=nil;
inc(currargpos);
para:=tcallparanode(para.nextpara);
end;
{ old argument list skeleton isn't needed anymore }
p2.free;
calldescnode.append(calldesc,4+calldesc.argcount);
calldescnode.append(pointer(names)^,length(names));
{ actual call }
vardatadef:=trecorddef(search_system_type('TVARDATA').typedef);
pvardatadef:=trecorddef(search_system_type('PVARDATA').typedef);
addstatement(statements,ccallnode.createintern('fpc_dispinvoke_variant',
{ parameters are passed always reverted, i.e. the last comes first }
ccallparanode.create(caddrnode.create(ctemprefnode.create(params)),
ccallparanode.create(calldescnode,
ccallparanode.create(ctypeconvnode.create_internal(p1,vardatadef),
ccallparanode.create(ctypeconvnode.create_internal(caddrnode.create(
ctemprefnode.create(result_data)
),pvardatadef),nil)))))
);
{ clean up }
addstatement(statements,ctempdeletenode.create_normal_temp(result_data));
@ -499,7 +627,7 @@ type
constructor tcallparanode.create(expr,next : tnode);
begin
inherited create(callparan,expr,next);
inherited create(callparan,expr,next,nil);
if not assigned(expr) then
internalerror(200305091);
expr.fileinfo:=fileinfo;

2
compiler/ncon.pas
View File

@ -448,7 +448,7 @@ implementation
procedure tdataconstnode.append(const d;len : aint);
begin
data.seek(data.size);
data.write(data,len);
data.write(d,len);
end;

69
compiler/nflw.pas
View File

@ -162,18 +162,12 @@ interface
end;
tlabelnodeclass = class of tlabelnode;
traisenode = class(tbinarynode)
frametree : tnode;
traisenode = class(ttertiarynode)
constructor create(l,taddr,tframe:tnode);virtual;
constructor ppuload(t:tnodetype;ppufile:tcompilerppufile);override;
procedure ppuwrite(ppufile:tcompilerppufile);override;
procedure buildderefimpl;override;
procedure derefimpl;override;
function dogetcopy : tnode;override;
procedure insertintolist(l : tnodelist);override;
function pass_typecheck:tnode;override;
function pass_1 : tnode;override;
function docompare(p: tnode): boolean; override;
property frametree : tnode read third write third;
end;
traisenodeclass = class of traisenode;
@ -1226,56 +1220,7 @@ implementation
constructor traisenode.create(l,taddr,tframe:tnode);
begin
inherited create(raisen,l,taddr);
frametree:=tframe;
end;
constructor traisenode.ppuload(t:tnodetype;ppufile:tcompilerppufile);
begin
inherited ppuload(t,ppufile);
frametree:=ppuloadnode(ppufile);
end;
procedure traisenode.ppuwrite(ppufile:tcompilerppufile);
begin
inherited ppuwrite(ppufile);
ppuwritenode(ppufile,frametree);
end;
procedure traisenode.buildderefimpl;
begin
inherited buildderefimpl;
if assigned(frametree) then
frametree.buildderefimpl;
end;
procedure traisenode.derefimpl;
begin
inherited derefimpl;
if assigned(frametree) then
frametree.derefimpl;
end;
function traisenode.dogetcopy : tnode;
var
n : traisenode;
begin
n:=traisenode(inherited dogetcopy);
if assigned(frametree) then
n.frametree:=frametree.dogetcopy
else
n.frametree:=nil;
dogetcopy:=n;
end;
procedure traisenode.insertintolist(l : tnodelist);
begin
inherited create(raisen,l,taddr,tframe);
end;
@ -1332,12 +1277,6 @@ implementation
end;
function traisenode.docompare(p: tnode): boolean;
begin
docompare := false;
end;
{*****************************************************************************
TTRYEXCEPTNODE
*****************************************************************************}

123
compiler/node.pas
View File

@ -401,6 +401,24 @@ interface
procedure printnodelist(var t:text);
end;
ptertiarynode = ^ttertiarynode;
ttertiarynode = class(tbinarynode)
third : tnode;
constructor create(_t:tnodetype;l,r,t : tnode);
constructor ppuload(t:tnodetype;ppufile:tcompilerppufile);override;
destructor destroy;override;
procedure ppuwrite(ppufile:tcompilerppufile);override;
procedure buildderefimpl;override;
procedure derefimpl;override;
procedure derefnode;override;
procedure concattolist(l : tlinkedlist);override;
function ischild(p : tnode) : boolean;override;
function docompare(p : tnode) : boolean;override;
function dogetcopy : tnode;override;
procedure insertintolist(l : tnodelist);override;
procedure printnodedata(var t:text);override;
end;
tbinopnode = class(tbinarynode)
constructor create(t:tnodetype;l,r : tnode);virtual;
function docompare(p : tnode) : boolean;override;
@ -1159,7 +1177,110 @@ implementation
{****************************************************************************
TBINOPYNODE
TTERTIARYNODE
****************************************************************************}
constructor ttertiarynode.create(_t:tnodetype;l,r,t : tnode);
begin
inherited create(_t,l,r);
third:=t;
end;
constructor ttertiarynode.ppuload(t:tnodetype;ppufile:tcompilerppufile);
begin
inherited ppuload(t,ppufile);
third:=ppuloadnode(ppufile);
end;
destructor ttertiarynode.destroy;
begin
third.free;
inherited destroy;
end;
procedure ttertiarynode.ppuwrite(ppufile:tcompilerppufile);
begin
inherited ppuwrite(ppufile);
ppuwritenode(ppufile,third);
end;
procedure ttertiarynode.buildderefimpl;
begin
inherited buildderefimpl;
if assigned(third) then
third.buildderefimpl;
end;
procedure ttertiarynode.derefimpl;
begin
inherited derefimpl;
if assigned(third) then
third.derefimpl;
end;
procedure ttertiarynode.derefnode;
begin
inherited derefnode;
if assigned(third) then
third.derefnode;
end;
function ttertiarynode.docompare(p : tnode) : boolean;
begin
docompare:=(inherited docompare(p) and
((third=nil) or third.isequal(ttertiarynode(p).third))
);
end;
function ttertiarynode.dogetcopy : tnode;
var
p : ttertiarynode;
begin
p:=ttertiarynode(inherited dogetcopy);
if assigned(third) then
p.third:=third.dogetcopy
else
p.third:=nil;
result:=p;
end;
procedure ttertiarynode.insertintolist(l : tnodelist);
begin
end;
procedure ttertiarynode.printnodedata(var t:text);
begin
inherited printnodedata(t);
printnode(t,third);
end;
procedure ttertiarynode.concattolist(l : tlinkedlist);
begin
third.parent:=self;
third.concattolist(l);
inherited concattolist(l);
end;
function ttertiarynode.ischild(p : tnode) : boolean;
begin
ischild:=p=third;
end;
{****************************************************************************
TBINOPNODE
****************************************************************************}
constructor tbinopnode.create(t:tnodetype;l,r : tnode);

9
compiler/pexpr.pas
View File

@ -268,8 +268,7 @@ implementation
if token=_COMMA then
begin
{ empty parameter }
p2:=ccallparanode.create(nil,p2);
consume(_COMMA);
p2:=ccallparanode.create(cnothingnode.create,p2);
end
else
begin
@ -281,8 +280,10 @@ implementation
argname:=p1;
p1:=comp_expr(true);
p2:=ccallparanode.create(p1,p2);
tcallparanode(p2).named:=argname;
end;
tcallparanode(p2).parametername:=argname;
end
else
p2:=ccallparanode.create(p1,p2);
found_arg_name:=false;
end;
end

1
rtl/inc/compproc.inc
View File

@ -209,6 +209,7 @@ function fpc_variant_to_interface(const v : variant) : iinterface;compilerproc;
function fpc_interface_to_variant(const i : iinterface) : variant;compilerproc;
procedure fpc_vararray_get(var d : variant;const s : variant;indices : psizeint;len : sizeint);compilerproc;
procedure fpc_vararray_put(var d : variant;const s : variant;indices : psizeint;len : sizeint);compilerproc;
procedure fpc_dispinvoke_variant(dest : pvardata;const source : tvardata; calldesc : pcalldesc;params : pointer);compilerproc;
Procedure fpc_Read_End(var f:Text); compilerproc;
Procedure fpc_ReadLn_End(var f : Text); compilerproc;

7
rtl/inc/variant.inc
View File

@ -143,6 +143,13 @@ function fpc_interface_to_variant(const i : iinterface) : variant;compilerproc;
end;
procedure fpc_dispinvoke_variant(dest : pvardata;const source : tvardata;
calldesc : pcalldesc;params : pointer);
begin
variantmanager.dispinvoke(dest,source,calldesc,params);
end;
{ ---------------------------------------------------------------------
Overloaded operators.
---------------------------------------------------------------------}