summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <paul@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-10-24 15:44:59 +0000
committerpaul <paul@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-10-24 15:44:59 +0000
commit90ad5000cfa4a6f530abaef5a39548644a2b2e70 (patch)
tree40282586967cee757fcc5213d309711698309502
parent145bd16984b31ff09c53c599a65e7a6ec6fd22e9 (diff)
downloadfpc-90ad5000cfa4a6f530abaef5a39548644a2b2e70.tar.gz
complier: continue enumerator implementation:
+ add operator enumerator which give an ability to add enumerator for an existent type (for example to override builtin string enumerator) + add class enumerator support via delphi compatible GetEnumerator method + enumerator class/object template (function MoveNext: Boolean; property Current) + tests git-svn-id: http://svn.freepascal.org/svn/fpc/branches/paul@13942 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat
-rw-r--r--features/compiler/htypechk.pas23
-rw-r--r--features/compiler/msg/errore.msg12
-rw-r--r--features/compiler/msgidx.inc7
-rw-r--r--features/compiler/msgtxt.inc527
-rw-r--r--features/compiler/nutils.pas20
-rw-r--r--features/compiler/pdecsub.pas11
-rw-r--r--features/compiler/pexpr.pas23
-rw-r--r--features/compiler/pp.lpi4
-rw-r--r--features/compiler/pstatmnt.pas146
-rw-r--r--features/compiler/symdef.pas88
-rw-r--r--features/compiler/symsym.pas58
-rw-r--r--features/compiler/symtable.pas42
-rw-r--r--features/compiler/tokens.pas6
-rw-r--r--features/tests/test/tforin2.pp82
-rw-r--r--features/tests/test/tforin3.pp47
15 files changed, 792 insertions, 304 deletions
diff --git a/features/compiler/htypechk.pas b/features/compiler/htypechk.pas
index 1a34cfbc39..1916df98e4 100644
--- a/features/compiler/htypechk.pas
+++ b/features/compiler/htypechk.pas
@@ -108,9 +108,9 @@ interface
(tok:_LTE ;nod:lten;op_overloading_supported:true), { binary overloading supported }
(tok:_SYMDIF ;nod:symdifn;op_overloading_supported:true), { binary overloading supported }
(tok:_STARSTAR;nod:starstarn;op_overloading_supported:true), { binary overloading supported }
- (tok:_OP_AS ;nod:asn;op_overloading_supported:false), { binary overloading NOT supported }
- (tok:_OP_IN ;nod:inn;op_overloading_supported:false), { binary overloading NOT supported }
- (tok:_OP_IS ;nod:isn;op_overloading_supported:false), { binary overloading NOT supported }
+ (tok:_OP_AS ;nod:asn;op_overloading_supported:false), { binary overloading NOT supported }
+ (tok:_OP_IN ;nod:inn;op_overloading_supported:false), { binary overloading NOT supported }
+ (tok:_OP_IS ;nod:isn;op_overloading_supported:false), { binary overloading NOT supported }
(tok:_OP_OR ;nod:orn;op_overloading_supported:true), { binary overloading supported }
(tok:_OP_AND ;nod:andn;op_overloading_supported:true), { binary overloading supported }
(tok:_OP_DIV ;nod:divn;op_overloading_supported:true), { binary overloading supported }
@@ -120,7 +120,7 @@ interface
(tok:_OP_SHR ;nod:shrn;op_overloading_supported:true), { binary overloading supported }
(tok:_OP_XOR ;nod:xorn;op_overloading_supported:true), { binary overloading supported }
(tok:_ASSIGNMENT;nod:assignn;op_overloading_supported:true), { unary overloading supported }
- (tok:_UNEQUAL ;nod:unequaln;op_overloading_supported:false) { binary overloading NOT supported overload = instead }
+ (tok:_UNEQUAL ;nod:unequaln;op_overloading_supported:false) { binary overloading NOT supported overload = instead }
);
{ true, if we are parsing stuff which allows array constructors }
@@ -422,6 +422,21 @@ implementation
(tstringdef(pf.returndef).len=255));
end
else
+ { enumerator is a special case too }
+ if optoken=_OP_ENUMERATOR then
+ begin
+ //eq:=check_that_return_type_is_ok_for_enumerator;
+ result:=
+ { don't allow overloading assigning to custom shortstring
+ types, because we also don't want to differentiate based
+ on different shortstring types (e.g.,
+ "operator :=(const v: variant) res: shorstring" also
+ has to work for assigning a variant to a string[80])
+ }
+ (not is_shortstring(pf.returndef) or
+ (tstringdef(pf.returndef).len=255));
+ end
+ else
begin
for i:=1 to tok2nodes do
if tok2node[i].tok=optoken then
diff --git a/features/compiler/msg/errore.msg b/features/compiler/msg/errore.msg
index 658c72a69f..d1236c4bc8 100644
--- a/features/compiler/msg/errore.msg
+++ b/features/compiler/msg/errore.msg
@@ -1513,7 +1513,7 @@ type_w_zero_to_nil=04090_W_Converting 0 to NIL
#
# Symtable
#
-# 05066 is the last used one
+# 05069 is the last used one
#
% \section{Symbol handling}
% This section lists all the messages that concern the handling of symbols.
@@ -1693,6 +1693,16 @@ sym_w_deprecated_symbol_with_msg=05066_W_Symbol "$1" is deprecated: "$2"
% declared as \var{deprecated} is used. Deprecated symbols may no longer
% be available in newer versions of the unit / library. Use of this symbol
% should be avoided as much as possible.
+sym_e_no_enumerator=05067_E_Can not find an enumerator for the type "$1"
+% This means that compiler can not find an apropriate enumerator to use in the for-in loop.
+% To create an enumerator you need to defind an operator enumerator or add a public or published
+% GetEnumerator method to the class or object definition.
+sym_e_no_enumerator_move=05068_E_Can not find a "MoveNext" method in enumerator "$1"
+% This means that compiler can not find a public MoveNext method with the Boolean return type in
+% the enumerator class or object definition.
+sym_e_no_enumerator_current=05069_E_Can not find a "Current" property in enumerator "$1"
+% This means that compiler can not find a public Current property in the enumerator class or object
+% definition.
% \end{description}
#
# Codegenerator
diff --git a/features/compiler/msgidx.inc b/features/compiler/msgidx.inc
index 8e6169336d..2cec0b7e71 100644
--- a/features/compiler/msgidx.inc
+++ b/features/compiler/msgidx.inc
@@ -479,6 +479,9 @@ const
sym_w_forward_not_resolved=05064;
sym_w_library_symbol=05065;
sym_w_deprecated_symbol_with_msg=05066;
+ sym_e_no_enumerator=05067;
+ sym_e_no_enumerator_move=05068;
+ sym_e_no_enumerator_current=05069;
cg_e_parasize_too_big=06009;
cg_e_file_must_call_by_reference=06012;
cg_e_cant_use_far_pointer_there=06013;
@@ -800,9 +803,9 @@ const
option_info=11024;
option_help_pages=11025;
- MsgTxtSize = 52087;
+ MsgTxtSize = 52261;
MsgIdxMax : array[1..20] of longint=(
- 24,87,258,91,67,50,108,22,202,62,
+ 24,87,258,91,70,50,108,22,202,62,
48,20,1,1,1,1,1,1,1,1
);
diff --git a/features/compiler/msgtxt.inc b/features/compiler/msgtxt.inc
index 443b41bd5b..1ee104f4ca 100644
--- a/features/compiler/msgtxt.inc
+++ b/features/compiler/msgtxt.inc
@@ -547,380 +547,383 @@ const msgtxt : array[0..000217,1..240] of char=(
'05064_W_Forward declaration "$1" not resolved, assumed external'#000+
'05065_W_Symbol "$1" is belongs to a library'#000+
'05066_W_Symbol "$1" is deprecated: "$2"'#000+
+ '05067_E_Can not find an enumerator for the type "$','1"'#000+
+ '05068_E_Can not find a "MoveNext" method in enumerator "$1"'#000+
+ '05069_E_Can not find a "Current" property in enumerator "$1"'#000+
'06009_E_Parameter list size exceeds 65535 bytes'#000+
- '06','012_E_File types must be var parameters'#000+
- '06013_E_The use of a far pointer isn'#039't allowed there'#000+
+ '06012_E_File types must be var parameters'#000+
+ '06013_E_The use of a far p','ointer isn'#039't allowed there'#000+
'06015_E_EXPORT declared functions can'#039't be called'#000+
'06016_W_Possible illegal call of constructor or destructor'#000+
'06017_N_Inefficient code'#000+
- '06018_W_unrea','chable 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+
+ '0602','7_DL_Register $1 weight $2 $3'#000+
'06029_DL_Stack frame is omitted'#000+
'06031_E_Object or class methods can'#039't be inline.'#000+
'06032_E_Procvar calls cannot be inline.'#000+
- '06033_E_No code for inl','ine procedure stored'#000+
- '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
- 'sed, use (set)length instead'#000+
+ '06033_E_No code for inline procedure stored'#000+
+ '06035_E_Element zero of an ansi/wide- or long','string can'#039't be acc'+
+ 'essed, use (set)length instead'#000+
'06037_E_Constructors or destructors can not be called inside a '#039'wi'+
'th'#039' clause'#000+
- '06038_E_Cannot call message handler methods dir','ectly'#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+
+ '06040_E_Con','trol flow statements aren'#039't allowed in a finally 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+
- '0604','3_E_Local variables size exceeds supported limit'#000+
- '06044_E_BREAK not allowed'#000+
+ '06043_E_Local variables size exceeds supported limit'#000+
+ '06044_E_BREAK not',' allowed'#000+
'06045_E_CONTINUE not allowed'#000+
'06046_F_Unknown compilerproc "$1". Check if you use the correct run ti'+
'me library.'#000+
- '06047_F_Cannot find system type "$1". Check if you use',' the correct r'+
- 'un time library.'#000+
- '06048_H_Inherited call to abstract method ignored'#000+
+ '06047_F_Cannot find system type "$1". Check if you use the correct run'+
+ ' time library.'#000+
+ '06048_H_Inherited call to abstract ','method ignored'#000+
'06049_E_Goto label "$1" not defined or optimized away'#000+
'07000_DL_Starting $1 styled assembler parsing'#000+
'07001_DL_Finished $1 styled assembler parsing'#000+
- '07002_E_Non-l','abel pattern contains @'#000+
+ '07002_E_Non-label pattern contains @'#000+
'07004_E_Error building record offset'#000+
- '07005_E_OFFSET used without identifier'#000+
+ '07005','_E_OFFSET used without identifier'#000+
'07006_E_TYPE used without identifier'#000+
'07007_E_Cannot use local variable or parameters here'#000+
'07008_E_need to use OFFSET here'#000+
- '07009_E_need to us','e $ 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+
+ '07011_E_R','elocatable 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+
+ '07015_E_You can not reach $1 from that code'#000+
+ '07016_E_Local symbols/labels aren'#039't allowed as re','ferences'#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 us','age'#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_Null label references are not allowed'#000+
'07025_E_Divide by zero in asm evaluator'#000+
'07026_E_Illegal expression'#000+
- '07027_E_esc','ape sequence ignored: $1'#000+
+ '07027_E_escape sequence ignored: $1'#000+
'07028_E_Invalid symbol reference'#000+
- '07029_W_Fwait can cause emulation problems with emu387'#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 ov','erload function in assembler'#000+
- '07033_E_Unsupported symbol type for operand'#000+
+ '07032_W_Calling an overload function in assembler'#000+
+ '07033_E_Unsupported symbol type for o','perand'#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+
+ '07038_E_Error converting hexadecimal $1'#000+
'07039_H_$1 translated to $2'#000+
- '07040_W_$1 is associated to an overloaded function'#000+
+ '07040_W_$1 is associate','d 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 cod','e'#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+
+ '07045_E_Size suffix and destination or',' source size do not match'#000+
'07046_W_Size suffix and destination or source size do not match'#000+
'07047_E_Assembler syntax error'#000+
'07048_E_Invalid combination of opcode and operands'#000+
- '07','049_E_Assembler syntax error in operand'#000+
- '07050_E_Assembler syntax error in constant'#000+
+ '07049_E_Assembler syntax error in operand'#000+
+ '07050_E_Assembler syntax e','rror 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 mis','sing opcode'#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+
+ '0','7056_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_Und','efined 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+
'07066_W_Modulo not supported'#000+
'07067_E_Invalid floating point constant $1'#000+
- '07068_E_Invalid floating point exp','ression'#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 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 va','riable specified'#000+
- '07075_E_assembler code not returned to text section'#000+
+ '07074_No type of variable specified'#000+
+ '07075_E_assembler code not returned to text secti','on'#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+
+ '07079_W_32bit constant created for address'#000+
+ '07080_N_.align is target specific, use .balign or .p2a','lign'#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 op'+
- 'erands'#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+
+ '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+
+ '07089_E_Char < not allowed here'#000+
'07090_E_Char > not allowed here'#000+
- '07093_W_ALIGN not supported'#000+
+ '07093_W_ALIGN not su','pported'#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 spec','ified and unable to determine the size of the op'+
- 'erands, using DWORD as default'#000+
+ '07098_W_No size specified and unable to determine the size of the oper'+
+ 'ands, using DWOR','D 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 t','o determine the size of the op'+
- 'erands, using BYTE as default'#000+
- '07102_W_Use of +offset(%ebp) for parameters invalid here'#000+
+ '07101_W_No size specified and unable to determine the size of the oper'+
+ 'ands, using BYTE as default'#000+
+ '07102_','W_Use of +offset(%ebp) for parameters invalid here'#000+
'07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+
#000+
- '07104_W_Use of -offset(%ebp) is not recommended for ','local variable a'+
- 'ccess'#000+
- '07105_W_Use of -offset(%esp), access may cause a crash or value may be'+
- ' lost'#000+
+ '07104_W_Use of -offset(%ebp) is not recommended for local variable acc'+
+ 'ess'#000+
+ '07105_W_Use of -offset(%esp), access may cau','se a crash or value may '+
+ 'be lost'#000+
'07106_E_VMTOffset must be used in combination with a virtual method, a'+
'nd "$1" is not virtual'#000+
- '07107_E_Generating PIC, but reference is not PIC-','safe'#000+
+ '07107_E_Generating PIC, but reference is not PIC-safe'#000+
'08000_F_Too many assembler files'#000+
- '08001_F_Selected assembler output not supported'#000+
+ '08001_F_Selected assembler o','utput 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 write','r selected'#000+
+ '08005_F_No binary writer selected'#000+
'08006_E_Asm: Opcode $1 not in table'#000+
- '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
+ '08007_E_Asm: $1 inv','alid 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: Duplica','te label $1'#000+
+ '08016_E_Asm: Duplicate label $1'#000+
'08017_E_Asm: Redefined label $1'#000+
- '08018_E_Asm: First defined here'#000+
+ '08018_E_Asm: First def','ined 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 redef','ined'#000+
+ '09000_W_Source operating system redefined'#000+
'09001_I_Assembling (pipe) $1'#000+
- '09002_E_Can'#039't create assembler file: $1'#000+
+ '09002_E_Can'#039't create assembler f','ile: $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+
+ '09006_T_Using assembler: $1'#000+
'09007_E_Error while assembling exitcode $1'#000+
- '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
- 'ssembling'#000+
+ '09008_E_Can'#039't call th','e assembler, error $1 switching to external'+
+ ' assembling'#000+
'09009_I_Assembling $1'#000+
'09010_I_Assembling with smartlinking $1'#000+
'09011_W_Object $1 not found, Linking may fail !'#000+
- '09012_W_L','ibrary $1 not found, Linking may fail !'#000+
- '09013_E_Error while linking'#000+
+ '09012_W_Library $1 not found, Linking may fail !'#000+
+ '09013_E_Error while linkin','g'#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_Creat','ion 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/Share','d Libraries not supported'#000+
'09020_I_Closing script $1'#000+
'09021_E_resource compiler "$1" not found, switching to external mode'#000+
'09022_I_Compiling resource $1'#000+
- '09023_T_unit $1 can'#039't b','e statically linked, switching to smart l'+
- 'inking'#000+
- '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
- #000+
+ '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+
+ 'king'#000+
+ '09024_T_unit $1 ca','n'#039't be smart linked, switching to static linki'+
+ 'ng'#000+
'09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
'g'#000+
'09026_E_unit $1 can'#039't be smart or static linked'#000+
- '09027_E_u','nit $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 can'#039't be shared or static linked'#000+
+ '09028_D_Calling resource c','ompiler "$1" with "$2" as command line'#000+
'09029_E_Error while compiling resources'#000+
'09030_E_Can'#039't call the resource compiler "$1", switching to extern'+
'al mode'#000+
- '09031_E_Can'#039't open re','source file "$1"'#000+
+ '09031_E_Can'#039't open resource file "$1"'#000+
'09032_E_Can'#039't write resource file "$1"'#000+
- '09128_F_Can'#039't post process executable $1'#000+
+ '09128_F_Ca','n'#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 data: ','$1 bytes'#000+
+ '09132_X_Size of uninitialized data: $1 bytes'#000+
'09133_X_Stack space reserved: $1 bytes'#000+
- '09134_X_Stack space committed: $1 bytes'#000+
+ '09134_X_Stack spac','e committed: $1 bytes'#000+
'09200_F_Executable image size is too big for $1 target.'#000+
'09201_W_Object file "$1" contains 32-bit absolute relocation to symbol'+
' "$2".'#000+
- '10000_T_Unitsearch:',' $1'#000+
+ '10000_T_Unitsearch: $1'#000+
'10001_T_PPU Loading $1'#000+
'10002_U_PPU Name: $1'#000+
- '10003_U_PPU Flags: $1'#000+
+ '10003_U_PPU Flags:',' $1'#000+
'10004_U_PPU Crc: $1'#000+
'10005_U_PPU Time: $1'#000+
'10006_U_PPU File too short'#000+
'10007_U_PPU Invalid Header (no PPU at the begin)'#000+
'10008_U_PPU Invalid Version $1'#000+
- '10009_U_PPU is compile','d for another processor'#000+
- '10010_U_PPU is compiled for an other target'#000+
+ '10009_U_PPU is compiled for another processor'#000+
+ '10010_U_PPU is compiled for an other targe','t'#000+
'10011_U_PPU Source: $1'#000+
'10012_U_Writing $1'#000+
'10013_F_Can'#039't Write PPU-File'#000+
'10014_F_Error reading PPU-File'#000+
'10015_F_unexpected end of PPU-File'#000+
- '10016_F_Invalid PPU-File entry: $1'#000,
+ '10016_F_Invalid PPU-File entry: $1'#000+
'10017_F_PPU Dbx count problem'#000+
'10018_E_Illegal unit name: $1'#000+
- '10019_F_Too much units'#000+
+ '10019_','F_Too much units'#000+
'10020_F_Circular unit reference between $1 and $2'#000+
'10021_F_Can'#039't compile unit $1, no sources available'#000+
'10022_F_Can'#039't find unit $1 used by $2'#000+
- '10023_W_Unit $1 w','as not found but $2 exists'#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+
+ '1','0025_W_Compiling the system unit requires the -Us switch'#000+
'10026_F_There were $1 errors compiling module, stopping'#000+
'10027_U_Load from $1 ($2) unit $3'#000+
- '10028_U_Recompiling $1, che','cksum changed for $2'#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+
+ '100','30_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 ppufil','e'#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+
+ '10034_U_Parsing ','interface of $1'#000+
'10035_U_Parsing implementation of $1'#000+
'10036_U_Second load for unit $1'#000+
'10037_U_PPU Check file $1 time $2'#000+
- '10040_W_Can'#039't recompile unit $1, but found modifed incl','ude files'+
- #000+
+ '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
'10041_U_File $1 is newer than PPU file $2'#000+
- '10042_U_Trying to use a unit which was compiled with a different FPU m'+
- 'ode'#000+
+ '10042_U_Trying',' to use a unit which was compiled with a different 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+
+ '10045_U_Interface CRC changed for unit $1'#000+
'10046_U_Implementation CRC changed for unit $1'#000+
- '10047_U_Finished compiling unit $1'#000+
+ '10047_','U_Finished compiling unit $1'#000+
'10048_U_Add dependency of $1 to $2'#000+
'10049_U_No reload, is caller: $1'#000+
'10050_U_No reload, already in second compile: $1'#000+
- '10051_U_Flag for reload: $1'#000,
+ '10051_U_Flag for reload: $1'#000+
'10052_U_Forced reloading'#000+
'10053_U_Previous state of $1: $2'#000+
- '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_Finished loading unit $1'#000+
'10057_U_Registering new unit $1'#000+
'10058_U_Re-resolving unit $1'#000+
- '10059_U_Ski','pping re-resolving unit $1, still loading used units'#000+
- '10060_U_Unloading resource unit $1 (not needed)'#000+
+ '10059_U_Skipping re-resolving unit $1, still loading used units'#000+
+ '10060_U_Unloa','ding resource unit $1 (not needed)'#000+
'10061_E_Unit $1 was compiled using a different whole program optimizat'+
- 'ion feedback input ($2, $3); recompile it without wpo or use the same',
- ' wpo feedback input file for this compilation invocation'#000+
- '11000_O_$1 [options] <inputfile> [options]'#000+
+ 'ion feedback input ($2, $3); recompile it without wpo or use the same '+
+ 'wpo feedback input file for this compilation invocation'#000+
+ '11000_O_$','1 [options] <inputfile> [options]'#000+
'11001_W_Only one source file supported, changing source file to compil'+
'e from "$1" into "$2"'#000+
'11002_W_DEF file can be created only for OS/2'#000+
- '11','003_E_nested response files are not supported'#000+
- '11004_F_No source file name in command line'#000+
+ '11003_E_nested response files are not supported'#000+
+ '11004_F_No source fi','le name in command line'#000+
'11005_N_No option inside $1 config file'#000+
'11006_E_Illegal parameter: $1'#000+
'11007_H_-? writes help pages'#000+
'11008_F_Too many config files nested'#000+
- '11009_F_Unable',' to open file $1'#000+
+ '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+
+ '11011_W_T','arget is already set to: $1'#000+
'11012_W_Shared libs not supported on DOS platform, reverting to static'+
#000+
'11013_F_In options file $1 at line $2 too many \var{\#IF(N)DEFs} encou'+
- 'ntere','d'#000+
- '11014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} encoun'+
- 'tered'#000+
+ 'ntered'#000+
+ '11014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} ','enco'+
+ 'untered'#000+
'11015_F_Open conditional at the end of the options file'#000+
'11016_W_Debug information generation is not supported by this executab'+
'le'#000+
- '11017_H_Try recompiling with -dGD','B'#000+
+ '11017_H_Try recompiling with -dGDB'#000+
'11018_W_You are using the obsolete switch $1'#000+
- '11019_W_You are using the obsolete switch $1, please use $2'#000+
+ '11019_W_You are usi','ng 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+
- '11','022_W_"$1" assembler use forced'#000+
- '11026_T_Reading options from file $1'#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_O_*** press enter ***'#000+
'11030_H_Start of reading config file $1'#000+
- '11031_H_End 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 option "$1"'#000+
+ '11036_D_interpreting firs','tpass 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+
- '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
- 'ugging disabled'#000+
+ '11040_F_Config file $1 is a directory'#000+
+ '11041_W_Assembler output selected "$1" cannot gener','ate debug info, d'+
+ 'ebugging disabled'#000+
'11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+
'11043_F_In options file $1 at line $2 \var{\#ELSE} directive without \'+
- 'v','ar{\#IF(N)DEF} found'#000+
- '11044_F_Option "$1" is not, or not yet, supported on the current targe'+
- 't platform'#000+
+ 'var{\#IF(N)DEF} found'#000+
+ '11044_F_Option "$1" is not, or not yet, suppo','rted on the current tar'+
+ 'get platform'#000+
'11045_F_The feature "$1" is not, or not yet, supported on the selected'+
' target platform'#000+
- '11046_N_DWARF debug information cannot be used with',' smart linking on'+
- ' this target, switching to static linking'#000+
- '11047_W_Option "$1" is ignored for the current target platform.'#000+
+ '11046_N_DWARF debug information cannot be used with smart linking on t'+
+ 'his target, switching to static linking'#000+
+ '11047_W','_Option "$1" is ignored for the current target platform.'#000+
'12000_F_Cannot open whole program optimization feedback file "$1"'#000+
- '12001_D_Processing whole program optimization infor','mation in wpo fee'+
- 'dback file "$1"'#000+
- '12002_D_Finished processing the whole program optimization information'+
- ' in wpo feedback file "$1"'#000+
+ '12001_D_Processing whole program optimization information in wpo feedb'+
+ 'ack file "$1"'#000+
+ '12002_D_Finished processing the w','hole program optimization informati'+
+ 'on in wpo feedback file "$1"'#000+
'12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+
'ck file'#000+
- '12004_W_No handler registered fo','r whole program optimization section'+
- ' "$2" at line $1 of wpo feedback file, ignoring'#000+
+ '12004_W_No handler registered for whole program optimization section "'+
+ '$2" at line $1 of wpo feedba','ck file, ignoring'#000+
'12005_D_Found whole program optimization section "$1" with information'+
' about "$2"'#000+
'12006_F_The selected whole program optimizations require a previously '+
- 'gene','rated feedback file (use -Fw to specify)'#000+
- '12007_E_No collected information necessary to perform "$1" whole progr'+
- 'am optimization found'#000+
+ 'generated feedback file (use -Fw to specify)'#000+
+ '12007_E_No collected info','rmation necessary to perform "$1" whole pro'+
+ 'gram optimization found'#000+
'12008_F_Specify a whole program optimization feedback file to store th'+
'e generated info in (using -FW)'#000+
- '12009','_E_Not generating any whole program optimization information, y'+
- 'et a feedback file was specified (using -FW)'#000+
+ '12009_E_Not generating any whole program optimization information, yet'+
+ ' ','a feedback file was specified (using -FW)'#000+
'12010_E_Not performing any whole program optimizations, yet an input f'+
'eedback file was specified (using -Fw)'#000+
- '12011_D_Skipping whole ','program optimization section "$1", because no'+
- 't needed by the requested optimizations'#000+
+ '12011_D_Skipping whole program optimization section "$1", because not '+
+ 'needed by the reque','sted optimizations'#000+
'12012_W_Overriding previously read information for "$1" from feedback '+
'input file using information in section "$2"'#000+
- '12013_E_Cannot extract symbol liveness i','nformation from program when'+
- ' stripping symbols, use -Xs-'#000+
- '12014_E_Cannot extract symbol liveness information from program when w'+
- 'hen not linking'#000+
+ '12013_E_Cannot extract symbol liveness information from program when s'+
+ 'tripping symbols, use -Xs-'#000+
+ '12014_E_C','annot extract symbol liveness information from program when'+
+ ' when not linking'#000+
'12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+
'n from linked program'#000+
- '12016','_E_Error during reading symbol liveness information produced by'+
- ' "$1"'#000+
+ '12016_E_Error during reading symbol liveness information produced by "'+
+ '$','1"'#000+
'12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+
'ion from linked program'#000+
'12018_E_Collection of symbol liveness information can only help when u'+
- 'sing sm','art linking, use -CX -XX'#000+
- '12019_E_Cannot create specified whole program optimisation feedback fi'+
- 'le "$1"'#000+
+ 'sing smart linking, use -CX -XX'#000+
+ '12019_E_Cannot create specified whole pro','gram optimisation feedback '+
+ 'file "$1"'#000+
'11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
'CPU'#010+
'Copyright (c) 1993-2009 by Florian Klaempfl'#000+
- '11024_Free Pascal C','ompiler version $FPCVERSION'#010+
+ '11024_Free Pascal Compiler version $FPCVERSION'#010+
#010+
'Compiler Date : $FPCDATE'#010+
- 'Compiler CPU Target: $FPCCPU'#010+
+ 'Compile','r CPU Target: $FPCCPU'#010+
#010+
'Supported targets:'#010+
' $OSTARGETS'#010+
@@ -931,11 +934,11 @@ const msgtxt : array[0..000217,1..240] of char=(
'Supported FPU instruction sets:'#010+
' $FPUINSTRUCTIONSETS'#010+
#010+
- 'Supported A','BI targets:'#010+
+ 'Supported ABI targets:'#010+
' $ABITARGETS'#010+
#010+
'Supported Optimizations:'#010+
- ' $OPTIMIZATIONS'#010+
+ ' $OPTIMIZATIO','NS'#010+
#010+
'Supported Whole Program Optimizations:'#010+
' All'#010+
@@ -944,201 +947,202 @@ const msgtxt : array[0..000217,1..240] of char=(
'Supported Microcontroller types:'#010+
' $CONTROLLERTYPES'#010+
#010+
- 'This program comes under the GNU General Public Lice','nce'#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+
+ 'Report bugs, suggestion','s, etc. to:'#010+
' http://bugs.freepascal.org'#010+
'or'#010+
' 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+
+ '**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+
'*L2ap_Use pipes instead of creating temporary assembler files'#010+
- '**2ar_List register allocation/r','elease info in assembler file'#010+
- '**2at_List temp allocation/release info in assembler file'#010+
+ '**2ar_List register allocation/release info in assembler file'#010+
+ '**2at_List temp allocation/release i','nfo in assembler file'#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 (Linu','x) 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*2A','nasmwdosx_Win32/WDOSX object 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*2Atasm_Obj file using Tasm (Borland)'#010+
'3*2Aelf_ELF (Linux) using internal writer'#010+
- '3*2Acoff_COFF (Go32v2) using internal writer'#010+
+ '3*2','Acoff_COFF (Go32v2) using internal writer'#010+
'3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
'4*2Aas_Assemble using GNU AS'#010+
'6*2Aas_Unix o-file using GNU AS'#010+
- '6*2Agas_GNU Motorola a','ssembler'#010+
+ '6*2Agas_GNU Motorola assembler'#010+
'6*2Amit_MIT Syntax (old GAS)'#010+
- '6*2Amot_Standard Motorola assembler'#010+
+ '6*2Amot_Standard Motorola as','sembler'#010+
'A*2Aas_Assemble using 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 modu','les'#010+
+ '**1B_Build all modules'#010+
'**1C<x>_Code generation options:'#010+
- '**2Ca<x>_Select ABI, see fpc -i for possible values'#010+
+ '**2Ca<x>_Select ABI, see fpc ','-i for possible values'#010+
'**2Cb_Generate big-endian code'#010+
'**2Cc<x>_Set default calling convention to <x>'#010+
'**2CD_Create 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+
+ '**2Ce_Compilation with emulated floating point opcodes'#010+
+ '**2Cf<x>_Select fpu instruction se','t to use, see fpc -i for possible '+
+ 'values'#010+
'**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
'**2Cg_Generate PIC code'#010+
- '**2Ch<n>_<n> bytes heap (between 1023 an','d 67107840)'#010+
+ '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
'**2Ci_IO-checking'#010+
'**2Cn_Omit linking stage'#010+
- '**2Co_Check overflow of integer operations'#010+
+ '**2Co_Check',' overflow of integer operations'#010+
'**2CO_Check for possible overflow of integer operations'#010+
'**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+
- '**2CP<x>=<y>_ packing ','settings'#010+
- '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
- 'and 8'#010+
+ '**2CP<x>=<y>_ packing settings'#010+
+ '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or ','NORMAL, 2, '+
+ '4 and 8'#010+
'**2Cr_Range checking'#010+
'**2CR_Verify object method call validity'#010+
'**2Cs<n>_Set stack checking size to <n>'#010+
'**2Ct_Stack checking (for testing only, see manual)'#010+
- '*','*2CX_Create also smartlinked library'#010+
- '**1d<x>_Defines the symbol <x>'#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_Same as -Cn'#010+
- '**1fPIC_Same a','s -Cg'#010+
+ '**1fPIC_Same as -Cg'#010+
'**1F<x>_Set file names and paths:'#010+
- '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
- 'sed'#010+
+ '**2Fa<x>[,y]_(for a progra','m) load units <x> and [y] before uses is p'+
+ 'arsed'#010+
'**2Fc<x>_Set input codepage to <x>'#010+
'**2FC<x>_Set RC compiler binary name to <x>'#010+
- '**2Fd_Disable the compiler'#039's internal directory',' cache'#010+
- '**2FD<x>_Set the directory where to search for compiler utilities'#010+
+ '**2Fd_Disable the compiler'#039's internal directory cache'#010+
+ '**2FD<x>_Set the directory where to search for compiler uti','lities'#010+
'**2Fe<x>_Redirect error output to <x>'#010+
'**2Ff<x>_Add <x> to framework path (Darwin only)'#010+
'**2FE<x>_Set exe/unit output path to <x>'#010+
'**2Fi<x>_Add <x> to include path'#010+
- '**2Fl<','x>_Add <x> to library path'#010+
+ '**2Fl<x>_Add <x> to library path'#010+
'**2FL<x>_Use <x> as dynamic linker'#010+
- '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+
- 'r'#010+
+ '**2F','m<x>_Load unicode conversion table from <x>.txt in the compiler '+
+ 'dir'#010+
'**2Fo<x>_Add <x> to object path'#010+
'**2Fr<x>_Load error message file <x>'#010+
- '**2FR<x>_Set resource (.res) linker t','o <x>'#010+
+ '**2FR<x>_Set resource (.res) linker to <x>'#010+
'**2Fu<x>_Add <x> to unit path'#010+
- '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
+ '**2FU<x>_Set unit output path ','to <x>, overrides -FE'#010+
'**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
'**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
'om <x>'#010+
- '*g1g_Ge','nerate debug information (default format for target)'#010+
- '*g2gc_Generate checks for pointers'#010+
+ '*g1g_Generate debug information (default format for target)'#010+
+ '*g2gc_Generat','e checks for pointers'#010+
'*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
'*g2gl_Use line info unit (show more info with backtraces)'#010+
- '*g2go<x>_Set debug information',' options'#010+
- '*g3godwarfsets_ Enable DWARF set debug information (breaks gdb < 6.5)'#010+
+ '*g2go<x>_Set debug information options'#010+
+ '*g3godwarfsets_ Enable DWARF set debug information (break','s gdb < 6.5'+
+ ')'#010+
'*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
#010+
'*g2gp_Preserve case in stabs symbol names'#010+
'*g2gs_Generate Stabs debug information'#010+
- '*g2gt_Tra','sh local variables (to detect uninitialized uses)'#010+
- '*g2gv_Generates programs traceable with Valgrind'#010+
+ '*g2gt_Trash local variables (to detect uninitialized uses)'#010+
+ '*g2gv_Generates ','programs traceable with Valgrind'#010+
'*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
'*g2gw2_Generate DWARFv2 debug information'#010+
'*g2gw3_Generate DWARFv3 debug information'#010+
- '*','*1i_Information'#010+
+ '**1i_Information'#010+
'**2iD_Return compiler date'#010+
- '**2iV_Return short compiler version'#010+
+ '**2iV_Return short comp','iler version'#010+
'**2iW_Return full compiler version'#010+
'**2iSO_Return compiler OS'#010+
'**2iSP_Return compiler host processor'#010+
'**2iTO_Return target OS'#010+
'**2iTP_Return target processor'#010+
- '**1I<x>','_Add <x> to include path'#010+
+ '**1I<x>_Add <x> to include path'#010+
'**1k<x>_Pass <x> to the linker'#010+
- '**1l_Write logo'#010+
+ '**1l_Write',' logo'#010+
'**1M<x>_Set language mode to <x>'#010+
'**2Mfpc_Free Pascal dialect (default)'#010+
'**2Mobjfpc_FPC mode with Object Pascal support'#010+
'**2Mdelphi_Delphi 7 compatibility mode'#010+
- '**2Mtp_TP/B','P 7.0 compatibility mode'#010+
- '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
+ '**2Mtp_TP/BP 7.0 compatibility mode'#010+
+ '**2Mmacpas_Macintosh Pascal dialects comp','atibility mode'#010+
'**1n_Do not read the default config files'#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+
+ '**1O<x>_Optimizations:'#010+
'**2O-_Disable optimizations'#010+
- '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
+ '**2O1_Level 1 optimizat','ions (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 optimizations, see fpc -i for possibl'+
+ '**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i for possib','l'+
'e values'#010+
'**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+
#010+
'**2OW<x>_Generate whole-program optimization feedback for optimization'+
- ' <x>, see fpc -i for po','ssible values'#010+
- '**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possib'+
- 'le values'#010+
+ ' <x>, see fpc -i for possible values'#010+
+ '**2Ow<x>_Perform whole-program optimization <x>, see',' fpc -i for poss'+
+ 'ible values'#010+
'**2Os_Optimize for size rather than speed'#010+
'**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
'**1R<x>_Assembler reading style:'#010+
- '**2Rdefault','_Use default assembler for target'#010+
- '3*2Ratt_Read AT&T style assembler'#010+
+ '**2Rdefault_Use default assembler for target'#010+
+ '3*2Ratt_Read AT&T style assemble','r'#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_Support operators like C (*=,+=,/= and -=)'#010+
- '*','*2Sa_Turn on assertions'#010+
+ '**2Sa_Turn on assertions'#010+
'**2Sd_Same as -Mdelphi'#010+
- '**2Se<x>_Error options. <x> is a combination of the following:'#010+
+ '**2Se<x>_Error opti','ons. <x> is a combination of the following:'#010+
'**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
'**3*_w : Compiler also halts after warnings'#010+
- '**3*_n : Compiler also h','alts after notes'#010+
+ '**3*_n : Compiler also halts after notes'#010+
'**3*_h : Compiler also halts after hints'#010+
- '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
+ '**2Sg_En','able LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
'**2Sh_Use ansistrings by default instead of shortstrings'#010+
- '**2Si_Turn on inlining of procedures/functions declared as "inline','"'#010+
+ '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
'**2Sk_Load fpcylix unit'#010+
'**2SI<x>_Set interface style to <x>'#010+
- '**3SIcom_COM compatible interface (default)'#010+
+ '**3S','Icom_COM compatible interface (default)'#010+
'**3SIcorba_CORBA compatible interface'#010+
'**2Sm_Support macros like C (global)'#010+
'**2So_Same as -Mtp'#010+
- '**2Ss_Constructor name must be init (des','tructor must be done)'#010+
+ '**2Ss_Constructor name must be init (destructor must be done)'#010+
'**2St_Allow static keyword in objects'#010+
- '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
+ '**2Sx_','Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
'**1s_Do not call assembler and linker'#010+
'**2sh_Generate script to link on host'#010+
- '**2st_Generate script to link on target',#010+
+ '**2st_Generate script to link on target'#010+
'**2sr_Skip register allocation phase (use with -alr)'#010+
- '**1T<x>_Target operating system:'#010+
+ '**1T<x>_Targ','et 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*2Tnetware_Novell Netware Module (clib)'#010+
+ '3*2Tnetwlibc_Novell Netwar','e Module (libc)'#010+
'3*2Topenbsd_OpenBSD'#010+
'3*2Tos2_OS/2 / eComStation'#010+
'3*2Tsunos_SunOS/Solaris'#010+
'3*2Tsymbian_Symbian OS'#010+
'3*2Twatcom_Watcom compatible DOS extender'#010+
- '3*2Twdosx_WDOSX DOS ex','tender'#010+
+ '3*2Twdosx_WDOSX DOS extender'#010+
'3*2Twin32_Windows 32 Bit'#010+
'3*2Twince_Windows CE'#010+
- '4*2Tlinux_Linux'#010+
+ '4*2Tlinux_Lin','ux'#010+
'6*2Tamiga_Commodore Amiga'#010+
'6*2Tatari_Atari ST/STe/TT'#010+
'6*2Tlinux_Linux/m68k'#010+
@@ -1146,90 +1150,89 @@ const msgtxt : array[0..000217,1..240] of char=(
'6*2Tpalmos_PalmOS'#010+
'A*2Tlinux_Linux'#010+
'A*2Twince_Windows CE'#010+
- 'P*','2Tamiga_AmigaOS on PowerPC'#010+
- 'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+
+ 'P*2Tamiga_AmigaOS on PowerPC'#010+
+ 'P*2Tdarwin_Darwin and Mac OS X on Power','PC'#010+
'P*2Tlinux_Linux on PowerPC'#010+
'P*2Tmacos_Mac OS (classic) on PowerPC'#010+
'P*2Tmorphos_MorphOS'#010+
'S*2Tlinux_Linux'#010+
'**1u<x>_Undefines the symbol <x>'#010+
'**1U_Unit options:'#010+
- '**2Un_Do not check',' where the unit name matches the file name'#010+
- '**2Ur_Generate release unit files (never automatically recompiled)'#010+
+ '**2Un_Do not check where the unit name matches the file name'#010+
+ '**2Ur_Generate release ','unit files (never automatically recompiled)'#010+
'**2Us_Compile a system 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*_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 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*_i : Show general info d : Show debug info'#010+
+ '**2*_l : Show linenumbers ',' r : Rhide/GCC compatibility mod'+
+ 'e'#010+
'**2*_s : Show time stamps q : Show message numbers'#010+
'**2*_a : Show everything x : Executable info (Win32 only)'#010+
- '**2*_b :',' Write file names messages p : Write tree.log with parse t'+
- 'ree'#010+
- '**2*_ with full path v : Write fpcdebug.txt with'#010+
+ '**2*_b : Write file names messages p : Write tree.log with parse tre'+
+ 'e'#010+
+ '**','2*_ with full path v : Write fpcdebug.txt with'#010+
'**2*_ lots of debugging info'#010+
- '**2*_m<x>,<y> : Don'#039't show messages numbered <x','> and <y>'#010+
+ '**2*_m<x>,<y> : Don'#039't show messages numbered <x> and <y>'#010+
'3*1W<x>_Target-specific options (targets)'#010+
- 'A*1W<x>_Target-specific options (targets)'#010+
+ 'A*1W<x>_Target','-specific options (targets)'#010+
'P*1W<x>_Target-specific options (targets)'#010+
'p*1W<x>_Target-specific options (targets)'#010+
'3*2Wb_Create a bundle instead of a library (Darwin)'#010+
- 'P*2Wb_Crea','te a bundle instead of a library (Darwin)'#010+
- 'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
+ 'P*2Wb_Create a bundle instead of a library (Darwin)'#010+
+ 'p*2Wb_Create a bundle in','stead of a library (Darwin)'#010+
'3*2WB_Create a relocatable image (Windows)'#010+
'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
- '3*2WC_Specify console type application (EMX, OS/2, ','Windows)'#010+
+ '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
'A*2WC_Specify console type application (Windows)'#010+
- 'P*2WC_Specify console type application (Classic Mac OS)'#010+
+ 'P*2WC_Sp','ecify console type application (Classic Mac OS)'#010+
'3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
- '3*','2We_Use external resources (Darwin)'#010+
- 'P*2We_Use external resources (Darwin)'#010+
+ '3*2We_Use external resources (Darwin)'#010+
+ 'P*2We_Use external resources (','Darwin)'#010+
'p*2We_Use external resources (Darwin)'#010+
'3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
'3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
- 'A*2WG_Specify',' graphic type application (Windows)'#010+
- 'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
+ 'A*2WG_Specify graphic type application (Windows)'#010+
+ 'P*2WG_Specify graphic type app','lication (Classic Mac OS)'#010+
'3*2Wi_Use internal resources (Darwin)'#010+
'P*2Wi_Use internal resources (Darwin)'#010+
'p*2Wi_Use internal resources (Darwin)'#010+
- '3*2WN_Do not generate relocation c','ode, needed for debugging (Windows'+
+ '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
+ 'A*2WN_Do not generate relocati','on code, needed for debugging (Windows'+
')'#010+
- 'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
'3*2WR_Generate relocation code (Windows)'#010+
'A*2WR_Generate relocation code (Windows)'#010+
- 'P*2WT_Specify MPW tool type application (Classic Mac',' OS)'#010+
+ 'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
'3*2WX_Enable executable stack (Linux)'#010+
- 'A*2WX_Enable executable stack (Linux)'#010+
+ 'A*2WX_Enable executable',' stack (Linux)'#010+
'p*2WX_Enable executable stack (Linux)'#010+
'P*2WX_Enable executable stack (Linux)'#010+
'**1X_Executable options:'#010+
- '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, ','FreeBSD, L'+
- 'inux)'#010+
- '**2Xd_Do not use standard library search path (needed for cross compil'+
- 'e)'#010+
+ '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
+ 'ux)'#010+
+ '**2Xd_Do not use standard library search path (nee','ded for cross comp'+
+ 'ile)'#010+
'**2Xe_Use external linker'#010+
'**2Xg_Create debuginfo in a separate file and add a debuglink section '+
'to executable'#010+
- '**2XD_Try to link units dynamically ','(defines FPC_LINK_DYNAMIC)'#010+
+ '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+
'**2Xi_Use internal linker'#010+
- '**2Xm_Generate link map'#010+
+ '**2Xm_Generat','e 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 the linker'#039's rlink-pat','h to <x> (needed for cross co'+
- 'mpile, see the ld manual for more information) (BeOS, Linux)'#010+
+ '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
+ 'ile, see the ld manual for more inf','ormation) (BeOS, Linux)'#010+
'**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
', Linux, Mac OS, Solaris)'#010+
'**2Xs_Strip all symbols from executable'#010+
- '**2XS_Try to l','ink units statically (default, defines FPC_LINK_STATIC'+
- ')'#010+
- '**2Xt_Link with static libraries (-static is passed to linker)'#010+
+ '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
+ '**2Xt_Link',' with static libraries (-static is passed to linker)'#010+
'**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010+
'**1*_'#010+
'**1?_Show this help'#010+
- '**1h_Shows this help without ','waiting'
+ '**1h_Shows this help without waiting'
);
diff --git a/features/compiler/nutils.pas b/features/compiler/nutils.pas
index 2a3de8c47b..ab84ff2b4e 100644
--- a/features/compiler/nutils.pas
+++ b/features/compiler/nutils.pas
@@ -86,6 +86,7 @@ interface
containing no code }
function has_no_code(n : tnode) : boolean;
+ function getpropaccesslist(propsym:tpropertysym; pap:tpropaccesslisttypes;out propaccesslist:tpropaccesslist):boolean;
procedure propaccesslist_to_node(var p1:tnode;st:TSymtable;pl:tpropaccesslist);
function node_to_propaccesslist(p1:tnode):tpropaccesslist;
@@ -924,6 +925,25 @@ implementation
end;
+ function getpropaccesslist(propsym:tpropertysym; pap:tpropaccesslisttypes;out propaccesslist:tpropaccesslist):boolean;
+ var
+ hpropsym : tpropertysym;
+ begin
+ result:=false;
+ { find property in the overriden list }
+ hpropsym:=propsym;
+ repeat
+ propaccesslist:=hpropsym.propaccesslist[pap];
+ if not propaccesslist.empty then
+ begin
+ result:=true;
+ exit;
+ end;
+ hpropsym:=hpropsym.overridenpropsym;
+ until not assigned(hpropsym);
+ end;
+
+
procedure propaccesslist_to_node(var p1:tnode;st:TSymtable;pl:tpropaccesslist);
var
plist : ppropaccesslistitem;
diff --git a/features/compiler/pdecsub.pas b/features/compiler/pdecsub.pas
index 40b4075165..b89fdee5dd 100644
--- a/features/compiler/pdecsub.pas
+++ b/features/compiler/pdecsub.pas
@@ -1069,17 +1069,22 @@ implementation
end
else
begin
+ { Use the dummy NOTOKEN that is also declared
+ for the overloaded_operator[] }
+ optoken:=NOTOKEN;
case token of
_CARET:
Message1(parser_e_overload_operator_failed,'**');
+ _ID:
+ if idtoken = _ENUMERATOR then
+ optoken := _OP_ENUMERATOR
+ else
+ Message1(parser_e_overload_operator_failed,'');
_UNEQUAL:
Message1(parser_e_overload_operator_failed,'=');
else
Message1(parser_e_overload_operator_failed,'');
end;
- { Use the dummy NOTOKEN that is also declared
- for the overloaded_operator[] }
- optoken:=NOTOKEN;
end;
consume(token);
parse_proc_head(aclass,potype_operator,pd);
diff --git a/features/compiler/pexpr.pas b/features/compiler/pexpr.pas
index 7127b28a43..e2c872cad6 100644
--- a/features/compiler/pexpr.pas
+++ b/features/compiler/pexpr.pas
@@ -1017,25 +1017,6 @@ implementation
membercall : boolean;
callflags : tcallnodeflags;
propaccesslist : tpropaccesslist;
-
- function getpropaccesslist(pap:tpropaccesslisttypes):boolean;
- var
- hpropsym : tpropertysym;
- begin
- result:=false;
- { find property in the overriden list }
- hpropsym:=propsym;
- repeat
- propaccesslist:=hpropsym.propaccesslist[pap];
- if not propaccesslist.empty then
- begin
- result:=true;
- exit;
- end;
- hpropsym:=hpropsym.overridenpropsym;
- until not assigned(hpropsym);
- end;
-
begin
{ property parameters? read them only if the property really }
{ has parameters }
@@ -1058,7 +1039,7 @@ implementation
{ if not(afterassignment) and not(in_args) then }
if token=_ASSIGNMENT then
begin
- if getpropaccesslist(palt_write) then
+ if getpropaccesslist(propsym,palt_write,propaccesslist) then
begin
case propaccesslist.firstsym^.sym.typ of
procsym :
@@ -1108,7 +1089,7 @@ implementation
end
else
begin
- if getpropaccesslist(palt_read) then
+ if getpropaccesslist(propsym,palt_read,propaccesslist) then
begin
case propaccesslist.firstsym^.sym.typ of
fieldvarsym :
diff --git a/features/compiler/pp.lpi b/features/compiler/pp.lpi
index 06af85ff0a..30b7c69bb7 100644
--- a/features/compiler/pp.lpi
+++ b/features/compiler/pp.lpi
@@ -23,7 +23,7 @@
<RunParams>
<local>
<FormatVersion Value="1"/>
- <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+ <CommandLineParams Value="-MObjFPC -Scgi -O1 -gl -vewnhi -l -FuC:\programming\mytest\fpctest\enumerators\ -Fu. -FUC:\programming\mytest\fpctest\enumerators\lib\i386-win32\ -oproject1.exe C:\programming\mytest\fpctest\enumerators\tforin1.pp"/>
</local>
</RunParams>
<Units Count="2">
@@ -43,7 +43,7 @@
<Version Value="8"/>
<PathDelim Value="\"/>
<Target>
- <Filename Value="i386\pp"/>
+ <Filename Value="C:\programming\fpc_features\bin\i386-win32\pp.exe"/>
</Target>
<SearchPaths>
<IncludeFiles Value="i386\"/>
diff --git a/features/compiler/pstatmnt.pas b/features/compiler/pstatmnt.pas
index 25c7683fe3..0a15a98f9a 100644
--- a/features/compiler/pstatmnt.pas
+++ b/features/compiler/pstatmnt.pas
@@ -678,9 +678,113 @@ implementation
addstatement(loopstatement,ctempdeletenode.create(setvar));
end;
+ function create_enumerator_loop(hloopvar, hloopbody, expr: tnode;
+ enumerator_get, enumerator_move: tprocdef; enumerator_current: tpropertysym): tnode;
+ var
+ loopstatement, loopbodystatement: tstatementnode;
+ enumvar: ttempcreatenode;
+ loopbody, whileloopnode,
+ enum_get, enum_move, enum_current, enum_get_params: tnode;
+ propaccesslist: tpropaccesslist;
+ enumerator_is_class: boolean;
+ enumerator_destructor: tprocdef;
+ begin
+ { result is a block of statements }
+ result:=internalstatements(loopstatement);
+
+ enumerator_is_class := is_class(enumerator_get.returndef);
+
+ { create a temp variable for enumerator }
+ enumvar := ctempcreatenode.create(
+ enumerator_get.returndef,
+ enumerator_get.returndef.size,
+ tt_persistent,true);
+
+ addstatement(loopstatement,enumvar);
+
+ if enumerator_get.proctypeoption=potype_operator then
+ begin
+ enum_get_params:=ccallparanode.create(expr.getcopy,nil);
+ enum_get:=ccallnode.create(enum_get_params, tprocsym(enumerator_get.procsym), nil, nil, []);
+ tcallnode(enum_get).procdefinition:=enumerator_get;
+ end
+ else
+ enum_get:=ccallnode.create(nil, tprocsym(enumerator_get.procsym), enumerator_get.owner, expr.getcopy, []);
+
+ addstatement(loopstatement,
+ cassignmentnode.create(
+ ctemprefnode.create(enumvar),
+ enum_get
+ ));
+
+ loopbody:=internalstatements(loopbodystatement);
+ { for-in loop variable := enumerator.current }
+ if getpropaccesslist(enumerator_current,palt_read,propaccesslist) then
+ begin
+ case propaccesslist.firstsym^.sym.typ of
+ fieldvarsym :
+ begin
+ { generate access code }
+ enum_current:=ctemprefnode.create(enumvar);
+ propaccesslist_to_node(enum_current,enumerator_current.owner,propaccesslist);
+ include(enum_current.flags,nf_isproperty);
+ end;
+ procsym :
+ begin
+ { generate the method call }
+ enum_current:=ccallnode.create(nil,tprocsym(propaccesslist.firstsym^.sym),enumerator_current.owner,ctemprefnode.create(enumvar),[]);
+ include(enum_current.flags,nf_isproperty);
+ end
+ else
+ begin
+ enum_current:=cerrornode.create;
+ Message(type_e_mismatch);
+ end;
+ end;
+ end
+ else
+ enum_current:=cerrornode.create;
+
+ addstatement(loopbodystatement,
+ cassignmentnode.create(hloopvar, enum_current));
+
+ { add the actual statement to the loop }
+ addstatement(loopbodystatement,hloopbody);
+
+ enum_move:=ccallnode.create(nil, tprocsym(enumerator_move.procsym), enumerator_move.owner, ctemprefnode.create(enumvar), []);
+ whileloopnode:=cwhilerepeatnode.create(enum_move,loopbody,true,false);
+
+ if enumerator_is_class then
+ begin
+ { insert a try-finally and call the destructor for the enumerator in the finally section }
+ enumerator_destructor:=tobjectdef(enumerator_get.returndef).Finddestructor;
+ if assigned(enumerator_destructor) then
+ begin
+ whileloopnode:=ctryfinallynode.create(
+ whileloopnode, // try node
+ ccallnode.create(nil,tprocsym(enumerator_destructor.procsym), // finally node
+ enumerator_destructor.procsym.owner,ctemprefnode.create(enumvar),[]));
+ end;
+ end;
+
+ { if getenumerator <> nil then do the loop }
+ addstatement(loopstatement,
+ cifnode.create(
+ caddnode.create(unequaln, ctemprefnode.create(enumvar), cnilnode.create),
+ whileloopnode,
+ nil
+ )
+ );
+
+ { free the temp variable for enumerator }
+ addstatement(loopstatement,ctempdeletenode.create(enumvar));
+ end;
+
function for_in_loop_create(hloopvar: tnode): tnode;
var
expr, hloopbody: tnode;
+ pd, movenext: tprocdef;
+ current: tpropertysym;
begin
expr := comp_expr(true);
@@ -696,12 +800,44 @@ implementation
else
begin
{ loop is made for an expression }
- case expr.resultdef.typ of
- stringdef: result:=create_string_loop(hloopvar, hloopbody, expr);
- arraydef: result:=create_array_loop(hloopvar, hloopbody, expr);
- setdef: result:=create_set_loop(hloopvar, hloopbody, expr);
+ // search for operator first
+ pd:=search_enumerator_operator(expr.resultdef);
+ // if there is no operator then search for class/object enumerator method
+ if (pd=nil) and (expr.resultdef.typ=objectdef) then
+ pd:=tobjectdef(expr.resultdef).search_enumerator_get;
+ if pd<>nil then
+ begin
+ // seach movenext and current symbols
+ movenext:=tobjectdef(pd.returndef).search_enumerator_move;
+ if movenext = nil then
+ begin
+ result:=cerrornode.create;
+ Message1(sym_e_no_enumerator_move,pd.returndef.GetTypeName);
+ end
+ else
+ begin
+ current:=tpropertysym(tobjectdef(pd.returndef).search_enumerator_current);
+ if current = nil then
+ begin
+ result:=cerrornode.create;
+ Message1(sym_e_no_enumerator_current,pd.returndef.GetTypeName);
+ end
+ else
+ result:=create_enumerator_loop(hloopvar, hloopbody, expr, pd, movenext, current);
+ end;
+ end
else
- result:=nil;
+ begin
+ case expr.resultdef.typ of
+ stringdef: result:=create_string_loop(hloopvar, hloopbody, expr);
+ arraydef: result:=create_array_loop(hloopvar, hloopbody, expr);
+ setdef: result:=create_set_loop(hloopvar, hloopbody, expr);
+ else
+ begin
+ result:=cerrornode.create;
+ Message1(sym_e_no_enumerator,expr.resultdef.GetTypeName);
+ end;
+ end;
end;
end;
expr.free;
diff --git a/features/compiler/symdef.pas b/features/compiler/symdef.pas
index 293eaa0297..709cc12f83 100644
--- a/features/compiler/symdef.pas
+++ b/features/compiler/symdef.pas
@@ -296,6 +296,10 @@ interface
function FindDestructor : tprocdef;
function implements_any_interfaces: boolean;
procedure reset; override;
+ { enumerator support }
+ function search_enumerator_get: tprocdef;
+ function search_enumerator_move: tprocdef;
+ function search_enumerator_current: tsym;
{ WPO }
procedure register_created_object_type;override;
procedure register_maybe_created_object_type;
@@ -4262,6 +4266,90 @@ implementation
classref_created_in_current_module:=false;
end;
+ function tobjectdef.search_enumerator_get: tprocdef;
+ var
+ objdef : tobjectdef;
+ sym : tsym;
+ i : integer;
+ pd : tprocdef;
+ hashedid : THashedIDString;
+ begin
+ result:=nil;
+ objdef:=self;
+ hashedid.id:='GETENUMERATOR';
+ while assigned(objdef) do
+ begin
+ sym:=tsym(objdef.symtable.FindWithHash(hashedid));
+ if assigned(sym) and (sym.typ=procsym) then
+ begin
+ for i := 0 to Tprocsym(sym).ProcdefList.Count - 1 do
+ begin
+ pd := tprocdef(Tprocsym(sym).ProcdefList[i]);
+ if (pd.proctypeoption = potype_function) and
+ (pd.returndef.typ = objectdef) and
+ (pd.visibility >= vis_public) then
+ begin
+ result:=pd;
+ exit;
+ end;
+ end;
+ end;
+ objdef:=objdef.childof;
+ end;
+ end;
+
+ function tobjectdef.search_enumerator_move: tprocdef;
+ var
+ objdef : tobjectdef;
+ sym : tsym;
+ i : integer;
+ pd : tprocdef;
+ hashedid : THashedIDString;
+ begin
+ result:=nil;
+ objdef:=self;
+ hashedid.id:='MOVENEXT';
+ while assigned(objdef) do
+ begin
+ sym:=tsym(objdef.symtable.FindWithHash(hashedid));
+ if assigned(sym) and (sym.typ=procsym) then
+ begin
+ for i := 0 to Tprocsym(sym).ProcdefList.Count - 1 do
+ begin
+ pd := tprocdef(Tprocsym(sym).ProcdefList[i]);
+ if (pd.proctypeoption = potype_function) and
+ is_boolean(pd.returndef) and
+ (pd.visibility >= vis_public) then
+ begin
+ result:=pd;
+ exit;
+ end;
+ end;
+ end;
+ objdef:=objdef.childof;
+ end;
+ end;
+
+ function tobjectdef.search_enumerator_current: tsym;
+ var
+ objdef : tobjectdef;
+ sym: tsym;
+ hashedid : THashedIDString;
+ begin
+ result:=nil;
+ objdef:=self;
+ hashedid.id:='CURRENT';
+ while assigned(objdef) do
+ begin
+ sym:=tsym(objdef.symtable.FindWithHash(hashedid));
+ if assigned(sym) and (sym.typ=propertysym) and (sym.visibility >= vis_public) then
+ begin
+ result:=sym;
+ exit;
+ end;
+ objdef:=objdef.childof;
+ end;
+ end;
procedure tobjectdef.register_created_classref_type;
begin
diff --git a/features/compiler/symsym.pas b/features/compiler/symsym.pas
index 7dac5cac52..db72a47b8e 100644
--- a/features/compiler/symsym.pas
+++ b/features/compiler/symsym.pas
@@ -79,6 +79,8 @@ interface
constructor create;
end;
+ { tprocsym }
+
tprocsym = class(tstoredsym)
protected
FProcdefList : TFPObjectList;
@@ -99,6 +101,7 @@ interface
function find_procdef_bypara(para:TFPObjectList;retdef:tdef;cpoptions:tcompare_paras_options):Tprocdef;
function find_procdef_byprocvardef(d:Tprocvardef):Tprocdef;
function find_procdef_assignment_operator(fromdef,todef:tdef;var besteq:tequaltype):Tprocdef;
+ function find_procdef_enumerator_operator(typedef:tdef;var besteq:tequaltype):Tprocdef;
property ProcdefList:TFPObjectList read FProcdefList;
end;
@@ -655,7 +658,6 @@ implementation
end;
end;
-
function Tprocsym.Find_procdef_byprocvardef(d:Tprocvardef):Tprocdef;
var
i : longint;
@@ -757,6 +759,60 @@ implementation
result:=bestpd;
end;
+ function Tprocsym.find_procdef_enumerator_operator(typedef:tdef;var besteq:tequaltype):Tprocdef;
+ var
+ paraidx,
+ i : longint;
+ bestpd,
+ hpd,
+ pd : tprocdef;
+ convtyp : tconverttype;
+ eq : tequaltype;
+ begin
+ { This function will return the pprocdef of pprocsym that
+ is the best match for procvardef. When there are multiple
+ matches it returns nil.}
+ result:=nil;
+ bestpd:=nil;
+ besteq:=te_incompatible;
+ for i:=0 to ProcdefList.Count-1 do
+ begin
+ pd:=tprocdef(ProcdefList[i]);
+ paraidx:=0;
+ { ignore vs_hidden parameters }
+ while (paraidx<pd.paras.count) and
+ assigned(pd.paras[paraidx]) and
+ (vo_is_hidden_para in tparavarsym(pd.paras[paraidx]).varoptions) do
+ inc(paraidx);
+ if (paraidx<pd.paras.count) and
+ assigned(pd.paras[paraidx]) then
+ begin
+ eq:=compare_defs_ext(typedef,tparavarsym(pd.paras[paraidx]).vardef,nothingn,convtyp,hpd,[]);
+
+ { alias? if yes, only l1 choice,
+ if you mess with this code, check tw4093 }
+ if (eq=te_exact) and
+ (typedef<>tparavarsym(pd.paras[paraidx]).vardef) and
+ ((df_unique in typedef.defoptions) or
+ (df_unique in tparavarsym(pd.paras[paraidx]).vardef.defoptions)) then
+ eq:=te_convert_l1;
+
+ if eq=te_exact then
+ begin
+ besteq:=eq;
+ result:=pd;
+ exit;
+ end;
+ if eq>besteq then
+ begin
+ bestpd:=pd;
+ besteq:=eq;
+ end;
+ end;
+ end;
+ result:=bestpd;
+ end;
+
{****************************************************************************
TERRORSYM
diff --git a/features/compiler/symtable.pas b/features/compiler/symtable.pas
index ae885eaeef..ca8379fd15 100644
--- a/features/compiler/symtable.pas
+++ b/features/compiler/symtable.pas
@@ -201,6 +201,7 @@ interface
function search_system_type(const s: TIDString): ttypesym;
function search_class_member(pd : tobjectdef;const s : string):tsym;
function search_assignment_operator(from_def,to_def:Tdef):Tprocdef;
+ function search_enumerator_operator(type_def:Tdef):Tprocdef;
{Looks for macro s (must be given in upper case) in the macrosymbolstack, }
{and returns it if found. Returns nil otherwise.}
function search_macro(const s : string):tsym;
@@ -254,7 +255,7 @@ interface
'sym_diff','starstar',
'as','is','in','or',
'and','div','mod','not','shl','shr','xor',
- 'assign');
+ 'assign','enumerator');
@@ -1897,6 +1898,44 @@ implementation
end;
+ function search_enumerator_operator(type_def:Tdef): Tprocdef;
+ var
+ sym : Tprocsym;
+ hashedid : THashedIDString;
+ curreq,
+ besteq : tequaltype;
+ currpd,
+ bestpd : tprocdef;
+ stackitem : psymtablestackitem;
+ begin
+ hashedid.id:='enumerator';
+ besteq:=te_incompatible;
+ bestpd:=nil;
+ stackitem:=symtablestack.stack;
+ while assigned(stackitem) do
+ begin
+ sym:=Tprocsym(stackitem^.symtable.FindWithHash(hashedid));
+ if sym<>nil then
+ begin
+ if sym.typ<>procsym then
+ internalerror(200910241);
+ { if the source type is an alias then this is only the second choice,
+ if you mess with this code, check tw4093 }
+ currpd:=sym.find_procdef_enumerator_operator(type_def,curreq);
+ if curreq>besteq then
+ begin
+ besteq:=curreq;
+ bestpd:=currpd;
+ if (besteq=te_exact) then
+ break;
+ end;
+ end;
+ stackitem:=stackitem^.next;
+ end;
+ result:=bestpd;
+ end;
+
+
function search_system_type(const s: TIDString): ttypesym;
var
sym : tsym;
@@ -1929,7 +1968,6 @@ implementation
search_class_member:=nil;
end;
-
function search_macro(const s : string):tsym;
var
stackitem : psymtablestackitem;
diff --git a/features/compiler/tokens.pas b/features/compiler/tokens.pas
index d601361e74..1f20976242 100644
--- a/features/compiler/tokens.pas
+++ b/features/compiler/tokens.pas
@@ -53,6 +53,7 @@ type
_OP_SHR,
_OP_XOR,
_ASSIGNMENT,
+ _OP_ENUMERATOR,
{ special chars }
_CARET,
_UNEQUAL,
@@ -232,6 +233,7 @@ type
_WRITEONLY,
_DEPRECATED,
_DESTRUCTOR,
+ _ENUMERATOR,
_IMPLEMENTS,
_INTERNPROC,
_OLDFPCCALL,
@@ -260,7 +262,7 @@ const
{ last operator which can be overloaded, the first_overloaded should
be declared directly after NOTOKEN }
first_overloaded = succ(NOTOKEN);
- last_overloaded = _ASSIGNMENT;
+ last_overloaded = _OP_ENUMERATOR;
type
tokenrec=record
@@ -307,6 +309,7 @@ const
(str:'shr' ;special:true ;keyword:m_none;op:NOTOKEN),
(str:'xor' ;special:true ;keyword:m_none;op:NOTOKEN),
(str:':=' ;special:true ;keyword:m_none;op:NOTOKEN),
+ (str:'enumerator' ;special:true ;keyword:m_none;op:NOTOKEN),
{ Special chars }
(str:'^' ;special:true ;keyword:m_none;op:NOTOKEN),
(str:'<>' ;special:true ;keyword:m_none;op:NOTOKEN),
@@ -486,6 +489,7 @@ const
(str:'WRITEONLY' ;special:false;keyword:m_none;op:NOTOKEN),
(str:'DEPRECATED' ;special:false;keyword:m_all;op:NOTOKEN),
(str:'DESTRUCTOR' ;special:false;keyword:m_all;op:NOTOKEN),
+ (str:'ENUMERATOR' ;special:false;keyword:m_none;op:_OP_ENUMERATOR),
(str:'IMPLEMENTS' ;special:false;keyword:m_none;op:NOTOKEN),
(str:'INTERNPROC' ;special:false;keyword:m_none;op:NOTOKEN),
(str:'OLDFPCCALL' ;special:false;keyword:m_none;op:NOTOKEN),
diff --git a/features/tests/test/tforin2.pp b/features/tests/test/tforin2.pp
new file mode 100644
index 0000000000..0003dbc1fe
--- /dev/null
+++ b/features/tests/test/tforin2.pp
@@ -0,0 +1,82 @@
+program project1;
+
+{$mode objfpc}{$H+}
+{$apptype console}
+uses
+ Classes;
+
+type
+ { TStringEnumerator }
+
+ TStringEnumerator = class // reverse enumerator
+ private
+ FString: String;
+ FIndex: Integer;
+ function GetCurrent: Char; inline;
+ public
+ constructor Create(AString: String);
+ function MoveNext: Boolean;
+ property Current: Char read GetCurrent;
+ end;
+
+{ TStringEnumerator }
+
+function TStringEnumerator.GetCurrent: Char;
+begin
+ Result := FString[FIndex];
+end;
+
+constructor TStringEnumerator.Create(AString: String);
+begin
+ inherited Create;
+ FString := AString;
+ FIndex := Length(FString) + 1;
+end;
+
+function TStringEnumerator.MoveNext: Boolean;
+begin
+ dec(FIndex);
+ Result := FIndex > 0;
+end;
+
+// define an operator for the string type
+operator enumerator (const s: string): TStringEnumerator;inline;
+begin
+ Result := TStringEnumerator.Create(s);
+end;
+
+procedure LoopString(s: string);
+
+ function getstring(s: string): string;
+ begin
+ result:=s;
+ end;
+
+var
+ c: char;
+begin
+ // check loop in string. output is 'tset' for the string 'test' :)
+ for c in getstring(s) do
+ write(c);
+ WriteLn;
+end;
+
+procedure LoopClass;
+var
+ L: TStringList;
+ S: String;
+begin
+ L := TStringList.Create;
+ L.Add('1');
+ L.Add('2');
+ L.Add('3');
+ for S in L do
+ WriteLn(S);
+ L.Free;
+end;
+
+begin
+ LoopString('test');
+ LoopClass;
+end.
+
diff --git a/features/tests/test/tforin3.pp b/features/tests/test/tforin3.pp
new file mode 100644
index 0000000000..2f94a07e60
--- /dev/null
+++ b/features/tests/test/tforin3.pp
@@ -0,0 +1,47 @@
+program Project18;
+
+{$APPTYPE CONSOLE}
+
+// check the GetEnumerator nil return
+
+type
+
+ { TListEnumerator }
+
+ TListEnumerator = class
+ private
+ FCurrent: String;
+ public
+ function MoveNext: Boolean;
+ property Current: String read FCurrent;
+ end;
+
+ TMyList = class
+ public
+ function GetEnumerator: TListEnumerator;
+ end;
+
+{ TListEnumerator }
+
+function TListEnumerator.MoveNext: Boolean;
+begin
+ Result := True;
+end;
+
+{ TMyList }
+
+function TMyList.GetEnumerator: TListEnumerator;
+begin
+ Result := nil;
+end;
+
+var
+ S: String;
+ L: TMyList;
+begin
+ L := TMyList.Create;
+ for S in L do
+ ;
+ L.Free;
+end.
+
View Lorry Controller Status