Prechádzať zdrojové kódy

* first part of implements clean up and fixing

git-svn-id: trunk@10382 -
florian 17 rokov pred
rodič
commit
6c53785e3a

+ 1 - 0
.gitattributes

@@ -6730,6 +6730,7 @@ tests/tbs/tb0542.pp svneol=native#text/plain
 tests/tbs/tb0543.pp svneol=native#text/plain
 tests/tbs/tb0544.pp svneol=native#text/plain
 tests/tbs/tb0545.pp svneol=native#text/plain
+tests/tbs/tb0546.pp svneol=native#text/plain
 tests/tbs/tb205.pp svneol=native#text/plain
 tests/tbs/ub0060.pp svneol=native#text/plain
 tests/tbs/ub0069.pp svneol=native#text/plain

+ 6 - 0
compiler/msg/errore.msg

@@ -1134,6 +1134,12 @@ parser_e_no_generics_as_types=03236_E_Generics without specialization can not be
 % Generics must be always specialized before being used as variable type
 parser_w_register_list_ignored=03237_W_Register list is ignored for pure assembler routines
 % When using pure assembler routines, the list with modified registers is ignored.
+parser_e_implements_must_be_class_or_interface=03238_E_Implements property must have interface type
+parser_e_implements_must_have_correct_type=03239_E_Implements-property must implement interface of correct type, found "$1" expected "$2"
+parser_e_implements_must_read_specifier=03240_E_Implements-property must have read specifier
+parser_e_implements_must_not_have_write_specifier=03241_E_Implements-property must not have write-specifier
+parser_e_implements_must_not_have_stored_specifier=03242_E_Implements-property must not have stored-specifier
+parser_e_implements_uses_non_implemented_interface=03243_E_Implements-property used on unimplemented interface: "$1"
 % \end{description}
 #
 # Type Checking

+ 8 - 2
compiler/msgidx.inc

@@ -324,6 +324,12 @@ const
   parser_e_no_common_type=03235;
   parser_e_no_generics_as_types=03236;
   parser_w_register_list_ignored=03237;
+  parser_e_implements_must_be_class_or_interface=03238;
+  parser_e_implements_must_have_correct_type=03239;
+  parser_e_implements_must_read_specifier=03240;
+  parser_e_implements_must_not_have_write_specifier=03241;
+  parser_e_implements_must_not_have_stored_specifier=03242;
+  parser_e_implements_uses_non_implemented_interface=03243;
   type_e_mismatch=04000;
   type_e_incompatible_types=04001;
   type_e_not_equal_types=04002;
@@ -735,9 +741,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 45612;
+  MsgTxtSize = 45996;
 
   MsgIdxMax : array[1..20] of longint=(
-    24,86,238,84,64,50,108,22,135,60,
+    24,86,244,84,64,50,108,22,135,60,
     42,1,1,1,1,1,1,1,1,1
   );

+ 286 - 282
compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000190] of string[240]=(
+const msgtxt : array[0..000191] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000190,1..240] of char=(
+const msgtxt : array[0..000191,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -369,458 +369,465 @@ const msgtxt : array[0..000190,1..240] of char=(
   '03236_E_Gene','rics without specialization can not be used as a type fo'+
   'r a variable'#000+
   '03237_W_Register list is ignored for pure assembler routines'#000+
+  '03238_E_Implements property must have interface type'#000+
+  '03239_E_Implements-property must implement interface of c','orrect type'+
+  ', found "$1" expected "$2"'#000+
+  '03240_E_Implements-property must have read specifier'#000+
+  '03241_E_Implements-property must not have write-specifier'#000+
+  '03242_E_Implements-property must not have stored-specifier'#000+
+  '03243_E_Implements-property used',' on unimplemented interface: "$1"'#000+
   '04000_E_Type mismatch'#000+
   '04001_E_Incompatible types: got "$1" expected "$2"'#000+
-  '04002_E_Type mismatch between "$1" an','d "$2"'#000+
+  '04002_E_Type mismatch between "$1" and "$2"'#000+
   '04003_E_Type identifier expected'#000+
   '04004_E_Variable identifier expected'#000+
-  '04005_E_Integer expression expected, but got "$1"'#000+
+  '04005_E_Integer exp','ression expected, but got "$1"'#000+
   '04006_E_Boolean expression expected, but got "$1"'#000+
   '04007_E_Ordinal expression expected'#000+
-  '04008_E_pointer type expect','ed, but got "$1"'#000+
+  '04008_E_pointer type expected, but got "$1"'#000+
   '04009_E_class type expected, but got "$1"'#000+
-  '04011_E_Can'#039't evaluate constant expression'#000+
+  '04011_E_Can'#039't evaluate constant expre','ssion'#000+
   '04012_E_Set elements are not compatible'#000+
   '04013_E_Operation not implemented for sets'#000+
-  '04014_W_Automatic type conversion from floating type to',' COMP which i'+
-  's an integer type'#000+
+  '04014_W_Automatic type conversion from floating type to COMP which is '+
+  'an integer type'#000+
   '04015_H_use DIV instead to get an integer result'#000+
-  '04016_E_string types doesn'#039't match, because of $V+ mode'#000+
+  '04016_E_string t','ypes doesn'#039't match, because of $V+ mode'#000+
   '04017_E_succ or pred on enums with assignments not possible'#000+
-  '04018_E_Can'#039't read or write variables of thi','s type'#000+
+  '04018_E_Can'#039't read or write variables of this type'#000+
   '04019_E_Can'#039't use readln or writeln on typed file'#000+
-  '04020_E_Can'#039't use read or write on untyped file.'#000+
+  '04020_E_Can'#039't use read or write on unty','ped file.'#000+
   '04021_E_Type conflict between set elements'#000+
   '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
-  '04023_E_Integer or real expre','ssion expected'#000+
+  '04023_E_Integer or real expression expected'#000+
   '04024_E_Wrong type "$1" in array constructor'#000+
-  '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+
+  '04025_E_Incompatible type for arg no','. $1: Got "$2", expected "$3"'#000+
   '04026_E_Method (variable) and Procedure (variable) are not compatible'#000+
-  '04027_E_Illegal constant passed to internal ','math function'#000+
+  '04027_E_Illegal constant passed to internal math function'#000+
   '04028_E_Can'#039't take the address of constant expressions'#000+
-  '04029_E_Argument can'#039't be assigned to'#000+
+  '04029_E_Argument can'#039't be a','ssigned to'#000+
   '04030_E_Can'#039't assign local procedure/function to procedure variabl'+
   'e'#000+
   '04031_E_Can'#039't assign values to an address'#000+
-  '04032_E_Can'#039't assign va','lues to const variable'#000+
+  '04032_E_Can'#039't assign values to const variable'#000+
   '04033_E_Array type required'#000+
-  '04034_E_interface type expected, but got "$1"'#000+
+  '04034_E_interface type expected, but got "$1"',#000+
   '04035_W_Mixing signed expressions and longwords gives a 64bit result'#000+
   '04036_W_Mixing signed expressions and cardinals here may cause a range'+
-  ' che','ck error'#000+
+  ' check error'#000+
   '04037_E_Typecast has different size ($1 -> $2) in assignment'#000+
-  '04038_E_enums with assignments can'#039't be used as array index'#000+
+  '04038_E_enums with assignm','ents can'#039't be used as array index'#000+
   '04039_E_Class or Object types "$1" and "$2" are not related'#000+
-  '04040_W_Class types "$1" and "$2" are not related'#000,
+  '04040_W_Class types "$1" and "$2" are not related'#000+
   '04041_E_Class or interface type expected, but got "$1"'#000+
-  '04042_E_Type "$1" is not completely defined'#000+
+  '04042_E_Type "$1" is not completely defin','ed'#000+
   '04043_W_String literal has more characters than short string length'#000+
   '04044_W_Comparison is always false due to range of values'#000+
-  '04045_W_Compari','son is always true due to range of values'#000+
-  '04046_W_Constructing a class "$1" with abstract methods'#000+
+  '04045_W_Comparison is always true due to range of values'#000+
+  '04046_W_Constructing a class "$1" with abstract method','s'#000+
   '04047_H_The left operand of the IN operator should be byte sized'#000+
   '04048_W_Type size mismatch, possible loss of data / range check error'#000+
-  '04049_H','_Type size mismatch, possible loss of data / range check erro'+
-  'r'#000+
-  '04050_E_The address of an abstract method can'#039't be taken'#000+
+  '04049_H_Type size mismatch, possible loss of data / range check error'#000+
+  '04050_E_The address of an abstrac','t method can'#039't be taken'#000+
   '04051_E_Assignments to formal parameters and open arrays are not possi'+
   'ble'#000+
   '04052_E_Constant Expression expected'#000+
-  '04053_E_O','peration "$1" not supported for types "$2" and "$3"'#000+
-  '04054_E_Illegal type conversion: "$1" to "$2"'#000+
+  '04053_E_Operation "$1" not supported for types "$2" and "$3"'#000+
+  '04054_E_Illegal type conversion: "$1" to "$2','"'#000+
   '04055_H_Conversion between ordinals and pointers is not portable'#000+
   '04056_W_Conversion between ordinals and pointers is not portable'#000+
-  '04057_E_Can'#039,'t determine which overloaded function to call'#000+
+  '04057_E_Can'#039't determine which overloaded function to call'#000+
   '04058_E_Illegal counter variable'#000+
-  '04059_W_Converting constant real value to double for C variable argume'+
-  'nt, add explicit typecast to prevent this.'#000+
-  '04060_E_Class or COM interface type expected, bu','t got "$1"'#000+
+  '04059_W_Convertin','g constant real value to double for C variable argu'+
+  'ment, add explicit typecast to prevent this.'#000+
+  '04060_E_Class or COM interface type expected, but got "$1"'#000+
   '04061_E_Constant packed arrays are not yet supported'#000+
-  '04062_E_Incompatible type for arg no. $1: Got "$2" expected "(Bit)Pack'+
-  'ed Array"'#000+
+  '04062_E_Incompatible type for ar','g no. $1: Got "$2" expected "(Bit)Pa'+
+  'cked Array"'#000+
   '04063_E_Incompatible type for arg no. $1: Got "$2" expected "(not pack'+
   'ed) Array"'#000+
-  '04064_E_Element','s of packed arrays cannot be of a type which need to '+
-  'be initialised'#000+
-  '04065_E_Constant packed records and objects are not yet supported'#000+
+  '04064_E_Elements of packed arrays cannot be of a type which need to be'+
+  ' initialised'#000+
+  '04065_E_Constant packed reco','rds and objects are not yet supported'#000+
   '04066_W_Arithmetic "$1" on untyped pointer is unportable to {$T+}, sug'+
   'gest typecast'#000+
-  '04076_E_Can'#039't take add','ress of a subroutine marked as local'#000+
-  '04077_E_Can'#039't export subroutine marked as local from a unit'#000+
+  '04076_E_Can'#039't take address of a subroutine marked as local'#000+
+  '04077_E_Can'#039't export subroutine marked as local from a unit',#000+
   '04078_E_Type is not automatable: "$1"'#000+
   '04079_H_Converting the operands to "$1" before doing the add could pre'+
   'vent overflow errors.'#000+
-  '04080_H_Conve','rting the operands to "$1" before doing the subtract co'+
-  'uld prevent overflow errors.'#000+
-  '04081_H_Converting the operands to "$1" before doing the multiply coul'+
+  '04080_H_Converting the operands to "$1" before doing the subtract coul'+
   'd prevent overflow errors.'#000+
-  '04082_W_Converting pointers to signed integers may result i','n wrong c'+
-  'omparison results and range errors, use an unsigned type instead.'#000+
-  '04083_E_Interface type $1 has no valid GUID'#000+
+  '04081_H_Conv','erting the operands to "$1" before doing the multiply co'+
+  'uld prevent overflow errors.'#000+
+  '04082_W_Converting pointers to signed integers may result in wrong com'+
+  'parison results and range errors, use an unsigned type instead.'#000+
+  '04083_E_Interface typ','e $1 has no valid GUID'#000+
   '05000_E_Identifier not found "$1"'#000+
   '05001_F_Internal Error in SymTableStack()'#000+
   '05002_E_Duplicate identifier "$1"'#000+
-  '05003_H_Ide','ntifier 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 declara','tion 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 outsi'+
-  'de methods'#000+
+  '05010_E_Only static variables can be used in static methods or outside'+
+  ' methods'#000+
   '05012_F_record or class type expected'#000+
-  '05013_E_Instances of classes or objects with an abstract method are no'+
-  't allowed'#000+
+  '05013_E_Instances of classes o','r objects with an abstract method are '+
+  'not allowed'#000+
   '05014_W_Label not defined "$1"'#000+
   '05015_E_Label used but not defined "$1"'#000+
-  '05016_E_Illegal label d','eclaration'#000+
+  '05016_E_Illegal label declaration'#000+
   '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
   '05018_E_Label not found'#000+
-  '05019_E_identifier isn'#039't a label'#000+
+  '050','19_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 no','t resolved "$1"'#000+
+  '05022_E_Forward class definition not resolved "$1"'#000+
   '05023_H_Unit "$1" not used in $2'#000+
   '05024_H_Parameter "$1" not used'#000+
-  '05025_N_Local variable "$1" not used'#000+
+  '05025_N_Local v','ariable "$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_Loc','al $1 "$2" is not used'#000+
+  '05028_H_Local $1 "$2" is not used'#000+
   '05029_N_Private field "$1.$2" is never used'#000+
-  '05030_N_Private field "$1.$2" is assigned but never used'#000+
+  '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,
+  '05033_W_Function result does not seem to be set'#000+
   '05034_W_Type "$1" is not aligned correctly in current record for C'#000+
-  '05035_E_Unknown record field identifier "$1"'#000+
+  '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_identi','fier idents no member "$1"'#000+
+  '05038_E_identifier idents no member "$1"'#000+
   '05039_H_Found declaration: $1'#000+
   '05040_E_Data element too large'#000+
-  '05042_E_No matching implementation for interface method "$1" found'#000+
+  '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+
+  '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+
+  '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 init','ialized'#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+
+  '05061_W_Variable "$1" r','ead but nowhere assigned'#000+
   '05062_H_Found abstract method: $1'#000+
   '05063_W_Symbol "$1" is experimental'#000+
   '06009_E_Parameter list size exceeds 65535 bytes'#000+
-  '0','6012_E_File types must be var parameters'#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+
+  '06','015_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_unre','achable 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+
+  '06027_DL_Register $1 weight $2 $3',#000+
   '06029_DL_Stack frame is omitted'#000+
   '06031_E_Object or class methods can'#039't be inline.'#000+
   '06032_E_Procvar calls cannot be inline.'#000+
-  '06033_E_No code for in','line procedure stored'#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+
+  'sed, use',' (set)length instead'#000+
   '06037_E_Constructors or destructors can not be called inside a '#039'wi'+
   'th'#039' clause'#000+
-  '06038_E_Cannot call message handler methods di','rectly'#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_Control flow statements aren'#039't a','llowed 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+
-  '060','43_E_Local variables size exceeds supported limit'#000+
+  '06043_E_Local variables size exceeds supported limit'#000+
   '06044_E_BREAK not allowed'#000+
-  '06045_E_CONTINUE 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 us','e the correct r'+
-  'un time library.'#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+
+  '06049_E_Goto l','abel "$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-','label 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 identi','fier'#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 u','se $ 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_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+
+  '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+
+  '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 u','sage'#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+
+  '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_es','cape 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 pro','blems 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 o','verload function in assembler'#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+
+  '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+
-  '07041_E_Cannot use SELF outside a method'#000+
+  '0','7041_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 co','de'#000+
+  '07043_W_Procedures can'#039't return any value in asm code'#000+
   '07044_E_SEG not supported'#000+
   '07045_E_Size suffix and destination or source size do not match'#000+
-  '07046_W_Size suffix and destination or source size do not match'#000+
+  '070','46_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+
-  '0','7049_E_Assembler syntax error in operand'#000+
+  '07049_E_Assembler syntax error in operand'#000+
   '07050_E_Assembler syntax error in constant'#000+
-  '07051_E_Invalid String expression'#000+
+  '07051_E_Inva','lid 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 mi','ssing 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+
+  '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_Un','defined local symbol $1'#000+
+  '07061_E_Undefined local symbol $1'#000+
   '07062_E_Unknown label identifier $1'#000+
   '07063_E_Invalid register name'#000+
-  '07064_E_Invalid floating point register name'#000+
+  '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 ex','pression'#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 v','ariable specified'#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+
+  '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+
+  '07079_W_32bit constant created for address'#000+
   '07080_N_.align is target specific, use .balign or .p2align'#000+
-  '07081_E_Can'#039't access fields directly for parameters'#000+
+  '07081_E_Can'#039't access fie','lds 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 o','f 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 translate','d 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 < no','t allowed here'#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 cannot be together'#000+
+  '07094_E_Inc and Dec c','annot 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 spe','cified and unable to determine the size of the op'+
-  'erands, using DWORD as default'#000+
-  '07099_E_Syntax error while trying to parse a shifter operand'#000+
+  '07098_W_No size specified and unable to determine the size of the oper'+
+  'ands, using DWORD as default'#000+
+  '07099_E_Syntax e','rror 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 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 pa','rameters 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+
+  '07104_W_Use of -offset(%ebp) is not recommended for local variable acc'+
+  'ess'#000+
   '07105_W_Use of -offset(%esp), access may cause a crash or value may be'+
-  ' lost'#000+
+  ' lo','st'#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+
-  '08002_F_Comp not supported'#000+
+  '08002_F_C','omp 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 writ','er 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 invalid combination of opcode an','d 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+
-  '0801','1_E_Asm: $1 value exceeds bounds $2'#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+
+  '08013_E_Asm: Unde','fined 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: Duplic','ate 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+
+  '08019_E_Asm: Invali','d 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 rede','fined'#000+
+  '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assembler file: $1'#000+
-  '09003_E_Can'#039't create object 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+
+  '09006_T_Using assembler: $1'#000+
   '09007_E_Error while assembling exitcode $1'#000+
-  '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
-  'ssembling'#000+
+  '09008_E_Can'#039't call the assembler, error $1 switchi','ng to external'+
+  ' assembling'#000+
   '09009_I_Assembling $1'#000+
   '09010_I_Assembling with smartlinking $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
-  '09012_W_','Library $1 not found, Linking may fail !'#000+
+  '09012_W_Library $1 not found, Linking may fail !'#000+
   '09013_E_Error while linking'#000+
-  '09014_E_Can'#039't call the linker, switching to external linking'#000+
+  '09014_E_Can'#039't call the link','er, 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_Crea','tion of Executables 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+
+  '090','20_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 st','atically 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 can'#039't be smart linked, switching to ','static linki'+
+  'ng'#000+
   '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
   'g'#000+
   '09026_E_unit $1 can'#039't be smart or static linked'#000+
-  '09027_E_unit ','$1 can'#039't be shared or static linked'#000+
-  '09028_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 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+
+  '09131_X_Size of initialized 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+
+  '091','34_X_Stack space committed: $1 bytes'#000+
   '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
-  '10004_U_PPU Crc: $','1'#000+
+  '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+
+  '10007_U_PPU Invalid Header (no PPU at the begi','n)'#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+
+  '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+
+  '10015_F_unexpe','cted end of PPU-File'#000+
   '10016_F_Invalid PPU-File entry: $1'#000+
   '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020','_F_Circular unit reference between $1 and $2'#000+
-  '10021_F_Can'#039't compile unit $1, no sources available'#000+
+  '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 was not found but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
-  '10025_W_Compiling the s','ystem unit requires the -Us switch'#000+
+  '10025_W_Compiling the system unit requires the -Us switch'#000+
   '10026_F_There were $1 errors compiling module, stopping'#000+
-  '10027_U_Load from $1 ($2) unit $3'#000+
+  '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+
+  '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+
+  '100','32_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+
+  '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
-  '10037_U_PPU Check file $1 time $2'#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_Trying to use a unit which w','as compiled with a different FPU'+
-  ' mode'#000+
+  '10042_U_Trying to use a unit which was compiled with a different FPU m'+
+  'ode'#000+
   '10043_U_Loading interface units from $1'#000+
-  '10044_U_Loading implementation units from $1'#000+
+  '10044_U_Loading im','plementation 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 u','nit $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+
+  '10050_U_No reload, al','ready 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_Finished loading unit $1'#000+
-  '10057_U_Registering new unit $1'#000+
+  '10057_U_Register','ing 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> [o','ptions]'#000+
+  '11000_O_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
-  '11003_E_nested response files are not supported'#000+
+  '110','03_E_nested response files are not supported'#000+
   '11004_F_No source file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
-  '11006_E_Illegal',' parameter: $1'#000+
+  '11006_E_Illegal 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+
-  '11012_W_Shared libs not supported on DOS platform, ','reverting to stat'+
-  'ic'#000+
+  '11012_W_Shared libs not supported on DOS platform, reverting to static'+
+  #000+
   '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
-  '11015_F_open conditional at the end of the file'#000+
+  '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 a','re using the obsolete switch $1'#000+
+  '11018_W_You are using the obsolete switch $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+
+  '1102','0_N_Switching assembler to default source writing assembler'#000+
   '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
-  '11022_W_"$1" asse','mbler use forced'#000+
+  '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
-  '11027_T_Reading options from environment $1'#000+
+  '11027_T_Reading options from environment $','1'#000+
   '11028_D_Handling option "$1"'#000+
   '11029__*** press enter ***'#000+
   '11030_H_Start of reading config file $1'#000+
   '11031_H_End of reading config file $1'#000+
-  '11032_D_','interpreting option "$1"'#000+
+  '11032_D_interpreting option "$1"'#000+
   '11036_D_interpreting firstpass option "$1"'#000+
-  '11033_D_interpreting file option "$1"'#000+
+  '11033_D_interpreting file op','tion "$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+
-  '1','1041_W_Assembler output selected "$1" cannot generate debug info, d'+
-  'ebugging disabled'#000+
-  '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
-  'CPU'#010+
+  '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
+  'ugging disabled'#000+
+  '11023_Free ','Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $F'+
+  'PCCPU'#010+
   'Copyright (c) 1993-2007 by Florian Klaempfl'#000+
-  '11024_Free Pascal Compiler version $F','PCVERSION'#010+
+  '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
   'Compiler CPU Target: $FPCCPU'#010+
   #010+
   'Supported targets:'#010+
-  '  $OSTARGETS'#010+
+  '  $OST','ARGETS'#010+
   #010+
   'Supported CPU instruction sets:'#010+
   '  $INSTRUCTIONSETS'#010+
@@ -829,268 +836,265 @@ const msgtxt : array[0..000190,1..240] of char=(
   '  $FPUINSTRUCTIONSETS'#010+
   #010+
   'Supported Optimizations:'#010+
-  '  $O','PTIMIZATIONS'#010+
+  '  $OPTIMIZATIONS'#010+
   #010+
   'This program comes under the GNU General Public Licence'#010+
-  'For more information read COPYING.FPC'#010+
+  'For more information read ','COPYING.FPC'#010+
   #010+
   'Report bugs,suggestions etc to:'#010+
   '                 [email protected]'#000+
-  '11025_**0*_Put + after a boolean switch option to enable it, -',' to di'+
-  'sable it'#010+
+  '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+
+  '**2al_List sourceco','de 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 regis','ter allocation/release 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 info in assembl','er 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*2Anas','melf_ELF32 (Linux) 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*2Anasmwdosx_Win3','2/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*2Acoff_COFF (Go','32v2) 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*2Aga','s_GNU Motorola assembler'#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+
+  '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+
-  '**1','B_Build all modules'#010+
+  '**1B_Build all modules'#010+
   '**1C<x>_Code generation options:'#010+
-  '**2Cc<x>_Set default calling convention to <x>'#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 '+
-  'values'#010+
-  '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
+  '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
+  'lues'#010+
+  '**2CF<x>_Minimal floating point constant precision (defa','ult, 32, 64)'+
+  #010+
   '**2Cg_Generate PIC code'#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>_','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 N','ORMAL, 2, '+
-  '4 and 8'#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 size to <n>'#010+
+  '**2Cs<n>_Set sta','ck size to <n>'#010+
   '**2Ct_Stack checking'#010+
   '**2CX_Create also smartlinked library'#010+
   '**1d<x>_Defines the symbol <x>'#010+
   '**1D_Generate a DEF file'#010+
-  '**2Dd<x>_Set d','escription to <x>'#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 execu','table'#010+
   '**1E_Same as -Cn'#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 ','p'+
-  'arsed'#010+
+  '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
+  'sed'#010+
   '**2Fc<x>_Set input codepage to <x>'#010+
   '**2FC<x>_Set RC compiler binary name to <x>'#010+
-  '**2FD<x>_Set the directory where to search for compiler utilities'#010+
+  '**2FD<x>_S','et the directory where to search for compiler utilities'#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+
+  '**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 lib','rary 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+
-  '**2Fo<x>_Add <x> to object ','path'#010+
+  '**2Fo<x>_Add <x> to object path'#010+
   '**2Fr<x>_Load error message file <x>'#010+
   '**2FR<x>_Set resource (.res) linker to <x>'#010+
-  '**2Fu<x>_Add <x> to unit path'#010+
+  '**2Fu<x>_Ad','d <x> to unit path'#010+
   '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
   '*g1g_Generate debug information (default format for target)'#010+
-  '*g2gc_Generat','e checks for pointers'#010+
+  '*g2gc_Generate 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+
+  '*g2gl_Use ','line info unit (show more info with backtraces)'#010+
   '*g2go<x>_Set debug information options'#010+
-  '*g3godwarfsets_ Enable Dwarf set debug information (break','s gdb < 6.5'+
-  ')'#010+
+  '*g3godwarfsets_ Enable Dwarf set debug information (breaks gdb < 6.5)'#010+
   '*g2gp_Preserve case in stabs symbol names'#010+
   '*g2gs_Generate stabs debug information'#010+
-  '*g2gt_Trash local variables (to detect uninitialized uses)'#010+
+  '*g','2gt_Trash local variables (to detect uninitialized uses)'#010+
   '*g2gv_Generates programs traceable with valgrind'#010+
-  '*g2gw_Generate dwarf-2 debug informati','on (same as -gw2)'#010+
+  '*g2gw_Generate dwarf-2 debug information (same as -gw2)'#010+
   '*g2gw2_Generate dwarf-2 debug information'#010+
-  '*g2gw3_Generate dwarf-3 debug information'#010+
+  '*g2gw3_Generate dwarf-3 debug inform','ation'#010+
   '**1i_Information'#010+
   '**2iD_Return compiler date'#010+
   '**2iV_Return short compiler version'#010+
   '**2iW_Return full compiler version'#010+
-  '**2iSO_Return compiler ','OS'#010+
+  '**2iSO_Return compiler OS'#010+
   '**2iSP_Return compiler host processor'#010+
   '**2iTO_Return target OS'#010+
-  '**2iTP_Return target processor'#010+
+  '**2iTP_Return target processor'#010,
   '**1I<x>_Add <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_Write logo'#010+
   '**1M<x>_Set language mode to <x>'#010+
-  '**2Mfpc_Free Pascal dialect (def','ault)'#010+
+  '**2Mfpc_Free Pascal dialect (default)'#010+
   '**2Mobjfpc_FPC mode with Object Pascal support'#010+
   '**2Mdelphi_Delphi 7 compatibility mode'#010+
-  '**2Mtp_TP/BP 7.0 compatibility mode'#010+
+  '**2M','tp_TP/BP 7.0 compatibility mode'#010+
   '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
   '**1n_Do not read the default config files'#010+
-  '**1N<x>_Node t','ree optimizations'#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+
-  '**2O2_Level 2 optimizations (-O1 + q','uick optimizations)'#010+
+  '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
   '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
-  '**2Oa<x>=<y>_Set alignment'#010+
+  '**2Oa<x>=<y>_Set alig','nment'#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 possib','le valu'+
-  'es'#010+
+  '**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+
+  #010+
   '**2Os_Optimize for size rather than speed'#010+
-  '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
+  '**1pg_Generate profile code for gprof (defin','es FPC_PROFILE)'#010+
   '**1R<x>_Assembler reading style:'#010+
   '**2Rdefault_Use default assembler for target'#010+
   '3*2Ratt_Read AT&T style assembler'#010+
-  '3*2Rintel_Read I','ntel 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+
+  '**2S2_Same as',' -Mobjfpc'#010+
   '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_Turn on assertions'#010+
   '**2Sd_Same as -Mdelphi'#010+
-  '**2Se<x>_Error options. <x> is a comb','ination of the following:'#010+
+  '**2Se<x>_Error options. <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*_w :',' Compiler also halts after warnings'#010+
   '**3*_n : Compiler also halts after notes'#010+
   '**3*_h : Compiler also halts after hints'#010+
-  '**2Sg_Enable LABEL and GOT','O (default in -Mtp and -Mdelphi)'#010+
+  '**2Sg_Enable 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 compatibl','e interface (default)'#010+
+  '**3SIcom_COM compatible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
-  '**2Sm_Support macros like C (global)'#010+
+  '**2Sm_Support macros like C (global)',#010+
   '**2So_Same as -Mtp'#010+
   '**2Ss_Constructor name must be init (destructor must be done)'#010+
   '**2St_Allow static keyword in objects'#010+
-  '**2Sx_Enable exception k','eywords (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+
+  '**2sh_Generate sc','ript 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 syste','m:'#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*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*','2Topenbsd_OpenBSD'#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*2T','watcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
   '3*2Twince_Windows CE'#010+
   '4*2Tlinux_Linux'#010+
-  '6*2Tamiga_Commo','dore Amiga'#010+
+  '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux/m68k'#010+
-  '6*2Tmacos_Macintosh m68k (not supported)'#010+
+  '6*2Tmacos_Macintosh m68k (not supporte','d)'#010+
   '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*2Tlinux_Linux',' on PowerPC'#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<x>_Un','defines 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+
+  '**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+
+  '**1v<x>_Be verbose. <x> is a combination o','f the following letters:'#010+
   '**2*_e : Show errors (default)       0 : Show nothing (except errors)'#010+
-  '**2*_w : Show warnings               u : Show uni','t info'#010+
+  '**2*_w : Show warnings               u : Show unit info'#010+
   '**2*_n : Show notes                  t : Show tried/used files'#010+
-  '**2*_h : Show hints                  c : Show conditionals'#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 com','patibility mod'+
-  'e'#010+
+  '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
   '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
-  '**2*_b : Write file names messages with full path'#010+
+  '**2*_b : W','rite 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,
+  '**2*_    lots of debugging info'#010+
   '3*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>_Targ','et-specific options (targets)'#010+
   '3*2Wb_Create a bundle instead of a library (Darwin)'#010+
   'P*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+
   '3*2WB_Create a relocatable image (Windows)'#010+
-  'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
+  'A*2WB_Creat','e a relocatable image (Windows, Symbian)'#010+
   '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
-  'A*2WC_Specify console type application (Win','dows)'#010+
+  'A*2WC_Specify console type application (Windows)'#010+
   'P*2WC_Specify console type application (Classic Mac OS)'#010+
-  '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
+  '3*2WD_Use DEFFILE to export functi','ons of DLL or EXE (Windows)'#010+
   'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
-  '3*2WF_Specify full-screen type application (EMX, OS/2)',#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+
+  'A*2WG_Specify graphic type applicat','ion (Windows)'#010+
   'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
   '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  'A*2W','N_Do not generate relocation code, needed for debugging (Windows'+
-  ')'#010+
-  '3*2WR_Generate relocation code (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+
   '**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 librar','y search path (needed for cross comp'+
+  'ile)'#010+
   '**2Xe_Use external linker'#010+
   '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
-  'to exec','utable'#010+
+  'to executable'#010+
   '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
-  '**2Xi_Use internal linker'#010+
+  '**2Xi_Use internal li','nker'#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 th','e prefix <x>'#010+
+  '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
   '**2Xr<x>_Set library search path to <x> (needed for cross compile) (Be'+
   'OS, Linux)'#010+
-  '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
-  ', Linux, Mac OS, Solaris)'#010+
+  '**','2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeB'+
+  'SD, Linux, Mac OS, Solaris)'#010+
   '**2Xs_Strip all symbols from executable'#010+
-  '**2XS_Try ','to link 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 (-s','tatic 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 with','out waiting'#000
+  '**1h_Shows this help without waiting'#000
 );

+ 12 - 5
compiler/ncgcnv.pas

@@ -377,7 +377,7 @@ interface
       end;
 
     procedure Tcgtypeconvnode.second_nil_to_methodprocvar;
-    
+
     var r:Treference;
 
     begin
@@ -512,16 +512,23 @@ interface
             else
               internalerror(121120001);
          end;
-         current_asmdata.getjumplabel(l1);
-         cg.a_cmp_const_reg_label(current_asmdata.CurrAsmList,OS_ADDR,OC_EQ,0,location.register,l1);
          hd:=tobjectdef(left.resultdef);
          while assigned(hd) do
            begin
              ImplIntf:=hd.find_implemented_interface(tobjectdef(resultdef));
              if assigned(ImplIntf) then
                begin
-                 cg.a_op_const_reg(current_asmdata.CurrAsmList,OP_ADD,OS_ADDR,ImplIntf.ioffset,location.register);
-                 break;
+                 case ImplIntf.IType of
+                   etStandard:
+                     begin
+                       current_asmdata.getjumplabel(l1);
+                       cg.a_cmp_const_reg_label(current_asmdata.CurrAsmList,OS_ADDR,OC_EQ,0,location.register,l1);
+                       cg.a_op_const_reg(current_asmdata.CurrAsmList,OP_ADD,OS_ADDR,ImplIntf.ioffset,location.register);
+                       break;
+                     end;
+                   else
+                     internalerror(200802163);
+                 end;
                end;
              hd:=hd.childof;
            end;

+ 52 - 1
compiler/ncnv.pas

@@ -2658,11 +2658,62 @@ implementation
 
 
     function ttypeconvnode.first_class_to_intf : tnode;
+      var
+        hd : tobjectdef;
+        ImplIntf : TImplementedInterface;
       begin
-         first_class_to_intf:=nil;
+         result:=nil;
          expectloc:=LOC_REGISTER;
+         hd:=tobjectdef(left.resultdef);
+         while assigned(hd) do
+           begin
+             ImplIntf:=hd.find_implemented_interface(tobjectdef(resultdef));
+             if assigned(ImplIntf) then
+               begin
+                 case ImplIntf.IType of
+                   etStandard:
+                     { handle in pass 2 }
+                     ;
+                   etFieldValue:
+                     if is_interface(tobjectdef(resultdef)) then
+                       begin
+                         result:=left;
+                         propaccesslist_to_node(result,tpropertysym(implintf.implementsgetter).owner,tpropertysym(implintf.implementsgetter).propaccesslist[palt_read]);
+                         left:=nil;
+                       end
+                     else
+                       begin
+                         internalerror(200802213);
+                       end;
+                   etStaticMethodResult,
+                   etVirtualMethodResult:
+                     if is_interface(tobjectdef(resultdef)) then
+                       begin
+                         { constructor create(l:tnode; v : tprocsym;st : TSymtable; mp: tnode; callflags:tcallnodeflags); }
+                         result:=ccallnode.create(nil,tprocsym(tpropertysym(implintf.implementsgetter).propaccesslist[palt_read].firstsym^.sym),
+                           tprocsym(tpropertysym(implintf.implementsgetter).propaccesslist[palt_read].firstsym^.sym).owner,
+                           left,[]);
+                         addsymref(tpropertysym(implintf.implementsgetter).propaccesslist[palt_read].firstsym^.sym);
+                         left:=nil;
+                       end
+                     else if is_class(tobjectdef(resultdef)) then
+                       begin
+                         internalerror(200802211);
+                       end
+                     else
+                       internalerror(200802231);
+                   else
+                     internalerror(200802165);
+                 end;
+                 break;
+               end;
+             hd:=hd.childof;
+           end;
+         if hd=nil then
+           internalerror(200802164);
       end;
 
+
     function ttypeconvnode._first_int_to_int : tnode;
       begin
          result:=first_int_to_int;

+ 12 - 5
compiler/nobj.pas

@@ -509,7 +509,7 @@ implementation
                 if assigned(implprocdef) then
                   ImplIntf.AddImplProc(implprocdef)
                 else
-                  if ImplIntf.IType = etStandard then
+                  if ImplIntf.IType=etStandard then
                     Message1(sym_e_no_matching_implementation_found,tprocdef(def).fullprocname(false));
               end;
           end;
@@ -1206,10 +1206,17 @@ implementation
         { VTable }
         current_asmdata.asmlists[al_globals].concat(Tai_const.Createname(intf_get_vtbl_name(AImplIntf.VtblImplIntf),0));
         { IOffset field }
-        if AImplIntf.VtblImplIntf.IType = etStandard then
-          current_asmdata.asmlists[al_globals].concat(Tai_const.Create_pint(AImplIntf.VtblImplIntf.IOffset))
-        else
-          current_asmdata.asmlists[al_globals].concat(Tai_const.Create_pint(AImplIntf.VtblImplIntf.FieldOffset));
+        case AImplIntf.VtblImplIntf.IType of
+          etStandard:
+            current_asmdata.asmlists[al_globals].concat(Tai_const.Create_pint(AImplIntf.VtblImplIntf.IOffset));
+          etFieldValue,
+          etVirtualMethodResult,
+          etStaticMethodResult:
+            ;
+          else
+            internalerror(200802162);
+        end;
+
         { IIDStr }
         current_asmdata.getdatalabel(iidlabel);
         rawdata.concat(cai_align.create(const_align(sizeof(pint))));

+ 104 - 2
compiler/nutils.pas

@@ -27,7 +27,8 @@ interface
 
   uses
     globtype,
-    symtype,symsym,node;
+    symtype,symsym,symbase,symtable,
+    node;
 
   const
     NODE_COMPLEXITY_INF = 255;
@@ -81,12 +82,14 @@ interface
     { tries to simplify the given node }
     procedure dosimplify(var n : tnode);
 
+    procedure propaccesslist_to_node(var p1:tnode;st:TSymtable;pl:tpropaccesslist);
+    function node_to_propaccesslist(p1:tnode):tpropaccesslist;
 
 implementation
 
     uses
       cutils,verbose,constexp,globals,
-      symconst,symbase,symdef,symtable,
+      symconst,symdef,
       defutil,defcmp,
       nbas,ncon,ncnv,nld,nflw,nset,ncal,nadd,nmem,
       cpubase,cgbase,procinfo,
@@ -801,4 +804,103 @@ implementation
         until not(treechanged);
       end;
 
+
+    procedure propaccesslist_to_node(var p1:tnode;st:TSymtable;pl:tpropaccesslist);
+      var
+        plist : ppropaccesslistitem;
+      begin
+        plist:=pl.firstsym;
+        while assigned(plist) do
+         begin
+           case plist^.sltype of
+             sl_load :
+               begin
+                 addsymref(plist^.sym);
+                 if not assigned(st) then
+                   st:=plist^.sym.owner;
+                 { p1 can already contain the loadnode of
+                   the class variable. When there is no tree yet we
+                   may need to load it for with or objects }
+                 if not assigned(p1) then
+                  begin
+                    case st.symtabletype of
+                      withsymtable :
+                        p1:=tnode(twithsymtable(st).withrefnode).getcopy;
+                      ObjectSymtable :
+                        p1:=load_self_node;
+                    end;
+                  end;
+                 if assigned(p1) then
+                  p1:=csubscriptnode.create(plist^.sym,p1)
+                 else
+                  p1:=cloadnode.create(plist^.sym,st);
+               end;
+             sl_subscript :
+               begin
+                 addsymref(plist^.sym);
+                 p1:=csubscriptnode.create(plist^.sym,p1);
+               end;
+             sl_typeconv :
+               p1:=ctypeconvnode.create_explicit(p1,plist^.def);
+             sl_absolutetype :
+               begin
+                 p1:=ctypeconvnode.create(p1,plist^.def);
+                 include(p1.flags,nf_absolute);
+               end;
+             sl_vec :
+               p1:=cvecnode.create(p1,cordconstnode.create(plist^.value,plist^.valuedef,true));
+             else
+               internalerror(200110205);
+           end;
+           plist:=plist^.next;
+         end;
+      end;
+
+
+    function node_to_propaccesslist(p1:tnode):tpropaccesslist;
+      var
+        sl : tpropaccesslist;
+
+        procedure addnode(p:tnode);
+        begin
+          case p.nodetype of
+            subscriptn :
+              begin
+                addnode(tsubscriptnode(p).left);
+                sl.addsym(sl_subscript,tsubscriptnode(p).vs);
+              end;
+            typeconvn :
+              begin
+                addnode(ttypeconvnode(p).left);
+                if nf_absolute in ttypeconvnode(p).flags then
+                  sl.addtype(sl_absolutetype,ttypeconvnode(p).totypedef)
+                else
+                  sl.addtype(sl_typeconv,ttypeconvnode(p).totypedef);
+              end;
+            vecn :
+              begin
+                addnode(tvecnode(p).left);
+                if tvecnode(p).right.nodetype=ordconstn then
+                  sl.addconst(sl_vec,tordconstnode(tvecnode(p).right).value,tvecnode(p).right.resultdef)
+                else
+                  begin
+                    Message(parser_e_illegal_expression);
+                    { recovery }
+                    sl.addconst(sl_vec,0,tvecnode(p).right.resultdef);
+                  end;
+             end;
+            loadn :
+              sl.addsym(sl_load,tloadnode(p).symtableentry);
+            else
+              internalerror(200310282);
+          end;
+        end;
+
+      begin
+        sl:=tpropaccesslist.create;
+        addnode(p1);
+        result:=sl;
+      end;
+
+
 end.

+ 34 - 25
compiler/pdecvar.pas

@@ -55,7 +55,7 @@ implementation
        fmodule,htypechk,
        { pass 1 }
        node,pass_1,aasmdata,
-       nmat,nadd,ncal,nset,ncnv,ninl,ncon,nld,nflw,nmem,
+       nmat,nadd,ncal,nset,ncnv,ninl,ncon,nld,nflw,nmem,nutils,
        { codegen }
        ncgutil,
        { parser }
@@ -623,54 +623,63 @@ implementation
          { Parse possible "implements" keyword }
          if try_to_consume(_IMPLEMENTS) then
            begin
-             consume(_ID);
-             try
-               { NOTE: This code will be fixed when the strings are added to the localized string table }
-               if not is_interface(p.propdef) then
+             single_type(def,false);
+
+             if compare_defs(def,p.propdef,nothingn)<te_equal then
                begin
-                 Comment(V_Error, 'Implements property must have interface type');
+                 message2(parser_e_implements_must_have_correct_type,def.GetTypeName,p.propdef.GetTypeName);
                  exit;
                end;
-               if pattern <> p.propdef.mangledparaname() then
+             if not is_class_or_interface(def) then
                begin
-                 Comment(V_Error, 'Implements-property must implement interface of correct type');
+                 message(parser_e_implements_must_be_class_or_interface);
                  exit;
                end;
-               if not assigned(p.propaccesslist[palt_read].firstsym) then
+             if not assigned(p.propaccesslist[palt_read].firstsym) then
                begin
-                 Comment(V_Error, 'Implements-property must have read specifier');
+                 message(parser_e_implements_must_read_specifier);
                  exit;
                end;
-               if assigned(p.propaccesslist[palt_write].firstsym) then
+             if assigned(p.propaccesslist[palt_write].firstsym) then
                begin
-                 Comment(V_Error, 'Implements-property must not have write-specifier');
+                 message(parser_e_implements_must_not_have_write_specifier);
                  exit;
                end;
-               if assigned(p.propaccesslist[palt_stored].firstsym) then
+             if assigned(p.propaccesslist[palt_stored].firstsym) then
                begin
-                 Comment(V_Error, 'Implements-property must not have stored-specifier');
+                 message(parser_e_implements_must_not_have_stored_specifier);
                  exit;
                end;
-               found:=false;
-               for i:=0 to aclass.ImplementedInterfaces.Count-1 do
+             found:=false;
+             for i:=0 to aclass.ImplementedInterfaces.Count-1 do
                begin
                  ImplIntf:=TImplementedInterface(aclass.ImplementedInterfaces[i]);
-                 { FIXME: Is this check valid? }
-                 if ImplIntf.IntfDef.Objname^=pattern then
+
+                 if compare_defs(def,ImplIntf.IntfDef,nothingn)>=te_equal then
                  begin
                    found:=true;
                    break;
                  end;
                end;
-               if found then
+             if found then
                begin
-                 ImplIntf.IType := etFieldValue;
-                 ImplIntf.FieldOffset := tfieldvarsym(p.propaccesslist[palt_read].firstsym^.sym).fieldoffset;
+                 ImplIntf.ImplementsGetter:=p;
+                 case p.propaccesslist[palt_read].firstsym^.sym.typ of
+                   procsym :
+                     begin
+                       if (po_virtualmethod in tprocdef(p.propaccesslist[palt_read].procdef).procoptions) then
+                         ImplIntf.IType:=etVirtualMethodResult
+                       else
+                         ImplIntf.IType:=etStaticMethodResult;
+                     end;
+                   fieldvarsym :
+                     ImplIntf.IType:=etFieldValue;
+                   else
+                     internalerror(200802161);
+                 end;
                end
-               else
-                 Comment(V_Error, 'Implements-property used on unimplemented interface');
-             finally
-             end;
+             else
+               message1(parser_e_implements_uses_non_implemented_interface,def.GetTypeName);
          end;
 
          { remove temporary procvardefs }

+ 0 - 102
compiler/pexpr.pas

@@ -41,10 +41,6 @@ interface
 
     procedure string_dec(var def: tdef);
 
-    procedure propaccesslist_to_node(var p1:tnode;st:TSymtable;pl:tpropaccesslist);
-
-    function node_to_propaccesslist(p1:tnode):tpropaccesslist;
-
     function parse_paras(__colon,__namedpara : boolean;end_of_paras : ttoken) : tnode;
 
     { the ID token has to be consumed before calling this function }
@@ -141,104 +137,6 @@ implementation
        end;
 
 
-    procedure propaccesslist_to_node(var p1:tnode;st:TSymtable;pl:tpropaccesslist);
-      var
-        plist : ppropaccesslistitem;
-      begin
-        plist:=pl.firstsym;
-        while assigned(plist) do
-         begin
-           case plist^.sltype of
-             sl_load :
-               begin
-                 addsymref(plist^.sym);
-                 if not assigned(st) then
-                   st:=plist^.sym.owner;
-                 { p1 can already contain the loadnode of
-                   the class variable. When there is no tree yet we
-                   may need to load it for with or objects }
-                 if not assigned(p1) then
-                  begin
-                    case st.symtabletype of
-                      withsymtable :
-                        p1:=tnode(twithsymtable(st).withrefnode).getcopy;
-                      ObjectSymtable :
-                        p1:=load_self_node;
-                    end;
-                  end;
-                 if assigned(p1) then
-                  p1:=csubscriptnode.create(plist^.sym,p1)
-                 else
-                  p1:=cloadnode.create(plist^.sym,st);
-               end;
-             sl_subscript :
-               begin
-                 addsymref(plist^.sym);
-                 p1:=csubscriptnode.create(plist^.sym,p1);
-               end;
-             sl_typeconv :
-               p1:=ctypeconvnode.create_explicit(p1,plist^.def);
-             sl_absolutetype :
-               begin
-                 p1:=ctypeconvnode.create(p1,plist^.def);
-                 include(p1.flags,nf_absolute);
-               end;
-             sl_vec :
-               p1:=cvecnode.create(p1,cordconstnode.create(plist^.value,plist^.valuedef,true));
-             else
-               internalerror(200110205);
-           end;
-           plist:=plist^.next;
-         end;
-      end;
-
-
-    function node_to_propaccesslist(p1:tnode):tpropaccesslist;
-      var
-        sl : tpropaccesslist;
-
-        procedure addnode(p:tnode);
-        begin
-          case p.nodetype of
-            subscriptn :
-              begin
-                addnode(tsubscriptnode(p).left);
-                sl.addsym(sl_subscript,tsubscriptnode(p).vs);
-              end;
-            typeconvn :
-              begin
-                addnode(ttypeconvnode(p).left);
-                if nf_absolute in ttypeconvnode(p).flags then
-                  sl.addtype(sl_absolutetype,ttypeconvnode(p).totypedef)
-                else
-                  sl.addtype(sl_typeconv,ttypeconvnode(p).totypedef);
-              end;
-            vecn :
-              begin
-                addnode(tvecnode(p).left);
-                if tvecnode(p).right.nodetype=ordconstn then
-                  sl.addconst(sl_vec,tordconstnode(tvecnode(p).right).value,tvecnode(p).right.resultdef)
-                else
-                  begin
-                    Message(parser_e_illegal_expression);
-                    { recovery }
-                    sl.addconst(sl_vec,0,tvecnode(p).right.resultdef);
-                  end;
-             end;
-            loadn :
-              sl.addsym(sl_load,tloadnode(p).symtableentry);
-            else
-              internalerror(200310282);
-          end;
-        end;
-
-      begin
-        sl:=tpropaccesslist.create;
-        addnode(p1);
-        result:=sl;
-      end;
-
-
     function parse_paras(__colon,__namedpara : boolean;end_of_paras : ttoken) : tnode;
       var
          p1,p2,argname : tnode;

+ 4 - 6
compiler/symdef.pas

@@ -206,10 +206,7 @@ interface
          VtblImplIntf : TImplementedInterface;
          NameMappings : TFPHashList;
          ProcDefs     : TFPObjectList;
-         // FieldOffset can be merged with IOffset. But then, fpc is not allowed to genrate a vmtentry.
-         // Right now, fpc generate an entry for all implemented interfaces (but it should just for etStandard ones)
-         // - Ivo Steinmann
-         FieldOffset     : longint;
+         ImplementsGetter :  tsym;
          constructor create(aintf: tobjectdef);
          constructor create_deref(d:tderef);
          destructor  destroy; override;
@@ -4120,7 +4117,6 @@ implementation
         intfdef:=aintf;
         IOffset:=-1;
         IType:=etStandard;
-        FieldOffset:=-1;
         NameMappings:=nil;
         procdefs:=nil;
       end;
@@ -4133,7 +4129,6 @@ implementation
         intfdefderef:=d;
         IOffset:=-1;
         IType:=etStandard;
-        FieldOffset:=-1;
         NameMappings:=nil;
         procdefs:=nil;
       end;
@@ -4221,6 +4216,9 @@ implementation
         i : longint;
       begin
         result:=false;
+        { interfaces being implemented through delegation are not mergable (FK) }
+        if MergingIntf.IType<>etStandard then
+          exit;
         weight:=0;
         { empty interface is mergeable }
         if ProcDefs.Count=0 then

+ 258 - 0
tests/tbs/tb0546.pp

@@ -0,0 +1,258 @@
+{ test code based on code from ttp://www.geocities.com/svi37/cyber/delphi9/iimplementation.html }
+{$ifdef fpc}
+{$mode delphi}
+{$endif fpc}
+uses
+  sysutils;
+
+type
+   IXInterface = interface(IUnknown)
+   ['{713252E5-4636-11D5-B572-00AA00ACFD08}']
+      procedure XStaticMethod;
+      procedure XVirtualMethod;
+   end;
+
+   IYInterface = interface(IUnknown)
+   ['{713252E6-4636-11D5-B572-00AA00ACFD08}']
+      procedure YMethod;
+   end;
+
+   IZInterface = interface(IUnknown)
+   ['{713252E4-4636-11D5-B572-00AA00ACFD08}']
+   end;
+
+
+type
+   TInnerObject = class(TAggregatedObject,IXInterface,IYInterface)
+   public
+      procedure XStaticMethod;
+      procedure XVirtualMethod; virtual;
+      procedure YMethod;
+   end;
+
+   TSpecialObject = class(TInnerObject,IXInterface,IYInterface)
+   public
+      procedure XStaticMethod;
+      procedure XVirtualMethod; override;
+      procedure YMethod;
+   end;
+
+   TFoo = class({!!!! IXInterface, }IYInterface,IZInterface)
+   private
+      FInnerX: TInnerObject;
+   protected
+    function QueryInterface(const IID: TGUID; out Obj): HResult; virtual; stdcall;
+    function _AddRef: Integer; stdcall;
+    function _Release: Integer; stdcall;
+    function GetX: TInnerObject; virtual;
+    function GetY: IYInterface;
+   public
+      constructor Create;
+      destructor  Destroy; override;
+//!!!!      property  InnerX: TInnerObject read GetX implements IXInterface;
+      property  InnerY: IYInterface  read GetY implements IYInterface;
+   end;
+
+   TBar = class(TFoo,{!!!!IXInterface,}IYInterface,IUnknown)
+   private
+    FX: TSpecialObject;
+    FY: IYInterface;
+   protected
+      function GetX: TInnerObject; override;
+   public
+      constructor Create;
+      destructor  Destroy; override;
+      property Y: IYInterface  read FY implements IYInterface;
+//!!!!      property  X: TSpecialObject read FX implements IXInterface;
+   end;
+
+{ TFoo }
+
+constructor TFoo.Create;
+var
+   i: IZInterface;
+begin
+   inherited;
+   i := self;
+   FInnerX := TInnerObject.Create(i);  //interface inh. to IUnknown
+end;
+
+destructor TFoo.Destroy;
+begin
+  WriteLn('TFoo.Destroy');
+  FInnerX.Free;
+  inherited;
+end;
+
+{ TFoo.IUnknown }
+
+function TFoo._AddRef: Integer;
+begin
+   result := -1;
+end;
+
+function TFoo._Release: Integer;
+begin
+   result := -1;
+end;
+
+function TFoo.QueryInterface(const IID: TGUID; out Obj): HResult;
+begin
+  if GetInterface(IID, Obj) then Result := 0 else Result := E_NOINTERFACE;
+end;function TFoo.GetX: TInnerObject;
+begin
+   result := FInnerX;
+end;
+
+{ TFoo.IUnknown }
+
+
+function TFoo.GetY: IYInterface;
+begin
+   result := FInnerX;
+end;
+
+{ TBar }
+
+constructor TBar.Create;
+begin
+   inherited;
+   FX := TSpecialObject.Create(Self);  //explicit IUnknown
+   FY := FX;
+end;
+
+destructor TBar.Destroy;
+begin
+  WriteLn('TBar.Destroy');
+  FY := nil;
+  FX.Free;
+  inherited;
+end;
+
+function TBar.GetX: TInnerObject;
+begin
+   result := FX;
+end;
+
+
+{ TInnerObject }
+
+procedure TInnerObject.XStaticMethod;
+begin
+  WriteLn(Format(
+  'Calls TInnerObject.XStaticMethod  on a %s',[ClassName]));
+end;
+
+procedure TInnerObject.XVirtualMethod;
+begin
+  WriteLn(Format(
+  'Calls TInnerObject.XVirtualMethod on a %s',[ClassName]));
+end;
+
+
+procedure TInnerObject.YMethod;
+begin
+  WriteLn(Format(
+  'Calls TInnerObject.YMethod on a %s',[ClassName]));
+end;
+
+{ TSpecialObject }
+
+procedure TSpecialObject.XStaticMethod;
+begin
+  WriteLn(Format(
+  'Calls TSpecialObject.XStaticMethod  on a %s',[ClassName]));
+end;
+
+procedure TSpecialObject.XVirtualMethod;
+begin
+  // inherited;
+  WriteLn(Format(
+  'Calls TSpecialObject.XVirtualMethod on a %s',[ClassName]));
+end;
+
+procedure TSpecialObject.YMethod;
+begin
+  WriteLn(Format(
+  'Calls TSpecialObject.YMethod on a %s',[ClassName]));
+end;
+
+procedure TestFoo(AFoo: TFoo);
+var
+   o: TFoo;
+   x: IXInterface;
+   y: IYInterface;
+   z: IZInterface;
+begin
+
+  o := AFoo;
+
+//!!!!  x := o;
+//!!!!  x.XStaticMethod;   // if AFoo is TBar TFoo.XStatic hides TBar.XStatic
+//!!!!  x.XVirtualMethod;
+
+  y := o;
+  y.YMethod;
+
+//!!!!  z := x as IZInterface;
+  z := y as IZInterface;
+
+  z := o;
+//!!!!  x := z as IXInterface;
+
+end;
+
+procedure TestBar(ABar: TBar);
+var
+   o: TBar;
+   x: IXInterface;
+   y: IYInterface;
+   z: IZInterface;
+begin
+
+  o := ABar;
+
+//!!!!  x := o;
+//!!!!  x.XStaticMethod;
+//!!!!  x.XVirtualMethod;
+
+  y := o;
+  y.YMethod;
+
+//!!!!  z := x as IZInterface;
+  z := y as IZInterface;
+
+  z := o;
+//!!!!  x := z as IXInterface;
+
+end;
+
+procedure Test;
+var
+   AFoo: TFoo;
+   ABar: TBar;
+begin
+   AFoo := TFoo.Create;
+   ABar := TBar.Create;
+
+   WriteLn('***TestFoo(AFoo)*****************');
+   TestFoo(AFoo);
+
+   WriteLn('***TestFoo(ABar)*****************');
+   TestFoo(ABar);
+
+   WriteLn('***TestBar(ABar)*****************');
+   TestBar(ABar);
+
+   AFoo.Free;
+   ABar.Free;
+end;
+
+
+begin
+   WriteLn('IntGetter.TInnerObject.InstanceSize: ',TInnerObject.InstanceSize);
+   WriteLn('IntGetter.TSpecialObject.InstanceSize: ',TSpecialObject.InstanceSize);
+   WriteLn('IntGetter.TFoo.InstanceSize: ',TFoo.InstanceSize);
+   WriteLn('IntGetter.TBar.InstanceSize: ',TBar.InstanceSize);
+   Test;
+end.