From 963a4d7b23188641f55af88e233622a2e4ecd8bf Mon Sep 17 00:00:00 2001 From: svenbarth Date: Sun, 20 Feb 2011 11:41:55 +0000 Subject: [PATCH] Commit of a completely restructured helper implementation. Instead of changing objectdefs with odt_classhelper to odt_class, they'll have the odt_helper type assigned to and this will be kept. This also implies that the parent of a helper is its true parent while the extended type is set to a field in tobjectdef (extendeddef). This change became necessary of the following reasons: - Records don't support inheritance, thus for "record helpers" some creativity would have been necessary to implement them; with the new implementation this is more easily - the new approach allows for easy checks regarding virtual methods and their overrides which would have been more complicated in the old variant - if someone feels the need the types of helpers (object, interface) can be added rather easily - unnecessary things like VMT generation can be disabled now details: - msg*: * moved some messages from parser to type * adjusted a message ("class helper" => "helper") - symdef.pas: * renamed "helperparent" to "extendeddef" and changed its type from "tobjectdef" to "tabstractrecorddef", so records can be extended as well (somewhen in the near future) * removed "finish_class_helper" method as it isn't necessary (luckily I haven't yet adjusted the ObjC variant) * changed name of "is_objectpascal_classhelper" to "is_objectpascal_helper" to reflect that this function applies to all helper types * tobjectdef.create: ImplementedInterfaces isn't created for odt_helper anymore * tobjectdef.alignment: for helpers it's the same as for classes although this shouldn't be used anywhere... * tobjectdef.vmtmethodoffset: set to 0 for helpers to be sure... * tobjectdef.needs_inittable: not needed for helpers (no fields allowed) * is_objectpascal_helper: only needs check for "odt_helper" object type - symconst.pas: * changed odt_classhelper to more general odt_helper * added new type "thelpertype" which is used to check that "(record|class) helper" corresponds with the given extended type (as Delphi XE checks this as well this strict solution can be kept for modes Delphi and ObjFPC) - symtable.pas: * extended "searchsym_in_class" with the possibility to disable the search for helper methods (needed for inherited) => this implies changing all occurences of "searchsym_in_class" with a "true" except some special locations * renamed "search_objectpascal_classhelper" to "search_objectpascal_helper" * searchsym_in_class: ** when an extended method is defined with "overload" it can be that a same named method of the extended class might be called (sadly this means that this search was unnecessary...) ** contextclassh is the def of the helper in the case of an inherited call inside the helper's implementation ** when methods inside a helper are searched, it must be searched in the extended type first - ptype.pas: * single_type is used to parse the parent of a helper as well, so allow a helper if the stoParseClassParent is given (needs check in pdecobj.pas/parse_class_parents for normal classes) * read_named_type: currently the only case when something <> ht_none is passed to the modified parse_objdec (see below) is when the combination "class helper" is encountered ("record helper" will be another one) - pinline.pas: adjustment for extended "searchsym_in_class" - pexpr.pas: * adjustments regarding "searchsym_in_class" and "is_objectpascal_helper" * factor/factor_read_id: moved the check for "TSomeClassType.SomeMethod" outside of the "is_class" check * factor: ** in case of an inherited we need to search inside the extended type first (Note: this needs to be extended to find methods in the helper parent if no method is found in the extended type) ** we also need to disable the search for helper methods when searching for an inherited method (Note: it might be better to introduce a enum to decide whether a helper method should search before or after the methods of the extended type or even never) - pdecsub.pas: * insert_self_and_vmt_para: in a helper the type of Self is of the extended type * pd_abstract, pd_final: more nice error message * pd_override, pd_message, pd_reintroduce: adjusted checks because now "is_class" is no longer true for helpers * proc_direcdata: allowed "abstract" for helpers (only to produce a more nice error message) * parse_proc_direc: adjustment because of "is_objectpascal_helper" - pdecobj.pas: * adjustments regarding "is_objectpascal_helper" * adjusted object_dec to take the type of the helper (class, record) as a parameter to be able to check whether the correct extended type was given * struct_property_dec: properties are allowed in helpers * parse_object_options: nothing to be parsed for helpers (at least I hope so ^^) * parse_parent_classes: ** the parent of a helper is now parsed as a normal parent, the extended type is parsed in an extra procedure ** check for "sealed" no longer needed ** added check that the parsed parent of a helper is indeed a helper ** allow to parse the closing ")" of the helper's parent * parse_extended_class: ** new procedure that parses the type which is extended ** it checks that the extended type is a class for "class helper" and a record for "record helper" ** it checks that a helper extends the same class or a subclass for class helpers ** it checks that a helper extends the same record for record helpers * parse_object_members: ** "type", "const", "var" is allowed in helpers ** don't exclude flags regarding virtual methods, they are needed for the checks in mode Delphi (this implies that VMT loading must be disabled for helpers) * object_dec: ** don't change "odt_helper" to "odt_class", but still include the "oo_is_classhelper" flag ** allow the parsing of object options (there are none) ** parse the extended type for helpers - pdecl.pas * adjustment because of extension of object_dec * types_dec: remove the call to finish_classhelper - objcdef.pas * objcaddencodedtype, objcdochecktype: add references to helpers as implicit pointers although that should not be used in any way... - nld.pas * tloadnode.pass_typecheck: self is a reference to the extended type - nflw.pas * create_for_in_loop: adjustment because of changed procedure and inheritance type - ncgrtti.pas * TRTTIWriter.write_rtti_data: disable for helpers for now (I need to check what Delphi does here) - ncgld.pas * tcgloadnode.pass_generate_code: virtual methods of helpers are treated as normal methods - ncgcal.pas * tcgcallnode.pass_generate_code: virtual methods of helpers are treated as normal methods - ncal.pas * tcallnode.pass_typecheck: adjust for extension of tcallcandidates constructor - htypechk.pas * tcallcandidates declaration: extend some methods to (dis)allow the search for helper methods (needed for inherited) * tcallcandidates.collect_overloads_in_struct: ** search first in helpers for methods and stop if none carries the "overload" flag ** move the addition of the procsyms to an extra nested procedure because it's used for helper methods and normal struct methods git-svn-id: branches/svenbarth/classhelpers@16947 - --- compiler/htypechk.pas | 81 +++-- compiler/msg/errore.msg | 27 +- compiler/msgidx.inc | 12 +- compiler/msgtxt.inc | 727 ++++++++++++++++++++-------------------- compiler/ncal.pas | 2 +- compiler/ncgcal.pas | 1 + compiler/ncgld.pas | 3 +- compiler/ncgrtti.pas | 4 +- compiler/nflw.pas | 4 +- compiler/nld.pas | 2 + compiler/objcdef.pas | 6 +- compiler/pdecl.pas | 5 +- compiler/pdecobj.pas | 139 +++++--- compiler/pdecsub.pas | 66 ++-- compiler/pexpr.pas | 42 ++- compiler/pinline.pas | 2 +- compiler/ptype.pas | 27 +- compiler/symconst.pas | 8 +- compiler/symdef.pas | 53 ++- compiler/symtable.pas | 57 +++- 20 files changed, 702 insertions(+), 566 deletions(-) diff --git a/compiler/htypechk.pas b/compiler/htypechk.pas index 14ec718e95..6a80db55a4 100644 --- a/compiler/htypechk.pas +++ b/compiler/htypechk.pas @@ -67,12 +67,12 @@ interface FParaNode : tnode; FParaLength : smallint; FAllowVariant : boolean; - procedure collect_overloads_in_struct(structdef:tabstractrecorddef;ProcdefOverloadList:TFPObjectList); + procedure collect_overloads_in_struct(structdef:tabstractrecorddef;ProcdefOverloadList:TFPObjectList;searchhelpers:boolean); procedure collect_overloads_in_units(ProcdefOverloadList:TFPObjectList; objcidcall,explicitunit: boolean); - procedure create_candidate_list(ignorevisibility,allowdefaultparas,objcidcall,explicitunit:boolean); + procedure create_candidate_list(ignorevisibility,allowdefaultparas,objcidcall,explicitunit,searchhelpers:boolean); function proc_add(st:tsymtable;pd:tprocdef;objcidcall: boolean):pcandidate; public - constructor create(sym:tprocsym;st:TSymtable;ppn:tnode;ignorevisibility,allowdefaultparas,objcidcall,explicitunit:boolean); + constructor create(sym:tprocsym;st:TSymtable;ppn:tnode;ignorevisibility,allowdefaultparas,objcidcall,explicitunit,searchhelpers:boolean); constructor create_operator(op:ttoken;ppn:tnode); destructor destroy;override; procedure list(all:boolean); @@ -1758,7 +1758,7 @@ implementation TCallCandidates ****************************************************************************} - constructor tcallcandidates.create(sym:tprocsym;st:TSymtable;ppn:tnode;ignorevisibility,allowdefaultparas,objcidcall,explicitunit:boolean); + constructor tcallcandidates.create(sym:tprocsym;st:TSymtable;ppn:tnode;ignorevisibility,allowdefaultparas,objcidcall,explicitunit,searchhelpers:boolean); begin if not assigned(sym) then internalerror(200411015); @@ -1766,7 +1766,7 @@ implementation FProcsym:=sym; FProcsymtable:=st; FParanode:=ppn; - create_candidate_list(ignorevisibility,allowdefaultparas,objcidcall,explicitunit); + create_candidate_list(ignorevisibility,allowdefaultparas,objcidcall,explicitunit,searchhelpers); end; @@ -1776,7 +1776,7 @@ implementation FProcsym:=nil; FProcsymtable:=nil; FParanode:=ppn; - create_candidate_list(false,false,false,false); + create_candidate_list(false,false,false,false,false); end; @@ -1795,19 +1795,63 @@ implementation end; - procedure tcallcandidates.collect_overloads_in_struct(structdef:tabstractrecorddef;ProcdefOverloadList:TFPObjectList); + procedure tcallcandidates.collect_overloads_in_struct(structdef:tabstractrecorddef;ProcdefOverloadList:TFPObjectList;searchhelpers:boolean); + + function processprocsym(srsym:tprocsym):boolean; + var + j : integer; + pd : tprocdef; + begin + { Store first procsym found } + if not assigned(FProcsym) then + FProcsym:=srsym; + { add all definitions } + result:=false; + for j:=0 to srsym.ProcdefList.Count-1 do + begin + pd:=tprocdef(srsym.ProcdefList[j]); + if po_overload in pd.procoptions then + result:=true; + ProcdefOverloadList.Add(srsym.ProcdefList[j]); + end; + end; + var - j : integer; - pd : tprocdef; srsym : tsym; hashedid : THashedIDString; hasoverload : boolean; + helperdef : tobjectdef; begin if FOperator=NOTOKEN then hashedid.id:=FProcsym.name else hashedid.id:=overloaded_names[FOperator]; hasoverload:=false; + { first search for potential symbols in the class helpers (this is + disabled in an inherited call if the method is available in the + extended class) } + if is_class(structdef) then + if search_last_objectpascal_helper(tobjectdef(structdef), helperdef) and searchhelpers then + begin + srsym:=nil; + while assigned(helperdef) do + begin + srsym:=tsym(helperdef.symtable.FindWithHash(hashedid)); + if assigned(srsym) and + { Delphi allows hiding a property by a procedure with the same name } + (srsym.typ=procsym) then + begin + hasoverload := processprocsym(tprocsym(srsym)); + { when there is no explicit overload we stop searching } + if not hasoverload then + break; + end; + helperdef:=helperdef.childof; + end; + if not hasoverload and assigned(srsym) then + exit; + end; + { now search in the class and its parents or the record } while assigned(structdef) do begin srsym:=tprocsym(structdef.symtable.FindWithHash(hashedid)); @@ -1815,18 +1859,7 @@ implementation { Delphi allows hiding a property by a procedure with the same name } (srsym.typ=procsym) then begin - { Store first procsym found } - if not assigned(FProcsym) then - FProcsym:=tprocsym(srsym); - { add all definitions } - hasoverload:=false; - for j:=0 to tprocsym(srsym).ProcdefList.Count-1 do - begin - pd:=tprocdef(tprocsym(srsym).ProcdefList[j]); - if po_overload in pd.procoptions then - hasoverload:=true; - ProcdefOverloadList.Add(tprocsym(srsym).ProcdefList[j]); - end; + hasoverload:=processprocsym(tprocsym(srsym)); { when there is no explicit overload we stop searching } if not hasoverload then break; @@ -1911,7 +1944,7 @@ implementation end; - procedure tcallcandidates.create_candidate_list(ignorevisibility,allowdefaultparas,objcidcall,explicitunit:boolean); + procedure tcallcandidates.create_candidate_list(ignorevisibility,allowdefaultparas,objcidcall,explicitunit,searchhelpers:boolean); var j : integer; pd : tprocdef; @@ -1929,7 +1962,7 @@ implementation if not objcidcall and (FOperator=NOTOKEN) and (FProcsym.owner.symtabletype in [objectsymtable,recordsymtable]) then - collect_overloads_in_struct(tabstractrecorddef(FProcsym.owner.defowner),ProcdefOverloadList) + collect_overloads_in_struct(tabstractrecorddef(FProcsym.owner.defowner),ProcdefOverloadList,searchhelpers) else if (FOperator<>NOTOKEN) then begin @@ -1939,7 +1972,7 @@ implementation while assigned(pt) do begin if (pt.resultdef.typ=recorddef) then - collect_overloads_in_struct(tabstractrecorddef(pt.resultdef),ProcdefOverloadList); + collect_overloads_in_struct(tabstractrecorddef(pt.resultdef),ProcdefOverloadList,searchhelpers); pt:=tcallparanode(pt.right); end; collect_overloads_in_units(ProcdefOverloadList,objcidcall,explicitunit); diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 37a8dd3bb6..9b50b8b5be 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -368,7 +368,7 @@ scanner_w_illegal_warn_identifier=02087_W_Illegal identifier "$1" for $WARN dire # # Parser # -# 03307 is the last used one +# 03305 is the last used one # % \section{Parser messages} % This section lists all parser messages. The parser takes care of the @@ -917,9 +917,9 @@ parser_e_no_access_specifier_in_interfaces=03172_E_Access specifiers can't be us % The access specifiers \var{public}, \var{private}, \var{protected} and % \var{published} can't be used in interfaces, Objective-C protocols and categories because all methods % of an interface/protocol/category must be public. -parser_e_no_vars_in_interfaces=03173_E_An interface or class helper or Objective-C protocol or category cannot contain fields -% Declarations of fields are not allowed in interfaces, class helpers and Objective-C protocols and categories. -% An interface/class helper/protocol/category can contain only methods and properties with method read/write specifiers. +parser_e_no_vars_in_interfaces=03173_E_An interface, helper or Objective-C protocol or category cannot contain fields +% Declarations of fields are not allowed in interfaces, helpers and Objective-C protocols and categories. +% An interface/helper/protocol/category can contain only methods and properties with method read/write specifiers. parser_e_no_local_proc_external=03174_E_Can't declare local procedure as EXTERNAL % Declaring local procedures as external is not possible. Local procedures % get hidden parameters that will make the chance of errors very high. @@ -1368,18 +1368,13 @@ parser_e_at_least_one_argument_must_be_of_type=03303_E_Either the result or at l parser_e_cant_use_type_parameters_here=03304_E_Type parameters may require initialization/finalization - can't be used in variant records % Type parameters may be specialized with types which (e.g. \var{ansistring}) need initialization/finalization % code which is implicitly generated by the compiler. -parser_e_classhelper_id_expected=03305_E_Class helper identifier expected -% A class helper can only inherit from another class helper. -parser_e_classhelper_must_extend_subclass=03306_E_Derived class helper must extend a subclass of the class extended by the parent class helper -% When a class helper inherits from another class helper the extended class must -% extend either the same class as the parent class helper or a subclass of it -parser_e_not_allowed_in_classhelper=03307_E_"$1" is not allowed in class helpers +parser_e_not_allowed_in_classhelper=03305_E_"$1" is not allowed in class helpers % Some directives and specifiers like "virtual", "dynamic", "published" aren't % allowed inside class helpers in mode ObjFPC (they are ignored in mode Delphi). % \end{description} # Type Checking # -# 04095 is the last used one +# 04100 is the last used one # % \section{Type checking errors} % This section lists all errors that can occur when type checking is @@ -1727,6 +1722,16 @@ type_e_type_parameters_are_not_allowed_here=04097_E_Type parameters are not allo % Type parameters are only allowed for methods of generic classes, records or objects type_e_generic_declaration_does_not_match=04098_E_Generic declaration of "$1" differs from previous declaration % Generic declaration does not match the previous declaration +type_e_helper_type_expected=04099_E_Helper type expected +% The compiler expected a \var{class helper} type. +type_e_record_type_expected=04100_E_Record type expected +% The compiler expected a \var{record} type. +type_e_class_helper_must_extend_subclass=04101_E_Derived class helper must extend a subclass of "$1" or the class itself +% If a class helper inherits from another class helper the extended class must +% extend either the same class as the parent class helper or a subclass of it +type_e_record_helper_must_extend_same_record=04102_E_Derived record helper must extend "$1" +% If a record helper inherits from another record helper it must extend the same +% record that the parent record helper extended. % % \end{description} # diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 2329f7aadd..f777b2d0ff 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -393,9 +393,7 @@ const parser_e_no_constructor_in_records=03302; parser_e_at_least_one_argument_must_be_of_type=03303; parser_e_cant_use_type_parameters_here=03304; - parser_e_classhelper_id_expected=03305; - parser_e_classhelper_must_extend_subclass=03306; - parser_e_not_allowed_in_classhelper=03307; + parser_e_not_allowed_in_classhelper=03305; type_e_mismatch=04000; type_e_incompatible_types=04001; type_e_not_equal_types=04002; @@ -485,6 +483,10 @@ const type_e_generics_cannot_reference_itself=04096; type_e_type_parameters_are_not_allowed_here=04097; type_e_generic_declaration_does_not_match=04098; + type_e_helper_type_expected=04099; + type_e_record_type_expected=04100; + type_e_class_helper_must_extend_subclass=04101; + type_e_record_helper_must_extend_same_record=04102; sym_e_id_not_found=05000; sym_f_internal_error_in_symtablestack=05001; sym_e_duplicate_id=05002; @@ -885,9 +887,9 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 58938; + MsgTxtSize = 58973; MsgIdxMax : array[1..20] of longint=( - 24,88,308,99,84,54,111,22,202,63, + 24,88,306,103,84,54,111,22,202,63, 49,20,1,1,1,1,1,1,1,1 ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index e2ad331b4a..0c624f9197 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -299,759 +299,761 @@ const msgtxt : array[0..000245,1..240] of char=( '03171_E_Con- and destructors aren'#039't allowed in interfaces'#000+ '03172_E_Access specifiers can'#039't be used in INTERFACEs and OBJCPROT'+ 'OCOLs'#000+ - '03173_E_An interface or class h','elper or Objective-C protocol or cate'+ - 'gory cannot contain fields'#000+ + '03173_E_An interface, helper or',' Objective-C protocol or category can'+ + 'not contain fields'#000+ '03174_E_Can'#039't declare local procedure as EXTERNAL'#000+ '03175_W_Some fields coming before "$1" weren'#039't initialized'#000+ '03176_E_Some fields coming before "$1" weren'#039't initialized'#000+ - '03177_W_','Some fields coming after "$1" weren'#039't initialized'#000+ + '03177_W_Some fie','lds coming after "$1" weren'#039't initialized'#000+ '03178_E_VarArgs directive (or '#039'...'#039' in MacPas) without CDecl/C'+ 'PPDecl/MWPascal and External'#000+ '03179_E_Self must be a normal (call-by-value) parameter'#000+ - '03180_E_Interface "$1" has no interface ide','ntification'#000+ + '03180_E_Interface "$1" has no interface identificat','ion'#000+ '03181_E_Unknown class field or method identifier "$1"'#000+ '03182_W_Overriding calling convention "$1" with "$2"'#000+ '03183_E_Typed constants of the type "procedure of object" can only be '+ 'initialized with NIL'#000+ - '03184_E_Default value can only',' be assigned to one parameter'#000+ + '03184_E_Default value can only be assi','gned to one parameter'#000+ '03185_E_Default parameter required for "$1"'#000+ '03186_W_Use of unsupported feature!'#000+ '03187_H_C arrays are passed by reference'#000+ '03188_E_C array of const must be the last argument'#000+ '03189_H_Type "$1" redefinition'#000+ - '03190_W','_cdecl'#039'ared functions have no high parameter'#000+ + '03190_W_cdecl'#039'a','red functions have no high parameter'#000+ '03191_W_cdecl'#039'ared functions do not support open strings'#000+ '03192_E_Cannot initialize variables declared as threadvar'#000+ '03193_E_Message directive is only allowed in Classes'#000+ - '03194_E_Procedure or Functi','on expected'#000+ + '03194_E_Procedure or Function expec','ted'#000+ '03195_W_Calling convention directive ignored: "$1"'#000+ '03196_E_REINTRODUCE can'#039't be used in objects'#000+ '03197_E_Each argument must have its own location'#000+ '03198_E_Each argument must have an explicit location'#000+ - '03199_E_Unknown argument locat','ion'#000+ - '03200_E_32 Bit-Integer or pointer variable expected'#000+ + '03199_E_Unknown argument location'#000+ + '0320','0_E_32 Bit-Integer or pointer variable expected'#000+ '03201_E_Goto statements aren'#039't allowed between different procedure'+ 's'#000+ '03202_F_Procedure too complex, it requires too many registers'#000+ '03203_E_Illegal expression'#000+ - '03204_E_Invalid integer exp','ression'#000+ + '03204_E_Invalid integer expression'#000, '03205_E_Illegal qualifier'#000+ '03206_E_High range limit < low range limit'#000+ '03207_E_Exit'#039's parameter must be the name of the procedure it is u'+ 'sed in'#000+ '03208_E_Illegal assignment to for-loop variable "$1"'#000+ - '03209_E_Can'#039't declare local variable ','as EXTERNAL'#000+ + '03209_E_Can'#039't declare local variable as EXTER','NAL'#000+ '03210_E_Procedure is already declared EXTERNAL'#000+ '03211_W_Implicit uses of Variants unit'#000+ '03212_E_Class and static methods can'#039't be used in INTERFACES'#000+ '03213_E_Overflow in arithmetic operation'#000+ '03214_E_Protected or private expected'#000+ - '03','215_E_SLICE can'#039't be used outside of parameter list'#000+ + '03215_E_SL','ICE can'#039't be used outside of parameter list'#000+ '03216_E_A DISPINTERFACE can'#039't have a parent class'#000+ '03217_E_A DISPINTERFACE needs a guid'#000+ '03218_W_Overridden methods must have a related return type. This code '+ - 'may crash, it depends on a Delp','hi parser bug ("$2" is overridden by '+ + 'may crash, it depends on a Delphi parse','r bug ("$2" is overridden by '+ '"$1" which has another return type)'#000+ '03219_E_Dispatch IDs must be ordinal constants'#000+ '03220_E_The range of the array is too large'#000+ '03221_E_The address cannot be taken of bit packed array elements and r'+ - 'ecord ','fields'#000+ - '03222_E_Dynamic arrays cannot be packed'#000+ + 'ecord fields'#000+ + '0','3222_E_Dynamic arrays cannot be packed'#000+ '03223_E_Bit packed array elements and record fields cannot be used as '+ 'loop variables'#000+ '03224_E_VAR, TYPE and CONST are allowed only in records, objects and c'+ 'lasses'#000+ - '03225_E_This type can'#039't be a ge','neric'#000+ - '03226_W_Don'#039't load LINEINFO unit manually, Use the -gl compiler sw'+ - 'itch instead'#000+ + '03225_E_This type can'#039't be a generic'#000+ + '03','226_W_Don'#039't load LINEINFO unit manually, Use the -gl compiler '+ + 'switch instead'#000+ '03227_E_No function result type specified for function "$1"'#000+ '03228_E_Specialization is only supported for generic types'#000+ - '03229_E_Generics can'#039't be used as pa','rameters when specializing g'+ + '03229_E_Generics can'#039't be used as parameters',' when specializing g'+ 'enerics'#000+ '03230_E_Constants of objects containing a VMT aren'#039't allowed'#000+ '03231_E_Taking the address of labels defined outside the current scope'+ ' isn'#039't allowed'#000+ '03233_E_Cannot initialize variables declared as external'#000+ - '0','3234_E_Illegal function result type'#000+ + '03234_E_I','llegal function result type'#000+ '03235_E_No common type possible between "$1" and "$2"'#000+ '03236_E_Generics without specialization cannot be used as a type for a'+ ' variable'#000+ '03237_W_Register list is ignored for pure assembler routines'#000+ - '03238_E_I','mplements property must have class or interface type'#000+ + '03238_E_Implement','s property must have class or interface type'#000+ '03239_E_Implements-property must implement interface of correct type, '+ 'found "$1" expected "$2"'#000+ '03240_E_Implements-property must have read specifier'#000+ - '03241_E_Implements-property must not ha','ve write-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+ '03244_E_Floating point not supported for this target'#000+ - '03245_E_Class "$1" does not implement inter','face "$2"'#000+ + '03245_E_Class "$1" does not implement interface "$2','"'#000+ '03246_E_Type used by implements must be an interface'#000+ '03247_E_Variables cannot be exported with a different name on this tar'+ 'get, add the name to the declaration using the "export" directive (var'+ - 'iable name: $1, declared export name:',' $2)'#000+ - '03248_E_Weak external symbols are not supported for the current target'+ - #000+ + 'iable name: $1, declared export name: $2)'#000+ + '032','48_E_Weak external symbols are not supported for the current targ'+ + 'et'#000+ '03249_E_Forward type definition does not match'#000+ '03250_N_Virtual method "$1" has a lower visibility ($2) than parent cl'+ 'ass $3 ($4)'#000+ - '03251_E_Fields cannot appear after ','a method or property definition, '+ + '03251_E_Fields cannot appear after a method',' or property definition, '+ 'start a new visibility section first'#000+ '03252_E_Parameters or result types cannot contain local type definitio'+ 'ns. Use a separate type definition in a type block.'#000+ '03253_E_ABSTRACT and SEALED conflict'#000+ - '03254_E_Can','not create a descendant of the sealed class "$1"'#000+ + '03254_E_Cannot crea','te a descendant of the sealed class "$1"'#000+ '03255_E_SEALED class cannot have an ABSTRACT method'#000+ '03256_E_Only virtual methods can be final'#000+ '03257_E_Final method cannot be overridden: "$1"'#000+ - '03258_E_Only one message can be used per method.'#000, - '03259_E_Invalid enumerator identifier: "$1"'#000+ + '03258_E_Only one message can be used per method.'#000+ + '03259_E_','Invalid enumerator identifier: "$1"'#000+ '03260_E_Enumerator identifier required'#000+ '03261_E_Enumerator MoveNext pattern method is not valid. Method must b'+ 'e a function with the Boolean return type and no required arguments.'#000+ - '03262_E_Enumerator',' Current pattern property is not valid. Property m'+ + '03262_E_Enumerator Current',' pattern property is not valid. Property m'+ 'ust have a getter.'#000+ '03263_E_Only one enumerator MoveNext method is allowed per class/objec'+ 't'#000+ '03264_E_Only one enumerator Current property is allowed per class/obje'+ 'ct'#000+ - '03265_E_For in loop cannot',' be used for the type "$1"'#000+ + '03265_E_For in loop cannot be used',' for the type "$1"'#000+ '03266_E_Objective-C messages require their Objective-C selector name t'+ 'o be specified using the "message" directive.'#000+ '03267_E_Objective-C does not have formal constructors nor destructors.'+ - ' Use the alloc, initXXX and',' dealloc messages.'#000+ + ' Use the alloc, initXXX and dealloc',' messages.'#000+ '03268_E_Message name is too long (max. 255 characters)'#000+ '03269_E_Objective-C message symbol name for "$1" is too long'#000+ '03270_H_Defining a new Objective-C root class. To derive from another '+ - 'root class (e.g., NSObject), specif','y it as the parent class.'#000+ + 'root class (e.g., NSObject), specify it as ','the parent class.'#000+ '03271_E_Objective-C classes cannot have published sections.'#000+ '03272_F_This module requires an Objective-C mode switch to be compiled'+ #000+ '03273_E_Inherited methods can only be overridden in Objective-C, add "'+ - 'override" (in','herited method defined in $1)'#000+ + 'override" (inherited ','method defined in $1)'#000+ '03274_H_Inherited methods can only be overridden in Objective-C, add "'+ 'override" (inherited method defined in $1).'#000+ '03275_E_Message name "$1" in inherited class is different from message'+ - ' name "$2" in current clas','s.'#000+ - '03276_E_It is not yet possible to make unique copies of Objective-C ty'+ - 'pes'#000+ + ' name "$2" in current class.'#000+ + '03276','_E_It is not yet possible to make unique copies of Objective-C '+ + 'types'#000+ '03277_E_Objective-C categories and Object Pascal class helpers cannot '+ 'be used as types'#000+ '03278_E_Categories do not override, but replace methods. Use "reintrod'+ - 'uce" i','nstead.'#000+ + 'uce" instead.'#000, '03279_E_Replaced methods can only be reintroduced in Objective-C, add '+ '"reintroduce" (replaced method defined in $1).'#000+ '03280_H_Replaced methods can only be reintroduced in Objective-C, add '+ - '"reintroduce" (replaced method defined in $1)','.'#000+ - '03281_E_Getter for implements interface must use the target'#039's defa'+ - 'ult calling convention.'#000+ + '"reintroduce" (replaced method defined in $1).'#000+ + '03281_','E_Getter for implements interface must use the target'#039's de'+ + 'fault calling convention.'#000+ '03282_E_Typed files cannot contain reference-counted types.'#000+ '03283_E_Operator is not overloaded: $2 "$1"'#000+ - '03284_E_Operator is not overloaded: "$1" $2 ','"$3"'#000+ - '03285_E_Expected another $1 array elements'#000+ + '03284_E_Operator is not overloaded: "$1" $2 "$3"'#000+ + '032','85_E_Expected another $1 array elements'#000+ '03286_E_String constant too long while ansistrings are disabled'#000+ '03287_E_Type cannot be used as univ parameter because its size is unkn'+ 'own at compile time: "$1"'#000+ - '03288_E_Only one class construct','or can be declared in class: "$1"'#000+ + '03288_E_Only one class constructor can b','e declared in class: "$1"'#000+ '03289_E_Only one class destructor can be declared in class: "$1"'#000+ '03290_E_Class constructors can'#039't have parameters'#000+ '03291_E_Class destructors can'#039't have parameters'#000+ - '03292_F_This construct requires the \{\$mode','switch objectivec1\} mod'+ + '03292_F_This construct requires the \{\$modeswitch o','bjectivec1\} mod'+ 'e switch to be active'#000+ '03293_E_Unicodechar/string constants cannot be converted to ansi/short'+ 'string at compile-time'#000+ '03294_E_For-in Objective-Pascal loops require \{\$modeswitch Objective'+ 'C2\} to be active'#000+ - '03295_E_The c','ompiler cannot find the NSFastEnumerationProtocol or NS'+ + '03295_E_The compiler ','cannot find the NSFastEnumerationProtocol or NS'+ 'FastEnumerationState type in the CocoaAll unit'#000+ '03296_E_Typed constants of the type '#039'procedure is nested'#039' can '+ 'only be initialized with NIL and global procedures/functions'#000+ - '03297_F_Declara','tion of generic class inside another generic class is'+ + '03297_F_Declaration of ','generic class inside another generic class is'+ ' not allowed'#000+ '03298_E_Forward declaration of objcprotocol "$1" must be resolved befo'+ 're an objcclass can conform to it'#000+ '03299_E_Record types cannot have published sections'#000+ - '03300_E_Destructor','s aren'#039't allowed in records or class helpers'#000+ + '03300_E_Destructors aren'#039't',' allowed in records or class helpers'#000+ '03301_E_Class methods must be static in records'#000+ '03302_E_Constructors aren'#039't allowed in records'#000+ '03303_E_Either the result or at least one parameter must be of type "$'+ '1"'#000+ - '03304_E_Type parameters may',' require initialization/finalization - ca'+ + '03304_E_Type parameters may require',' initialization/finalization - ca'+ 'n'#039't be used in variant records'#000+ - '03305_E_Class helper identifier expected'#000+ - '03306_E_Derived class helper must extend a subclass of the class exten'+ - 'ded by the parent class helper'#000+ - '03307_E_"$1" is not allowe','d in class helpers'#000+ + '03305_E_"$1" is not allowed in class helpers'#000+ '04000_E_Type mismatch'#000+ '04001_E_Incompatible types: got "$1" expected "$2"'#000+ '04002_E_Type mismatch between "$1" and "$2"'#000+ - '04003_E_Type identifier expected'#000+ + '04003_E_Type i','dentifier expected'#000+ '04004_E_Variable identifier expected'#000+ - '04005_E_Integer expression expecte','d, but got "$1"'#000+ + '04005_E_Integer expression expected, but got "$1"'#000+ '04006_E_Boolean expression expected, but got "$1"'#000+ '04007_E_Ordinal expression expected'#000+ '04008_E_pointer type expected, but got "$1"'#000+ - '04009_E_class type expected, but got "$1"'#000+ + '0400','9_E_class type expected, but got "$1"'#000+ '04011_E_Can'#039't evaluate constant expression'#000+ - '04012_E_S','et elements are not compatible'#000+ + '04012_E_Set elements are not compatible'#000+ '04013_E_Operation not implemented for sets'#000+ '04014_W_Automatic type conversion from floating type to COMP which is '+ - 'an integer type'#000+ + 'an int','eger type'#000+ '04015_H_use DIV instead to get an integer result'#000+ - '04016_E_String types have to ma','tch exactly in $V+ mode'#000+ + '04016_E_String types have to match exactly in $V+ mode'#000+ '04017_E_succ or pred on enums with assignments not possible'#000+ '04018_E_Can'#039't read or write variables of this type'#000+ - '04019_E_Can'#039't use readln or writeln on typed file'#000+ + '04019_E_Can'#039't u','se readln or writeln on typed file'#000+ '04020_E_Can'#039't use read or write on untyped file.'#000+ - '04021_','E_Type conflict between set elements'#000+ + '04021_E_Type conflict between set elements'#000+ '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+ '04023_E_Integer or real expression expected'#000+ - '04024_E_Wrong type "$1" in array constructor'#000+ - '04025_E_Incompatible type for arg no. $1: Got "$2", ','expected "$3"'#000+ + '04024_E','_Wrong type "$1" in array constructor'#000+ + '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+ '04026_E_Method (variable) and Procedure (variable) are not compatible'#000+ '04027_E_Illegal constant passed to internal math function'#000+ - '04028_E_Can'#039't take the address of constant expressions'#000+ + '04028_E_','Can'#039't take the address of constant expressions'#000+ '04029_E_Argument can'#039't be assigned to'#000+ - '04030','_E_Can'#039't assign local procedure/function to procedure varia'+ - 'ble'#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 values 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+ - '04035_H_Mixing ','signed expressions and longwords gives a 64bit result'+ - #000+ + '04035_H_Mixing signed expressions and longwords gives a 64bit result'#000+ '04036_W_Mixing signed expressions and cardinals here may cause a range'+ ' check error'#000+ - '04037_E_Typecast has different size ($1 -> $2) in assignment'#000+ - '04038_E_enums with assignments can'#039't be us','ed as array index'#000+ + '04037_E_Typec','ast has different size ($1 -> $2) in assignment'#000+ + '04038_E_enums with assignments 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+ - '04041_E_Class or interface type expected, but got "$1"'#000+ + '04041_E_Class or inter','face type expected, but got "$1"'#000+ '04042_E_Type "$1" is not completely defined'#000+ - '04043_W_Strin','g literal has more characters than short string length'#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_Comparison is always true due to range of values'#000+ + '04045_W_Comparison is always true due',' to range of values'#000+ '04046_W_Constructing a class "$1" with abstract method "$2"'#000+ - '04047_H_Th','e left operand of the IN operator should be byte sized'#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 error'#000+ - '04050_E_The address of an abstract method can',#039't be taken'#000+ + '04049_H_Type size mismatc','h, possible loss of data / range check erro'+ + 'r'#000+ + '04050_E_The address of an abstract 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_Operation "$1" not supported for types "$2" and "$3"'#000+ + '04053_E_Operation "$1" not ','supported for types "$2" and "$3"'#000+ '04054_E_Illegal type conversion: "$1" to "$2"'#000+ - '04055_H_Co','nversion between ordinals and pointers is not portable'#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 r','eal value to double for C variable argu'+ - 'ment, add explicit typecast to prevent this.'#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, but got "$1"'#000+ - '04061_E_Constant packed arrays are not yet supported'#000+ - '04062_E_Incompatible type for arg no. $1: Go','t "$2" expected "(Bit)Pa'+ - 'cked Array"'#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+ '04063_E_Incompatible type for arg no. $1: Got "$2" expected "(not pack'+ 'ed) Array"'#000+ - '04064_E_Elements of packed arrays cannot be of a type which need to be'+ - ' initialised'#000+ - '04065_E_Constant packed records and obje','cts 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 records 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 address of a subroutine marked as local'#000+ + '04076_E_Can'#039't take address of a subrouti','ne marked as local'#000+ '04077_E_Can'#039't export subroutine marked as local from a unit'#000+ - '04078_E_Typ','e is not automatable: "$1"'#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_Converting the operands to "$1" before doing the subtract coul'+ - 'd prevent overflow errors.'#000+ - '04081_H_Converting the o','perands to "$1" before doing the multiply co'+ + '04080_H_Converting 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'+ + 'd 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 type $1 has no ','valid GUID'#000+ + 'parison',' results and range errors, use an unsigned type instead.'#000+ + '04083_E_Interface type $1 has no valid GUID'#000+ '04084_E_Invalid selector name "$1"'#000+ '04085_E_Expected Objective-C method, but got $1'#000+ - '04086_E_Expected Objective-C method or constant method name'#000+ + '04086_E_Expected Objective-C method or constant method n','ame'#000+ '04087_E_No type info available for this type'#000+ - '04088_E_Ordinal or string expression expe','cted'#000+ + '04088_E_Ordinal or string expression expected'#000+ '04089_E_String expression expected'#000+ '04090_W_Converting 0 to NIL'#000+ '04091_E_Objective-C protocol type expected, but got "$1"'#000+ - '04092_E_The type "$1" is not supported for interaction with the Object'+ - 'ive-C runtime.'#000+ - '04093_E_Class or objcclass typ','e expected, but got "$1"'#000+ + '04092_E_The type "$1" is ','not supported for interaction with the Obje'+ + 'ctive-C runtime.'#000+ + '04093_E_Class or objcclass type expected, but got "$1"'#000+ '04094_E_Objcclass type expected'#000+ '04095_W_Coerced univ parameter type in procedural variable may cause c'+ - 'rash or memory corruption: $1 to $2'#000+ + 'rash or memory corrupti','on: $1 to $2'#000+ '04096_E_Type parameters of specializations of generics cannot referenc'+ - 'e the c','urrently specialized type'#000+ + 'e the currently specialized type'#000+ '04097_E_Type parameters are not allowed on non-generic class/record/ob'+ 'ject procedure or function'#000+ - '04098_E_Generic declaration of "$1" differs from previous declaration'#000+ - '05000_E_Identifier not found "$1"'#000+ - '05001_F_Inter','nal Error in SymTableStack()'#000+ + '04098_E_Generic declaration',' of "$1" differs from previous declaratio'+ + 'n'#000+ + '04099_E_Helper type expected'#000+ + '04100_E_Record type expected'#000+ + '04101_E_Derived class helper must extend a subclass of "$1" or the cla'+ + 'ss itself'#000+ + '04102_E_Derived record helper must extend "$1"'#000+ + '05000_E_Iden','tifier not found "$1"'#000+ + '05001_F_Internal Error in SymTableStack()'#000+ '05002_E_Duplicate identifier "$1"'#000+ '05003_H_Identifier already defined in $1 at line $2'#000+ '05004_E_Unknown identifier "$1"'#000+ '05005_E_Forward declaration not solved "$1"'#000+ - '05007_E_Error in type definition'#000+ - '05009_E_Forward ','type not resolved "$1"'#000+ + '05007_E_Error ','in type definition'#000+ + '05009_E_Forward type not resolved "$1"'#000+ '05010_E_Only static variables can be used in static methods or outside'+ ' methods'#000+ '05012_F_record or class type expected'#000+ - '05013_E_Instances of classes or objects with an abstract method are no'+ - 't allowed'#000+ - '05014_W_Label not de','fined "$1"'#000+ + '05013_E_Instances of classes or objects with an abstract method a','re '+ + 'not allowed'#000+ + '05014_W_Label not defined "$1"'#000+ '05015_E_Label used but not defined "$1"'#000+ '05016_E_Illegal label declaration'#000+ '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+ '05018_E_Label not found'#000+ '05019_E_identifier isn'#039't a label'#000+ - '05020_E_label already defined'#000+ - '05021_E_il','legal type declaration of set elements'#000+ + '05020','_E_label already defined'#000+ + '05021_E_illegal type declaration of set elements'#000+ '05022_E_Forward class definition not resolved "$1"'#000+ '05023_H_Unit "$1" not used in $2'#000+ '05024_H_Parameter "$1" not used'#000+ '05025_N_Local variable "$1" not used'#000+ - '05026_H_Value parameter "$1" is assigned but nev','er used'#000+ + '05026_H_Value',' parameter "$1" is assigned but never used'#000+ '05027_N_Local variable "$1" is assigned but never used'#000+ '05028_H_Local $1 "$2" is not used'#000+ '05029_N_Private field "$1.$2" is never used'#000+ '05030_N_Private field "$1.$2" is assigned but never used'#000+ - '05031_N_Private method "$1.$2" never used'#000, + '05031_N','_Private method "$1.$2" never used'#000+ '05032_E_Set type expected'#000+ '05033_W_Function result does not seem to be set'#000+ '05034_W_Type "$1" is not aligned correctly in current record for C'#000+ '05035_E_Unknown record field identifier "$1"'#000+ - '05036_W_Local variable "$1" does not seem to be initia','lized'#000+ + '05036_W_Local varia','ble "$1" does not seem to be initialized'#000+ '05037_W_Variable "$1" does not seem to be initialized'#000+ '05038_E_identifier idents no member "$1"'#000+ '05039_H_Found declaration: $1'#000+ '05040_E_Data element too large'#000+ - '05042_E_No matching implementation for interface method "$1" found'#000+ - '05043_W_Sym','bol "$1" is deprecated'#000+ + '05042_E_No matching implementation for inte','rface method "$1" found'#000+ + '05043_W_Symbol "$1" is deprecated'#000+ '05044_W_Symbol "$1" is not portable'#000+ '05055_W_Symbol "$1" is not implemented'#000+ '05056_E_Can'#039't create unique type from this type'#000+ - '05057_H_Local variable "$1" does not seem to be initialized'#000+ - '05058_H_Variable "$1" does not see','m 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 initialized'#000+ '05060_H_Function result variable does not seem to be initialized'#000+ '05061_W_Variable "$1" read but nowhere assigned'#000+ - '05062_H_Found abstract method: $1'#000+ - '05063_W_Sym','bol "$1" is experimental'#000+ + '05062_H_Fo','und abstract method: $1'#000+ + '05063_W_Symbol "$1" is experimental'#000+ '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_Cannot find an enumerator for the type "$1"'#000+ - '05068_E_Cannot ','find a "MoveNext" method in enumerator "$1"'#000+ + '05067_E_Cannot find an enumerato','r for the type "$1"'#000+ + '05068_E_Cannot find a "MoveNext" method in enumerator "$1"'#000+ '05069_E_Cannot find a "Current" property in enumerator "$1"'#000+ '05070_E_Mismatch between number of declared parameters and number of c'+ 'olons in message string.'#000+ - '05071_N_Private type "$1.$2" never used'#000+ - '0','5072_N_Private const "$1.$2" never used'#000+ + '05071_','N_Private type "$1.$2" never used'#000+ + '05072_N_Private const "$1.$2" never used'#000+ '05073_N_Private property "$1.$2" never used'#000+ '05074_W_Unit "$1" is deprecated'#000+ '05075_W_Unit "$1" is deprecated: "$2"'#000+ '05076_W_Unit "$1" is not portable'#000+ - '05077_W_Unit "$1" is belongs to a library'#000+ - '05078_W_Un','it "$1" is not implemented'#000+ + '05077_W_Unit "$1"',' is belongs to a library'#000+ + '05078_W_Unit "$1" is not implemented'#000+ '05079_W_Unit "$1" is experimental'#000+ '05080_E_No complete definition of the formally declared objcclass "$1"'+ ' is in scope'#000+ - '05081_E_Gotos into initialization or finalization blocks of units are '+ - 'not allowed'#000+ - '05082=E_Invali','d external name "$1" for formal class "$2"'#000+ + '05081_E_Gotos into initialization or finalization blocks of u','nits ar'+ + 'e not allowed'#000+ + '05082=E_Invalid external name "$1" for formal class "$2"'#000+ '05083=E_Complete class definition with external name "$1" here'#000+ '06009_E_Parameter list size exceeds 65535 bytes'#000+ '06012_E_File types must be var parameters'#000+ - '06013_E_The use of a far pointer isn'#039't allow','ed there'#000+ + '06013_E_T','he use of a far pointer 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_unreachable code'#000+ - '06020_E_Abstract methods can'#039't be called directly'#000+ - '06027_DL_Register $1 w','eight $2 $3'#000+ + '06020_E_Abstract methods can'#039't be cal','led directly'#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 inline procedure stored'#000+ - '06035_E_Element zero of an ansi/wide- or longstring can'#039't be ac','c'+ + '06035_E_Element zero of an a','nsi/wide- or longstring can'#039't be acc'+ 'essed, use (set)length instead'#000+ '06037_E_Constructors or destructors cannot be called inside a '#039'wit'+ 'h'#039' clause'#000+ '06038_E_Cannot call message handler methods directly'#000+ - '06039_E_Jump in or outside of an exception block'#000+ - '06040_E_Control flow statement','s aren'#039't allowed in a finally bloc'+ - 'k'#000+ + '06039_E_Jump in or outside of an exception b','lock'#000+ + '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+ '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+ '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+ '06043_E_Local variables size exceeds supported limit'#000+ - '06044_E_BREAK not allowed'#000+ - '06045_E_CO','NTINUE not allowed'#000+ + '0','6044_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 run'+ ' time library.'#000+ - '06048_H_Inherited call to abstract method ignored'#000+ - '0604','9_E_Goto label "$1" not defined or optimized away'#000+ + '06048_H_Inherited c','all to abstract method ignored'#000+ + '06049_E_Goto label "$1" not defined or optimized away'#000+ '06050_F_Cannot find type "$1" in unit "$2". Check if you use the corre'+ 'ct run time library.'#000+ - '06051_E_Interprocedural gotos are allowed only to outer subroutines'#000+ - '06052_E_Label must be defined i','n the same scope as it is declared'#000+ + '06051_E_Interprocedural gotos are allowed only to outer subrouti','nes'#000+ + '06052_E_Label must be defined in the same scope as it is declared'#000+ '06053_E_Leaving procedures containing explicit or implicit exceptions '+ 'frames using goto is not allowed'#000+ '07000_DL_Starting $1 styled assembler parsing'#000+ - '07001_DL_Finished $1 styled assembler parsing'#000+ - '07002_E_No','n-label pattern contains @'#000+ + '07001_DL_Finished $1 ','styled assembler parsing'#000+ + '07002_E_Non-label pattern contains @'#000+ '07004_E_Error building record offset'#000+ '07005_E_OFFSET used without identifier'#000+ '07006_E_TYPE used without identifier'#000+ '07007_E_Cannot use local variable or parameters here'#000+ - '07008_E_need to use OFFSET here'#000+ - '07009_E_need to',' use $ here'#000+ + '07008_E_need',' to use OFFSET here'#000+ + '07009_E_need to use $ here'#000+ '07010_E_Cannot use multiple relocatable symbols'#000+ '07011_E_Relocatable symbol can only be added'#000+ '07012_E_Invalid constant expression'#000+ '07013_E_Relocatable symbol is not allowed'#000+ - '07014_E_Invalid reference syntax'#000+ - '07015_E_You cannot reach',' $1 from that code'#000+ + '07014_E_Invalid refere','nce syntax'#000+ + '07015_E_You cannot reach $1 from that code'#000+ '07016_E_Local symbols/labels aren'#039't allowed as references'#000+ '07017_E_Invalid base and index register usage'#000+ '07018_W_Possible error in object field handling'#000+ - '07019_E_Wrong scale factor specified'#000+ - '07020_E_Multiple index register ','usage'#000+ + '07019_E_Wrong scale factor specifi','ed'#000+ + '07020_E_Multiple index register usage'#000+ '07021_E_Invalid operand type'#000+ '07022_E_Invalid string as opcode operand: $1'#000+ '07023_W_@CODE and @DATA not supported'#000+ '07024_E_Null label references are not allowed'#000+ '07025_E_Divide by zero in asm evaluator'#000+ - '07026_E_Illegal expression'#000+ - '07027_E_e','scape sequence ignored: $1'#000+ + '0','7026_E_Illegal expression'#000+ + '07027_E_escape sequence ignored: $1'#000+ '07028_E_Invalid symbol reference'#000+ '07029_W_Fwait can cause emulation problems with emu387'#000+ '07030_W_$1 without operand translated into $1P'#000+ - '07031_W_ENTER instruction is not supported by Linux kernel'#000+ - '07032_W_Calling an ','overload function in assembler'#000+ + '07031_W_ENTER instruction is not supported ','by Linux kernel'#000+ + '07032_W_Calling an overload function in assembler'#000+ '07033_E_Unsupported symbol type for operand'#000+ '07034_E_Constant value out of bounds'#000+ '07035_E_Error converting decimal $1'#000+ '07036_E_Error converting octal $1'#000+ - '07037_E_Error converting binary $1'#000+ - '07038_E_Error convertin','g hexadecimal $1'#000+ + '07037_E_Error convertin','g binary $1'#000+ + '07038_E_Error converting hexadecimal $1'#000+ '07039_H_$1 translated to $2'#000+ '07040_W_$1 is associated to an overloaded function'#000+ '07041_E_Cannot use SELF outside a method'#000+ '07042_E_Cannot use OLDEBP outside a nested procedure'#000+ - '07043_W_Procedures can'#039't return any value in asm c','ode'#000+ + '07043_W_Procedu','res 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+ '07047_E_Assembler syntax error'#000+ - '07048_E_Invalid combination of opcode and operands'#000, + '07048_E_Invalid ','combination of opcode and operands'#000+ '07049_E_Assembler syntax error in operand'#000+ '07050_E_Assembler syntax error in constant'#000+ '07051_E_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 m','issing opcode'#000+ + '07053_E_Unrecogn','ized opcode $1'#000+ + '07054_E_Invalid or missing opcode'#000+ '07055_E_Invalid combination of prefix and opcode: $1'#000+ '07056_E_Invalid combination of override and opcode: $1'#000+ '07057_E_Too many operands on line'#000+ '07058_W_NEAR ignored'#000+ '07059_W_FAR ignored'#000+ - '07060_E_Duplicate local symbol $1'#000+ - '07061_E_U','ndefined local symbol $1'#000+ + '07060_E_','Duplicate local symbol $1'#000+ + '07061_E_Undefined local symbol $1'#000+ '07062_E_Unknown label identifier $1'#000+ '07063_E_Invalid register name'#000+ '07064_E_Invalid floating point register name'#000+ '07066_W_Modulo not supported'#000+ - '07067_E_Invalid floating point constant $1'#000+ - '07068_E_Invalid floating point e','xpression'#000+ + '07067_E_Invalid floating point constant ','$1'#000+ + '07068_E_Invalid floating point expression'#000+ '07069_E_Wrong symbol type'#000+ '07070_E_Cannot index a local var or parameter with a register'#000+ '07071_E_Invalid segment override expression'#000+ '07072_W_Identifier $1 supposed external'#000+ - '07073_E_Strings not allowed as constants'#000+ - '07074_No type of ','variable specified'#000+ + '07073_E_Strings not all','owed as constants'#000+ + '07074_No type of variable specified'#000+ '07075_E_assembler code not returned to text section'#000+ '07076_E_Not a directive or local symbol $1'#000+ '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 create','d for address'#000+ + '07078_E_Dollar token is used without an ident','ifier'#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+ '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'+ + '07083_E_No size specifie','d and unable to determine the size of the op'+ 'erands'#000+ '07084_E_Cannot use RESULT in this function'#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 < n','ot allowed here'#000+ + '07088_W_"$1 %st(n)" translated in','to "$1 %st(n),%st"'#000+ + '07089_E_Char < not allowed here'#000+ '07090_E_Char > not allowed here'#000+ '07093_W_ALIGN not supported'#000+ '07094_E_Inc and Dec 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 sp','ecified and unable to determine the size of the op'+ - 'erands, using DWORD as default'#000+ + '07097_E_Higher cpu mo','de required ($1)'#000+ + '07098_W_No size specified and unable to determine the size of the oper'+ + 'ands, using DWORD as default'#000+ '07099_E_Syntax error while trying to parse a shifter operand'#000+ '07100_E_Address of packed component is not at a byte boundary'#000+ - '07101_W_No size specified and unable',' to determine the size of the op'+ + '0','7101_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+ '07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+ #000+ - '07104_W_Use of -offset(%ebp) is not recommended fo','r local variable a'+ + '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+ '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 PI','C-safe'#000+ + '07107_E_Gene','rating PIC, but reference is not PIC-safe'#000+ '07108_E_All registers in a register set must be of the same kind and w'+ 'idth'#000+ '07109_E_A register set cannot be empty'#000+ '07110_W_@GOTPCREL is useless and potentially dangereous for local symb'+ 'ols'#000+ - '08000_F_Too many assembler files'#000+ - '08001_F_Sele','cted assembler output not supported'#000+ + '08000_F_To','o many assembler files'#000+ + '08001_F_Selected assembler output not supported'#000+ '08002_F_Comp not supported'#000+ '08003_F_Direct not support for binary writers'#000+ '08004_E_Allocating of data is only allowed in bss section'#000+ '08005_F_No binary writer selected'#000+ - '08006_E_Asm: Opcode $1 not in table'#000+ - '080','07_E_Asm: $1 invalid combination of opcode and operands'#000+ + '0800','6_E_Asm: Opcode $1 not in table'#000+ + '08007_E_Asm: $1 invalid combination of opcode and operands'#000+ '08008_E_Asm: 16 Bit references not supported'#000+ '08009_E_Asm: Invalid effective address'#000+ '08010_E_Asm: Immediate or reference expected'#000+ - '08011_E_Asm: $1 value exceeds bounds $2'#000+ - '08012_E_Asm: Sh','ort jump is out of range $1'#000+ + '08011_E_Asm: $1 valu','e exceeds bounds $2'#000+ + '08012_E_Asm: Short jump is out of range $1'#000+ '08013_E_Asm: Undefined label $1'#000+ '08014_E_Asm: Comp type not supported for this target'#000+ '08015_E_Asm: Extended type not supported for this target'#000+ '08016_E_Asm: Duplicate label $1'#000+ - '08017_E_Asm: Redefined label $1'#000+ - '08018_','E_Asm: First defined here'#000+ + '080','17_E_Asm: Redefined label $1'#000+ + '08018_E_Asm: First defined here'#000+ '08019_E_Asm: Invalid register $1'#000+ '08020_E_Asm: 16 or 32 Bit references not supported'#000+ '08021_E_Asm: 64 Bit operands not supported'#000+ '09000_W_Source operating system redefined'#000+ - '09001_I_Assembling (pipe) $1'#000+ - '09002_E_Can'#039't cr','eate assembler file: $1'#000+ + '09001_I_As','sembling (pipe) $1'#000+ + '09002_E_Can'#039't create assembler file: $1'#000+ '09003_E_Can'#039't create object file: $1'#000+ '09004_E_Can'#039't create archive file: $1'#000+ '09005_E_Assembler $1 not found, switching to external assembling'#000+ '09006_T_Using assembler: $1'#000+ - '09007_E_Error while assembling exitcode $1'#000+ - '09008','_E_Can'#039't call the assembler, error $1 switching to external'+ - ' assembling'#000+ + '09007_E_Error',' while assembling exitcode $1'#000+ + '09008_E_Can'#039't call the assembler, error $1 switching to external a'+ + 'ssembling'#000+ '09009_I_Assembling $1'#000+ '09010_I_Assembling with smartlinking $1'#000+ '09011_W_Object $1 not found, Linking may fail !'#000+ - '09012_W_Library $1 not found, Linking may fail !'#000+ - '09013_E_Er','ror while linking'#000+ + '09012_W_Library $1 not f','ound, Linking may fail !'#000+ + '09013_E_Error while linking'#000+ '09014_E_Can'#039't call the linker, switching to external linking'#000+ '09015_I_Linking $1'#000+ '09016_E_Util $1 not found, switching to external linking'#000+ '09017_T_Using util $1'#000+ - '09018_E_Creation of Executables not supported'#000+ - '09019_E_Creation ','of Dynamic/Shared Libraries not supported'#000+ + '09018_E_Creation of Executab','les not supported'#000+ + '09019_E_Creation of Dynamic/Shared 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 be statically linked, switching to smart lin'+ - 'king'#000+ - '09','024_T_unit $1 can'#039't be smart linked, switching to static linki'+ - 'ng'#000+ + '09023_T_unit $1 can'#039't be statically li','nked, switching to smart l'+ + 'inking'#000+ + '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+ + #000+ '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+ 'g'#000+ '09026_E_unit $1 can'#039't be smart or static linked'#000+ - '09027_E_unit $1 can'#039't be shared or static linked'#000+ - '09028_D_Ca','lling 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+ '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 resource file "$1"'#000+ - '09032_E_Can'#039't write resource 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+ '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+ - '09133_X_Stack space reserved: $1 bytes'#000+ - '09','134_X_Stack space committed: $1 bytes'#000+ + '09133_','X_Stack space reserved: $1 bytes'#000+ + '09134_X_Stack space 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+ - '10001_T_PPU Loading $1'#000+ + '10001_T_PPU',' Loading $1'#000+ '10002_U_PPU Name: $1'#000+ - '10','003_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 compiled for another processor'#000+ - '10010_U_PPU is compiled fo','r another target'#000+ + '10009_U_PPU is compiled for another p','rocessor'#000+ + '10010_U_PPU is compiled for another target'#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+ - '10017_F_PPU Dbx count problem'#000+ - '10018_E_Illegal unit ','name: $1'#000+ + '10017_F_PPU Dbx ','count problem'#000+ + '10018_E_Illegal unit name: $1'#000+ '10019_F_Too much units'#000+ '10020_F_Circular unit reference between $1 and $2'#000+ '10021_F_Can'#039't compile unit $1, no sources available'#000+ '10022_F_Can'#039't find unit $1 used by $2'#000+ - '10023_W_Unit $1 was not found but $2 exists'#000+ - '10024_F_Unit $1 searched',' but $2 found'#000+ + '10023_W_Unit $1 was not found but',' $2 exists'#000+ + '10024_F_Unit $1 searched but $2 found'#000+ '10025_W_Compiling the system unit requires the -Us switch'#000+ '10026_F_There were $1 errors compiling module, stopping'#000+ '10027_U_Load from $1 ($2) unit $3'#000+ - '10028_U_Recompiling $1, checksum changed for $2'#000+ - '10029_U_Recompiling $1, source',' found only'#000+ + '10028_U_Recompiling $1, checksum changed fo','r $2'#000+ + '10029_U_Recompiling $1, source found only'#000+ '10030_U_Recompiling unit, static lib is older than ppufile'#000+ '10031_U_Recompiling unit, shared lib is older than ppufile'#000+ '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+ - '10033_U_Recompiling unit, obj is older than asm'#000+ - '1','0034_U_Parsing interface of $1'#000+ + '10033_U_Recomp','iling unit, obj is older than asm'#000+ + '10034_U_Parsing interface of $1'#000+ '10035_U_Parsing implementation of $1'#000+ '10036_U_Second load for unit $1'#000+ '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 the one use','d for creating PPU file $2'#000+ + '10041_','U_File $1 is newer than the one used for creating PPU file $2'#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+ - '10045_U_Interface CRC changed for unit $1'#000+ - '10046_U_Impl','ementation CRC changed for unit $1'#000+ + '10045_U_Interface C','RC changed for unit $1'#000+ + '10046_U_Implementation CRC changed for unit $1'#000+ '10047_U_Finished compiling unit $1'#000+ '10048_U_Adding dependency: $1 depends on $2'#000+ '10049_U_No reload, is caller: $1'#000+ '10050_U_No reload, already in second compile: $1'#000+ - '10051_U_Flag for reload: $1'#000+ - '10052_U_Forced r','eloading'#000+ + '10051_U_F','lag 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+ '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_Skipping re-resolvi','ng unit $1, still loading used units'#000+ + '10058_U_Re-resolving ','unit $1'#000+ + '10059_U_Skipping re-resolving unit $1, still loading used units'#000+ '10060_U_Unloading 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 in','put file for this compilation invocation'#000+ + 'ion feedback input ($2, $3); recompile it without ','wpo or use the sam'+ + 'e wpo feedback input file for this compilation invocation'#000+ '10062_U_Indirect interface (objects/classes) CRC changed for unit $1'#000+ '11000_O_$1 [options] [options]'#000+ - '11001_W_Only one source file supported, changing source file to compil'+ - 'e from "$1" into ','"$2"'#000+ + '11001_W_Only one source file supported, changing sou','rce file to comp'+ + 'ile from "$1" into "$2"'#000+ '11002_W_DEF file can be created only for OS/2'#000+ '11003_E_nested response files are not supported'#000+ '11004_F_No source file name in command line'#000+ '11005_N_No option inside $1 config file'#000+ - '11006_E_Illegal parameter: $1'#000+ - '11007_H_-? writes help page','s'#000+ + '11006_E_Illegal parame','ter: $1'#000+ + '11007_H_-? writes help pages'#000+ '11008_F_Too many config files nested'#000+ '11009_F_Unable to open file $1'#000+ '11010_D_Reading further options from $1'#000+ '11011_W_Target is already set to: $1'#000+ - '11012_W_Shared libs not supported on DOS platform, reverting to static'+ - #000+ - '11013_F_In options fil','e $1 at line $2 too many \var{\#IF(N)DEFs} enc'+ - 'ountered'#000+ + '11012_W_Shared libs not supported on DOS platform, reverti','ng to stat'+ + 'ic'#000+ + '11013_F_In options file $1 at line $2 too many \var{\#IF(N)DEFs} encou'+ + 'ntered'#000+ '11014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} encoun'+ 'tered'#000+ '11015_F_Open conditional at the end of the options file'#000+ - '11016_W_Debug information generation is not supported',' by this execut'+ + '11016_W_Debug info','rmation generation is not supported by this execut'+ 'able'#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+ - '11020_N_Switching assembler to default source writing assembler'#000+ - '11021_W_Assemble','r output selected "$1" is not compatible with "$2"'#000+ + '11020_N_Switching assembler to default source',' writing assembler'#000+ + '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+ '11022_W_"$1" assembler use forced'#000+ '11026_T_Reading options from file $1'#000+ '11027_T_Reading options from environment $1'#000+ '11028_D_Handling option "$1"'#000+ - '11029_O_*** press enter ***'#000+ - '11030_H_Start of ','reading config file $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+ '11032_D_interpreting option "$1"'#000+ '11036_D_interpreting firstpass option "$1"'#000+ '11033_D_interpreting file option "$1"'#000+ - '11034_D_Reading config file "$1"'#000+ - '11035_D_found source file name "','$1"'#000+ + '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+ - '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'+ - ' \var{\#IF(N)DEF} found'#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 \'+ + 'var{\#IF(N)DEF} found'#000+ '11044_F_Option "$1" is not, or not yet, supported on the current targe'+ 't platform'#000+ - '11045_F_The feature "$1" is not, or not yet, supported on the selected'+ - ' target platfor','m'#000+ + '11045_F_The feature "$1" is not, or not yet, suppo','rted on the select'+ + 'ed 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+ - '11048_W_Disabling external debug information because it is unsup','port'+ + '11048_W_Disabling external de','bug information because it is unsupport'+ 'ed for the selected target/debug format combination.'#000+ '12000_F_Cannot open whole program optimization 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+ + 'ack file "$1','"'#000+ + '12002_D_Finished processing the whole program optimization information'+ + ' 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 for whole program optimization section "'+ - '$2" at line $1 of wpo feedba','ck file, ignoring'#000+ + '12004_W_No handler registered for whole program optimization se','ction'+ + ' "$2" at line $1 of wpo feedback 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 '+ - 'generated feedback file (use -Fw to specify)'#000+ - '12007_E_No collected info','rmation necessary to perform "$1" whole pro'+ - 'gram optimization found'#000+ + 'generated feedback file (use -Fw to',' specify)'#000+ + '12007_E_No collected information necessary to perform "$1" whole progr'+ + 'am 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, yet'+ - ' ','a feedback file was specified (using -FW)'#000+ + '12009_E_Not generating any whole pro','gram optimization information, y'+ + 'et 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 not '+ - 'needed by the reque','sted optimizations'#000+ + '12011_D_Skipping whole program optimization section "$','1", because no'+ + 't needed by the requested 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 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+ + 't','ripping symbols, use -Xs-'#000+ + '12014_E_Cannot extract symbol liveness information from program when w'+ + 'hen 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 smart linking, use -CX -XX'#000+ - '12019_E_Cannot create specified whole pro','gram optimisation feedback '+ + '12019_','E_Cannot create specified whole program optimisation feedback '+ 'file "$1"'#000+ '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+ 'CPU'#010+ 'Copyright (c) 1993-2010 by Florian Klaempfl'#000+ '11024_Free Pascal Compiler version $FPCVERSION'#010+ #010+ - 'Compiler Date : $FPCDATE'#010+ - 'Compile','r CPU Target: $FPCCPU'#010+ + 'Co','mpiler Date : $FPCDATE'#010+ + 'Compiler CPU Target: $FPCCPU'#010+ #010+ 'Supported targets:'#010+ ' $OSTARGETS'#010+ @@ -1065,8 +1067,8 @@ const msgtxt : array[0..000245,1..240] of char=( 'Supported ABI targets:'#010+ ' $ABITARGETS'#010+ #010+ - 'Supported Optimizations:'#010+ - ' $OPTIMIZATIO','NS'#010+ + 'Supp','orted Optimizations:'#010+ + ' $OPTIMIZATIONS'#010+ #010+ 'Supported Whole Program Optimizations:'#010+ ' All'#010+ @@ -1076,205 +1078,206 @@ const msgtxt : array[0..000245,1..240] of char=( ' $CONTROLLERTYPES'#010+ #010+ 'This program comes under the GNU General Public Licence'#010+ - 'For more information read COPYING.FPC'#010+ + 'For more information read C','OPYING.FPC'#010+ #010+ - 'Report bugs, suggestion','s, etc. to:'#010+ + 'Report bugs, suggestions, 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/release info in assembler file'#010+ - '**2at_List temp allocation/release i','nfo in assembler file'#010+ + '*','*2at_List temp allocation/release info in assembler file'#010+ '**1A_Output format:'#010+ '**2Adefault_Use default assembler'#010+ '3*2Aas_Assemble using GNU AS'#010+ '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+ - '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+ - '3*2Anasmelf_ELF32 (Linux) f','ile using Nasm'#010+ + '3*2Anasmcoff_COFF (Go32v2) file usi','ng Nasm'#010+ + '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+ '3*2Anasmwin32_Win32 object file using Nasm'#010+ '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+ '3*2Awasm_Obj file using Wasm (Watcom)'#010+ '3*2Anasmobj_Obj file using Nasm'#010+ - '3*2Amasm_Obj file using Masm (Microsoft)'#010+ - '3*2Atasm_Obj file usin','g Tasm (Borland)'#010+ + '3*2Amasm_Obj file using Masm',' (Microsoft)'#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*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 assem','bler'#010+ + '6*2Aas_Unix o-file usin','g GNU AS'#010+ + '6*2Agas_GNU Motorola assembler'#010+ '6*2Amit_MIT Syntax (old GAS)'#010+ '6*2Amot_Standard Motorola assembler'#010+ 'A*2Aas_Assemble using GNU AS'#010+ 'P*2Aas_Assemble using GNU AS'#010+ 'S*2Aas_Assemble using GNU AS'#010+ '**1b_Generate browser info'#010+ - '**2bl_Generate local symbol info'#010+ - '**1B_Build all modules'#010, + '**2bl_Generate local ','symbol info'#010+ + '**1B_Build all modules'#010+ '**1C_Code generation options:'#010+ '**2C3_Turn on ieee error checking for constants'#010+ '**2Ca_Select ABI, see fpc -i for possible values'#010+ '**2Cb_Generate big-endian code'#010+ - '**2Cc_Set default calling convention to '#010+ - '**2CD_Create also dynamic ','library (not supported)'#010+ + '**2Cc_Set default calling conventio','n to '#010+ + '**2CD_Create also dynamic library (not supported)'#010+ '**2Ce_Compilation with emulated floating point opcodes'#010+ '**2Cf_Select fpu instruction set to use, see fpc -i for possible va'+ 'lues'#010+ - '**2CF_Minimal floating point constant precision (default, 32, 64)'#010+ - '**2Cg_Generate PI','C code'#010+ + '**2CF_Minimal floating point constant precision ','(default, 32, 64)'+ + #010+ + '**2Cg_Generate PIC code'#010+ '**2Ch_ 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 for possible overflow of integer operations'#010+ - '**2Cp_Select instruction set, see fp','c -i for possible values'#010+ + '**2C','p_Select instruction set, see fpc -i for possible values'#010+ '**2CP=_ packing settings'#010+ '**3CPPACKSET=_ 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_Set stack checking size to '#010+ - '**2Ct_','Stack checking (for testing only, see manual)'#010+ + '**2Cs_Se','t stack checking size to '#010+ + '**2Ct_Stack checking (for testing only, see manual)'#010+ '**2CX_Create also smartlinked library'#010+ '**1d_Defines the symbol '#010+ '**1D_Generate a DEF file'#010+ '**2Dd_Set description to '#010+ '**2Dv_Set DLL version to '#010+ - '*O2Dw_PM application'#010+ - '**1e_Set pat','h to executable'#010+ + '*','O2Dw_PM application'#010+ + '**1e_Set path to executable'#010+ '**1E_Same as -Cn'#010+ '**1fPIC_Same as -Cg'#010+ '**1F_Set file names and paths:'#010+ '**2Fa[,y]_(for a program) load units and [y] before uses is par'+ 'sed'#010+ '**2Fc_Set input codepage to '#010+ - '**2FC_Set RC compiler binary name to '#010, + '**2FC_','Set RC compiler binary name to '#010+ '**2Fd_Disable the compiler'#039's internal directory cache'#010+ '**2FD_Set the directory where to search for compiler utilities'#010+ '**2Fe_Redirect error output to '#010+ - '**2Ff_Add to framework path (Darwin only)'#010+ - '**2FE_Set exe/unit output path',' to '#010+ + '**2Ff_Add to framework path (Darwin only',')'#010+ + '**2FE_Set exe/unit output path to '#010+ '**2Fi_Add to include path'#010+ '**2Fl_Add to library path'#010+ '**2FL_Use as dynamic linker'#010+ '**2Fm_Load unicode conversion table from .txt in the compiler di'+ 'r'#010+ - '**2Fo_Add to object path'#010+ - '**2Fr_Load error message',' file '#010+ + '**2Fo_Add to obje','ct path'#010+ + '**2Fr_Load error message file '#010+ '**2FR_Set resource (.res) linker to '#010+ '**2Fu_Add to unit path'#010+ '**2FU_Set unit output path to , overrides -FE'#010+ '**2FW_Store generated whole-program optimization feedback in '#010+ - '**2Fw_Load previously stored whole','-program optimization feedback '+ + '**','2Fw_Load previously stored whole-program optimization feedback '+ 'from '#010+ '*g1g_Generate debug information (default format for target)'#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_Set debug information options'#010+ '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+ 'aks gdb < 6.5)'#010+ '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+ #010+ - '*g3godwarfmethodclassprefix_ Prefix ','method names in DWARF with class'+ + '*','g3godwarfmethodclassprefix_ Prefix method names in DWARF with class'+ ' name'#010+ '*g2gp_Preserve case in stabs symbol names'#010+ '*g2gs_Generate Stabs debug information'#010+ '*g2gt_Trash local variables (to detect uninitialized uses)'#010+ - '*g2gv_Generates programs traceable with Valgrind'#010+ - '*g2gw_Generat','e DWARFv2 debug information (same as -gw2)'#010+ + '*g2gv_Generates programs tr','aceable with Valgrind'#010+ + '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+ '*g2gw2_Generate DWARFv2 debug information'#010+ '*g2gw3_Generate DWARFv3 debug information'#010+ '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+ '**1i_Information'#010+ - '**2iD_Return compiler date'#010+ - '**2iV_Return',' short compiler version'#010+ + '**2i','D_Return compiler date'#010+ + '**2iV_Return short compiler 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_Add to include path'#010+ - '**1k_Pass to the linker',#010+ + '**1I_Add to include ','path'#010+ + '**1k_Pass to the linker'#010+ '**1l_Write logo'#010+ '**1M_Set language mode to '#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+ - '**2Mmacpas_Macintosh Pascal di','alects compatibility mode'#010+ + '**2Mtp_TP/BP 7.0 compatibility ','mode'#010+ + '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+ '**1n_Do not read the default config files'#010+ '**1N_Node tree optimizations'#010+ '**2Nu_Unroll loops'#010+ '**1o_Change the name of the executable produced to '#010+ '**1O_Optimizations:'#010+ - '**2O-_Disable optimizations'#010+ - '**2O1_Level ','1 optimizations (quick and debugger friendly)'#010+ + '**2O-','_Disable optimizations'#010+ + '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+ '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+ '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+ '**2Oa=_Set alignment'#010+ - '**2Oo[NO]_Enable or disable optimizations, see fpc -i',' for possibl'+ + '**2Oo[NO]_Enable o','r disable optimizations, see fpc -i for possibl'+ 'e values'#010+ '**2Op_Set target cpu for optimizing, see fpc -i for possible values'+ #010+ '**2OW_Generate whole-program optimization feedback for optimization'+ ' , see fpc -i for possible values'#010+ - '**2Ow_Perform whole-program optimizati','on , see fpc -i for poss'+ + '**2Ow<','x>_Perform whole-program optimization , 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_Assembler reading style:'#010+ - '**2Rdefault_Use default assembler for target'#010+ - '3*2Ratt_Read AT&T sty','le assembler'#010+ + '**2Rdefault_Use default assembl','er for target'#010+ + '3*2Ratt_Read AT&T style assembler'#010+ '3*2Rintel_Read Intel style assembler'#010+ '6*2RMOT_Read motorola style assembler'#010+ '**1S_Syntax options:'#010+ '**2S2_Same as -Mobjfpc'#010+ '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+ - '**2Sa_Turn on assertions'#010+ + '**2Sa_Turn on asserti','ons'#010+ '**2Sd_Same as -Mdelphi'#010+ - '**2Se','_Error options. is a combination of the following:'#010+ + '**2Se_Error options. is a combination of the following:'#010+ '**3*_ : Compiler halts after the errors (default is 1)'#010+ '**3*_w : Compiler also halts after warnings'#010+ '**3*_n : Compiler also halts after notes'#010+ - '**3*_h : Compiler also halts after hin','ts'#010+ + '**3','*_h : Compiler also halts after hints'#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+ - '**2Sk_Load fpcylix unit'#010+ - '**2SI_Set interface style ','to '#010+ + '**2Sk_Load fpcylix',' unit'#010+ + '**2SI_Set interface style to '#010+ '**3SIcom_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 (destructor must be done)'#010+ - '**2Sx_Enable exception keywords (','default in Delphi/ObjFPC modes)'#010+ + '**2Ss_Constructor name must be init (destructor must be done',')'#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+ '**2sr_Skip register allocation phase (use with -alr)'#010+ - '**1T_Target operating system:'#010+ - '3*2Tda','rwin_Darwin/Mac OS X'#010+ + '**1T','_Target operating system:'#010+ + '3*2Tdarwin_Darwin/Mac OS X'#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*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tda'+ - 'rwin)'#010+ + '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: ','-T'+ + 'darwin)'#010+ '3*2Tlinux_Linux'#010+ - '3*2Tnetbs','d_NetBSD'#010+ + '3*2Tnetbsd_NetBSD'#010+ '3*2Tnetware_Novell Netware Module (clib)'#010+ '3*2Tnetwlibc_Novell Netware Module (libc)'#010+ '3*2Topenbsd_OpenBSD'#010+ '3*2Tos2_OS/2 / eComStation'#010+ '3*2Tsunos_SunOS/Solaris'#010+ '3*2Tsymbian_Symbian OS'#010+ - '3*2Tsolaris_Solaris'#010+ - '3*2Twatcom_Watcom compatible DOS e','xtender'#010+ + '3*2Tsolaris_Solaris',#010+ + '3*2Twatcom_Watcom compatible DOS extender'#010+ '3*2Twdosx_WDOSX DOS extender'#010+ '3*2Twin32_Windows 32 Bit'#010+ '3*2Twince_Windows CE'#010+ @@ -1282,9 +1285,9 @@ const msgtxt : array[0..000245,1..240] of char=( '4*2Tlinux_Linux'#010+ '4*2Twin64_Win64 (64 bit Windows systems)'#010+ '6*2Tamiga_Commodore Amiga'#010+ - '6*2Tatari_Atari ST/STe/TT'#010+ + '6*2Tatari_At','ari ST/STe/TT'#010+ '6*2Tlinux_Linux'#010+ - '6*2Tp','almos_PalmOS'#010+ + '6*2Tpalmos_PalmOS'#010+ 'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+ 'A*2Tlinux_Linux'#010+ 'A*2Twince_Windows CE'#010+ @@ -1293,84 +1296,84 @@ const msgtxt : array[0..000245,1..240] of char=( 'P*2Tlinux_Linux'#010+ 'P*2Tmacos_Mac OS (classic)'#010+ 'P*2Tmorphos_MorphOS'#010+ - 'S*2Tsolaris_Solaris'#010+ + 'S*2Tsolaris_Sola','ris'#010+ 'S*2Tlinux_Linux'#010+ - '**1u_Undefin','es the symbol '#010+ + '**1u_Undefines the symbol '#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+ '**2Us_Compile a system unit'#010+ - '**1v_Be verbose. is a combination of the',' following letters:'#010+ + '**1v_Be v','erbose. is a combination of the following letters:'#010+ '**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+ '**2*_w : Show warnings u : Show unit info'#010+ - '**2*_n : Show notes t : Show tried/used files'#010+ - '**2*_h : Show hints ',' c : Show conditionals'#010+ + '**2*_n : Show notes t : Show tried/used fi','les'#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*_s : Show time stamps q : Show message numbers'#010+ - '**2*_a : Show everythin','g x : Executable info (Win32 only'+ - ')'#010+ + '**2*_s : Show time stamps q : Show mess','age numbers'#010+ + '**2*_a : Show everything x : Executable info (Win32 only)'#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 debuggi','ng info'#010+ + '**2*_ ',' lots of debugging info'#010+ '**2*_m, : Don'#039't show messages numbered and '#010+ '3*1W_Target-specific options (targets)'#010+ 'A*1W_Target-specific options (targets)'#010+ 'P*1W_Target-specific options (targets)'#010+ - 'p*1W_Target-specific options (targets)'#010+ - '3*2Wb_C','reate a bundle instead of a library (Darwin)'#010+ + 'p*1W_Target','-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_Create a bundle instead of a library (Darwin)'#010+ '3*2WB_Create a relocatable image (Windows)'#010+ - 'A*2WB_Create a relocatable image (Windows, Symbi','an)'#010+ + 'A*2WB_Create ','a relocatable image (Windows, Symbian)'#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+ - '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*2WD_Use DEFFILE to export function','s 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+ '4*2We_Use external resources (Darwin)'#010+ 'A*2We_Use external resources (Darwin)'#010+ - 'P*2We_Use external resources (Darwin)'#010+ - 'p*2We_Use external resources (Darwi','n)'#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+ - '3*2Wi_Use interna','l resources (Darwin)'#010+ + 'P*2WG_Specify graphic type application',' (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 code, needed for debugging (Windows)'#010+ - 'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - '3*2','WR_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+ '3*2WX_Enable executable stack (Linux)'#010+ - 'A*2WX_Enable executable stack (Linux)'#010+ - 'p*2WX_Enable executable stac','k (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, Lin'+ 'ux)'#010+ - '**2Xd_Do not use standard library search path (needed for cross compil'+ - 'e)'#010+ - '**2Xe_Use external l','inker'#010+ + '**2Xd_Do not use standard library 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 executable'#010+ '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+ '**2Xi_Use internal linker'#010+ - '**2Xm_Generate link map'#010+ - '**2XM_Set the name of the '#039'ma','in'#039' program routine (default'+ - ' is '#039'main'#039')'#010+ + '**2Xm_Generate link m','ap'#010+ + '**2XM_Set the name of the '#039'main'#039' program routine (default i'+ + 's '#039'main'#039')'#010+ '**2XP_Prepend the binutils names with the prefix '#010+ '**2Xr_Set the linker'#039's rlink-path to (needed for cross comp'+ - 'ile, see the ld manual for more information) (BeOS, Linux)'#010+ - '**2XR_Prepend to all linker search paths (BeOS, Darwin, FreeB'+ - 'SD, Linux, Mac OS, Solaris)'#010+ + 'ile, see the ld manual for more information',') (BeOS, Linux)'#010+ + '**2XR_Prepend to all linker search paths (BeOS, Darwin, FreeBSD'+ + ', 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 t','o linker)'#010+ + '**2Xt_Link with st','atic libraries (-static is passed to linker)'#010+ '**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010+ '**1*_'#010+ '**1?_Show this help'#010+ diff --git a/compiler/ncal.pas b/compiler/ncal.pas index 097aa18b40..443742d1fb 100644 --- a/compiler/ncal.pas +++ b/compiler/ncal.pas @@ -2693,7 +2693,7 @@ implementation { ignore possible private for properties or in delphi mode for anon. inherited (FK) } ignorevisibility:=(nf_isproperty in flags) or ((m_delphi in current_settings.modeswitches) and (cnf_anon_inherited in callnodeflags)); - candidates:=tcallcandidates.create(symtableprocentry,symtableproc,left,ignorevisibility,not(nf_isproperty in flags),cnf_objc_id_call in callnodeflags,cnf_unit_specified in callnodeflags); + candidates:=tcallcandidates.create(symtableprocentry,symtableproc,left,ignorevisibility,not(nf_isproperty in flags),cnf_objc_id_call in callnodeflags,cnf_unit_specified in callnodeflags,callnodeflags*[cnf_anon_inherited,cnf_inherited]=[]); { no procedures found? then there is something wrong with the parameter size or the procedures are diff --git a/compiler/ncgcal.pas b/compiler/ncgcal.pas index 5251c6690a..6d40a92280 100644 --- a/compiler/ncgcal.pas +++ b/compiler/ncgcal.pas @@ -708,6 +708,7 @@ implementation a pointer. We can directly call the correct procdef (PFV) } if (name_to_call='') and (po_virtualmethod in procdefinition.procoptions) and + not is_objectpascal_helper(tprocdef(procdefinition).struct) and assigned(methodpointer) and (methodpointer.nodetype<>typen) and not wpoinfomanager.can_be_devirtualized(methodpointer.resultdef,procdefinition,name_to_call) then diff --git a/compiler/ncgld.pas b/compiler/ncgld.pas index 200c3cb874..f7d690ef4f 100644 --- a/compiler/ncgld.pas +++ b/compiler/ncgld.pas @@ -496,7 +496,8 @@ implementation { virtual method ? } if (po_virtualmethod in procdef.procoptions) and - not(nf_inherited in flags) then + not(nf_inherited in flags) and + not is_objectpascal_helper(procdef.struct) then begin if (not assigned(current_procinfo) or wpoinfomanager.symbol_live(current_procinfo.procdef.mangledname)) then diff --git a/compiler/ncgrtti.pas b/compiler/ncgrtti.pas index 1324c2b769..c2119a285f 100644 --- a/compiler/ncgrtti.pas +++ b/compiler/ncgrtti.pas @@ -920,7 +920,9 @@ implementation recorddef_rtti(trecorddef(def)); end; objectdef : - objectdef_rtti(tobjectdef(def)); + // TODO : check whether Delphi generates RTTI for helpers + if not is_objectpascal_helper(def) then + objectdef_rtti(tobjectdef(def)); else unknown_rtti(tstoreddef(def)); end; diff --git a/compiler/nflw.pas b/compiler/nflw.pas index 00ceb6cb21..8764442a9e 100644 --- a/compiler/nflw.pas +++ b/compiler/nflw.pas @@ -866,10 +866,10 @@ implementation { first search using the class helper hierarchy if it's a class } if (expr.resultdef.typ=objectdef) and - search_last_objectpascal_classhelper(tobjectdef(expr.resultdef),classhelper) then + search_last_objectpascal_helper(tobjectdef(expr.resultdef),classhelper) then repeat pd:=classhelper.search_enumerator_get; - classhelper:=classhelper.helperparent; + classhelper:=classhelper.childof; until (pd<>nil) or (classhelper=nil); { we didn't found a class helper, so search in the class/record/object itself } diff --git a/compiler/nld.pas b/compiler/nld.pas index ad869aa160..8b0f1d8f83 100644 --- a/compiler/nld.pas +++ b/compiler/nld.pas @@ -302,6 +302,8 @@ implementation if vo_is_self in tabstractvarsym(symtableentry).varoptions then begin resultdef:=tprocdef(symtableentry.owner.defowner).struct; + if is_objectpascal_helper(resultdef) then + resultdef:=tobjectdef(resultdef).extendeddef; if (po_classmethod in tprocdef(symtableentry.owner.defowner).procoptions) or (po_staticmethod in tprocdef(symtableentry.owner.defowner).procoptions) then resultdef:=tclassrefdef.create(resultdef) diff --git a/compiler/objcdef.pas b/compiler/objcdef.pas index 5fb800b1cb..0f49ed2070 100644 --- a/compiler/objcdef.pas +++ b/compiler/objcdef.pas @@ -374,13 +374,14 @@ implementation encodedstr:=encodedstr+'^?'; objectdef : case tobjectdef(def).objecttype of + odt_helper, odt_class, odt_object, odt_cppclass: begin newstate:=recordinfostate; { implicit pointer for classes } - if (tobjectdef(def).objecttype=odt_class) then + if (tobjectdef(def).objecttype in [odt_class,odt_helper]) then begin encodedstr:=encodedstr+'^'; { make all classes opaque, so even if they contain a @@ -593,13 +594,14 @@ implementation ; objectdef : case tobjectdef(def).objecttype of + odt_helper, odt_class, odt_object, odt_cppclass: begin newstate:=recordinfostate; { implicit pointer for classes } - if (tobjectdef(def).objecttype=odt_class) then + if (tobjectdef(def).objecttype in [odt_class,odt_helper]) then begin { make all classes opaque, so even if they contain a reference-counted field there is no problem. Since a diff --git a/compiler/pdecl.pas b/compiler/pdecl.pas index 67068d6939..ba336d8b15 100644 --- a/compiler/pdecl.pas +++ b/compiler/pdecl.pas @@ -500,7 +500,7 @@ implementation end; consume(token); { we can ignore the result, the definition is modified } - object_dec(objecttype,orgtypename,nil,nil,tobjectdef(ttypesym(sym).typedef)); + object_dec(objecttype,orgtypename,nil,nil,tobjectdef(ttypesym(sym).typedef),ht_none); newtype:=ttypesym(sym); hdef:=newtype.typedef; end @@ -630,9 +630,6 @@ implementation if is_cppclass(hdef) then tobjectdef(hdef).finish_cpp_data; - - if is_objectpascal_classhelper(hdef) then - tobjectdef(hdef).finish_classhelper; end; recorddef : begin diff --git a/compiler/pdecobj.pas b/compiler/pdecobj.pas index 71e49b4313..e6124e8d1c 100644 --- a/compiler/pdecobj.pas +++ b/compiler/pdecobj.pas @@ -30,7 +30,7 @@ interface globtype,symconst,symtype,symdef; { parses a object declaration } - function object_dec(objecttype:tobjecttyp;const n:tidstring;genericdef:tstoreddef;genericlist:TFPObjectList;fd : tobjectdef) : tobjectdef; + function object_dec(objecttype:tobjecttyp;const n:tidstring;genericdef:tstoreddef;genericlist:TFPObjectList;fd : tobjectdef;helpertype:thelpertype) : tobjectdef; function class_constructor_head:tprocdef; function class_destructor_head:tprocdef; @@ -118,8 +118,8 @@ implementation var p : tpropertysym; begin - { check for a class or record } - if not((is_class_or_interface_or_dispinterface(current_structdef) or is_record(current_structdef)) or + { check for a class, record or helper } + if not((is_class_or_interface_or_dispinterface(current_structdef) or is_record(current_structdef) or is_objectpascal_helper(current_structdef)) or (not(m_tp7 in current_settings.modeswitches) and (is_object(current_structdef)))) then Message(parser_e_syntax_error); consume(_PROPERTY); @@ -422,6 +422,7 @@ implementation get_cpp_class_external_status(current_objectdef); odt_objcclass,odt_objcprotocol,odt_objccategory: get_objc_class_or_protocol_external_status(current_objectdef); + odt_helper: ; // nothing end; end; @@ -436,31 +437,11 @@ implementation intfchildof:=nil; hasparentdefined:=false; - { the "parent" of a class helper is not really treated as its parent; - it's only used to extend the searched scope } - if is_objectpascal_classhelper(current_structdef) then - begin - if try_to_consume(_LKLAMMER) then - begin - { TODO : check what these flags mean } - single_type(hdef,[stoAllowTypeDef, stoParseClassParent]); - if not is_objectpascal_classhelper(hdef) then - begin - Message(parser_e_classhelper_id_expected); - hdef:=nil; - end; - current_objectdef.helperparent:=tobjectdef(hdef); - consume(_RKLAMMER); - end; - consume(_FOR); - end; - { reads the parent class } if (token=_LKLAMMER) or - is_classhelper(current_structdef) then + is_objccategory(current_structdef) then begin - if not is_objectpascal_classhelper(current_structdef) then - consume(_LKLAMMER); + consume(_LKLAMMER); { use single_type instead of id_type for specialize support } single_type(hdef,[stoAllowSpecialization, stoParseClassParent]); if (not assigned(hdef)) or @@ -470,10 +451,7 @@ implementation Message1(type_e_class_type_expected,hdef.typename) else if is_objccategory(current_structdef) then { a category must specify the class to extend } - Message(type_e_objcclass_type_expected) - else if is_objectpascal_classhelper(current_objectdef) then - { a class helper must specify the class to extend } - Message(type_e_class_type_expected); + Message(type_e_objcclass_type_expected); end else begin @@ -496,8 +474,7 @@ implementation Message(parser_e_mix_of_classes_and_objects); end else - if (oo_is_sealed in childof.objectoptions) and - not is_objectpascal_classhelper(current_structdef) then + if oo_is_sealed in childof.objectoptions then Message1(parser_e_sealed_descendant,childof.typename); odt_interfacecorba, odt_interfacecom: @@ -545,6 +522,12 @@ implementation Message1(parser_e_sealed_descendant,childof.typename); odt_dispinterface: Message(parser_e_dispinterface_cant_have_parent); + odt_helper: + if not is_objectpascal_helper(childof) then + begin + Message(type_e_helper_type_expected); + childof:=nil; + end; end; end; hasparentdefined:=true; @@ -584,8 +567,7 @@ implementation { remove forward flag, is resolved } exclude(current_structdef.objectoptions,oo_is_forward); - if hasparentdefined and - not is_objectpascal_classhelper(current_structdef) then + if hasparentdefined then begin if current_objectdef.objecttype in [odt_class,odt_objcclass,odt_objcprotocol] then begin @@ -600,6 +582,62 @@ implementation end; end; + procedure parse_extended_class(helpertype:thelpertype); + var + hdef: tdef; + begin + if not is_objectpascal_helper(current_structdef) then + Internalerror(2011021103); + if helpertype=ht_none then + Internalerror(2011021001); + + consume(_FOR); + single_type(hdef,[stoAllowTypeDef,stoParseClassParent]); + if (not assigned(hdef)) or + not (hdef.typ in [objectdef,recorddef]) then + begin + if helpertype=ht_class then + Message1(type_e_class_type_expected,hdef.typename) + else + if helpertype=ht_record then + Message1(type_e_record_type_expected,hdef.typename); + end + else + begin + case helpertype of + ht_class: + begin + if not is_class(hdef) then + Message1(type_e_class_type_expected,hdef.typename); + { a class helper must extend the same class or a subclass + of the class extended by the parent class helper } + if assigned(current_objectdef.childof) then + begin + if not is_class(current_objectdef.childof.extendeddef) then + Internalerror(2011021101); + if not hdef.is_related(current_objectdef.childof.extendeddef) then + Message1(type_e_class_helper_must_extend_subclass,current_objectdef.childof.extendeddef.typename); + end; + end; + ht_record: + begin + if not is_record(hdef) then + Message1(type_e_record_type_expected,hdef.typename); + { a record helper must extend the same record as the + parent helper } + if assigned(current_objectdef.childof) then + begin + if not is_record(current_objectdef.childof.extendeddef) then + Internalerror(2011021102); + if hdef<>current_objectdef.childof.extendeddef then + Message1(type_e_record_helper_must_extend_same_record,current_objectdef.childof.extendeddef.typename); + end; + end; + end; + + current_objectdef.extendeddef:=tabstractrecorddef(hdef); + end; + end; procedure parse_guid; begin @@ -675,14 +713,14 @@ implementation case token of _TYPE : begin - if not(current_objectdef.objecttype in [odt_class,odt_object]) then + if not(current_objectdef.objecttype in [odt_class,odt_object,odt_helper]) then Message(parser_e_type_var_const_only_in_records_and_classes); consume(_TYPE); object_member_blocktype:=bt_type; end; _VAR : begin - if not(current_objectdef.objecttype in [odt_class,odt_object]) then + if not(current_objectdef.objecttype in [odt_class,odt_object,odt_helper]) then Message(parser_e_type_var_const_only_in_records_and_classes); consume(_VAR); fields_allowed:=true; @@ -692,7 +730,7 @@ implementation end; _CONST: begin - if not(current_objectdef.objecttype in [odt_class,odt_object]) then + if not(current_objectdef.objecttype in [odt_class,odt_object,odt_helper]) then Message(parser_e_type_var_const_only_in_records_and_classes); consume(_CONST); object_member_blocktype:=bt_const; @@ -801,7 +839,7 @@ implementation begin if is_interface(current_structdef) or is_objc_protocol_or_category(current_structdef) or - is_objectpascal_classhelper(current_structdef) then + is_objectpascal_helper(current_structdef) then Message(parser_e_no_vars_in_interfaces); if (current_structdef.symtable.currentvisibility=vis_published) and @@ -877,13 +915,6 @@ implementation if (m_mac in current_settings.modeswitches) then include(pd.procoptions,po_virtualmethod); - { for class helpers virtual, final, override make no sense, - so they are rejected in mode ObjFPC (in pdecsub) and - ignored in mode Delphi (here) - } - if is_objectpascal_classhelper(current_structdef) then - pd.procoptions:=pd.procoptions-[po_virtualmethod,po_finalmethod,po_overridingmethod]; - handle_calling_convention(pd); { add definition to procsym } @@ -965,7 +996,7 @@ implementation Message(parser_e_no_con_des_in_interfaces); { (class) destructors are not allowed in class helpers } - if is_objectpascal_classhelper(current_structdef) then + if is_objectpascal_helper(current_structdef) then Message(parser_e_no_destructor_in_records); if not is_classdef and (current_structdef.symtable.currentvisibility<>vis_public) then @@ -1014,7 +1045,7 @@ implementation end; - function object_dec(objecttype:tobjecttyp;const n:tidstring;genericdef:tstoreddef;genericlist:TFPObjectList;fd : tobjectdef) : tobjectdef; + function object_dec(objecttype:tobjecttyp;const n:tidstring;genericdef:tstoreddef;genericlist:TFPObjectList;fd : tobjectdef;helpertype:thelpertype) : tobjectdef; var old_current_structdef: tabstractrecorddef; old_current_genericdef, @@ -1122,16 +1153,12 @@ implementation include(current_structdef.objectoptions,oo_is_classhelper); end; - { change classhelpers into Object Pascal style class helpers } - if (objecttype=odt_classhelper) then - begin - current_objectdef.objecttype:=odt_class; - include(current_objectdef.objectoptions,oo_is_classhelper); - end; + { include the class helper flag for Object Pascal helpers } + if (objecttype=odt_helper) then + include(current_objectdef.objectoptions,oo_is_classhelper); { parse list of options (abstract / sealed) } - if not(objecttype in [odt_objcclass,odt_objcprotocol,odt_objccategory]) and - not is_objectpascal_classhelper(current_objectdef) then + if not(objecttype in [odt_objcclass,odt_objcprotocol,odt_objccategory]) then parse_object_options; symtablestack.push(current_structdef.symtable); @@ -1141,6 +1168,10 @@ implementation { parse list of parent classes } parse_parent_classes; + { parse extended type for helpers } + if is_objectpascal_helper(current_structdef) then + parse_extended_class(helpertype); + { parse optional GUID for interfaces } parse_guid; diff --git a/compiler/pdecsub.pas b/compiler/pdecsub.pas index d277bb9049..4b8a9ee275 100644 --- a/compiler/pdecsub.pas +++ b/compiler/pdecsub.pas @@ -245,6 +245,7 @@ implementation storepos : tfileposinfo; vs : tparavarsym; hdef : tdef; + selfdef : tabstractrecorddef; vsp : tvarspez; aliasvs : tabsolutevarsym; sl : tpropaccesslist; @@ -302,18 +303,24 @@ implementation pd.parast.insert(vs); end; + { for helpers the type of Self is equivalent to the extended + type or equal to an instance of it } + if is_objectpascal_helper(tprocdef(pd).struct) then + selfdef:=tobjectdef(tprocdef(pd).struct).extendeddef + else + selfdef:=tprocdef(pd).struct; { Generate self variable, for classes we need to use the generic voidpointer to be compatible with methodpointers } vsp:=vs_value; if (po_staticmethod in pd.procoptions) or (po_classmethod in pd.procoptions) then - hdef:=tclassrefdef.create(tprocdef(pd).struct) + hdef:=tclassrefdef.create(selfdef) else begin - if is_object(tprocdef(pd).struct) or is_record(tprocdef(pd).struct) then + if is_object(selfdef) or is_record(selfdef) then vsp:=vs_var; - hdef:=tprocdef(pd).struct; + hdef:=selfdef; end; vs:=tparavarsym.create('$self',paranr_self,vsp,hdef,[vo_is_self,vo_is_hidden_para]); pd.parast.insert(vs); @@ -1621,6 +1628,9 @@ procedure pd_abstract(pd:tabstractprocdef); begin if pd.typ<>procdef then internalerror(200304269); + if is_objectpascal_helper(tprocdef(pd).struct) and + (m_objfpc in current_settings.modeswitches) then + Message1(parser_e_not_allowed_in_classhelper, arraytokeninfo[_ABSTRACT].str); if assigned(tprocdef(pd).struct) and (oo_is_sealed in tprocdef(pd).struct.objectoptions) then Message(parser_e_sealed_class_cannot_have_abstract_methods) @@ -1637,6 +1647,9 @@ procedure pd_final(pd:tabstractprocdef); begin if pd.typ<>procdef then internalerror(200910170); + if is_objectpascal_helper(tprocdef(pd).struct) and + (m_objfpc in current_settings.modeswitches) then + Message1(parser_e_not_allowed_in_classhelper, arraytokeninfo[_FINAL].str); if (po_virtualmethod in pd.procoptions) then include(pd.procoptions,po_finalmethod) else @@ -1682,7 +1695,7 @@ begin if (pd.proctypeoption=potype_constructor) and is_object(tprocdef(pd).struct) then Message(parser_e_constructor_cannot_be_not_virtual); - if is_objectpascal_classhelper(tprocdef(pd).struct) and + if is_objectpascal_helper(tprocdef(pd).struct) and (m_objfpc in current_settings.modeswitches) then Message1(parser_e_not_allowed_in_classhelper, arraytokeninfo[_VIRTUAL].str); {$ifdef WITHDMT} @@ -1734,9 +1747,11 @@ procedure pd_override(pd:tabstractprocdef); begin if pd.typ<>procdef then internalerror(2003042611); - if is_objectpascal_classhelper(tprocdef(pd).struct) and - (m_objfpc in current_settings.modeswitches) then - Message1(parser_e_not_allowed_in_classhelper, arraytokeninfo[_OVERRIDE].str) + if is_objectpascal_helper(tprocdef(pd).struct) then + begin + if m_objfpc in current_settings.modeswitches then + Message1(parser_e_not_allowed_in_classhelper, arraytokeninfo[_OVERRIDE].str) + end else if not(is_class_or_interface_or_objc(tprocdef(pd).struct)) then Message(parser_e_no_object_override) else if is_objccategory(tprocdef(pd).struct) then @@ -1761,12 +1776,15 @@ var begin if pd.typ<>procdef then internalerror(2003042613); - if not is_class(tprocdef(pd).struct) and - not is_objc_class_or_protocol(tprocdef(pd).struct) then - Message(parser_e_msg_only_for_classes); - if is_objectpascal_classhelper(tprocdef(pd).struct) and - (m_objfpc in current_settings.modeswitches) then - Message1(parser_e_not_allowed_in_classhelper, arraytokeninfo[_MESSAGE].str); + if is_objectpascal_helper(tprocdef(pd).struct) then + begin + if m_objfpc in current_settings.modeswitches then + Message1(parser_e_not_allowed_in_classhelper, arraytokeninfo[_MESSAGE].str); + end + else + if not is_class(tprocdef(pd).struct) and + not is_objc_class_or_protocol(tprocdef(pd).struct) then + Message(parser_e_msg_only_for_classes); if ([po_msgstr,po_msgint]*pd.procoptions)<>[] then Message(parser_e_multiple_messages); { check parameter type } @@ -1795,7 +1813,8 @@ begin end else if is_constintnode(pt) and - is_class(tprocdef(pd).struct) then + (is_class(tprocdef(pd).struct) or + is_objectpascal_helper(tprocdef(pd).struct)) then begin include(pd.procoptions,po_msgint); if (Tordconstnode(pt).valueprocdef then internalerror(200401211); - if not(is_class_or_interface_or_object(tprocdef(pd).struct)) and - not(is_objccategory(tprocdef(pd).struct)) then - Message(parser_e_no_object_reintroduce); - if is_objectpascal_classhelper(tprocdef(pd).struct) and - (m_objfpc in current_settings.modeswitches) then - Message1(parser_e_not_allowed_in_classhelper, arraytokeninfo[_REINTRODUCE].str); + if is_objectpascal_helper(tprocdef(pd).struct) then + begin + if m_objfpc in current_settings.modeswitches then + Message1(parser_e_not_allowed_in_classhelper, arraytokeninfo[_REINTRODUCE].str); + end + else + if not(is_class_or_interface_or_object(tprocdef(pd).struct)) and + not(is_objccategory(tprocdef(pd).struct)) then + Message(parser_e_no_object_reintroduce); end; @@ -2104,7 +2126,7 @@ const ( ( idtok:_ABSTRACT; - pd_flags : [pd_interface,pd_object,pd_notobjintf,pd_notrecord,pd_nothelper]; + pd_flags : [pd_interface,pd_object,pd_notobjintf,pd_notrecord]; handler : @pd_abstract; pocall : pocall_none; pooption : [po_abstractmethod]; @@ -2639,7 +2661,7 @@ const exit; { check if method and directive not for record/class helper } - if is_objectpascal_classhelper(tprocdef(pd).struct) and + if is_objectpascal_helper(tprocdef(pd).struct) and (pd_nothelper in proc_direcdata[p].pd_flags) then exit; diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas index 80bb80a5b3..22865a5030 100644 --- a/compiler/pexpr.pas +++ b/compiler/pexpr.pas @@ -1031,7 +1031,7 @@ implementation else static_name:=lower(generate_nested_name(sym.owner,'_'))+'_'+sym.name; if sym.owner.defowner.typ=objectdef then - searchsym_in_class(tobjectdef(sym.owner.defowner),tobjectdef(sym.owner.defowner),static_name,sym,srsymtable) + searchsym_in_class(tobjectdef(sym.owner.defowner),tobjectdef(sym.owner.defowner),static_name,sym,srsymtable,true) else searchsym_in_record(trecorddef(sym.owner.defowner),static_name,sym,srsymtable); if assigned(sym) then @@ -1489,7 +1489,7 @@ implementation p1:=comp_expr(true,false); consume(_RKLAMMER); { type casts to class helpers aren't allowed } - if is_objectpascal_classhelper(hdef) then + if is_objectpascal_helper(hdef) then Message(parser_e_no_category_as_types) { recovery by not creating a conversion node } else @@ -1508,7 +1508,7 @@ implementation begin p1:=ctypenode.create(hdef); { search also in inherited methods } - searchsym_in_class(tobjectdef(hdef),tobjectdef(current_structdef),pattern,srsym,srsymtable); + searchsym_in_class(tobjectdef(hdef),tobjectdef(current_structdef),pattern,srsym,srsymtable,true); if assigned(srsym) then check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg); consume(_ID); @@ -1535,16 +1535,17 @@ implementation end else begin + { TClassHelper.Something is not allowed } + if is_objectpascal_helper(hdef) then + begin + Message(parser_e_no_category_as_types); + { for recovery we use the extended class } + hdef:=tobjectdef(hdef).extendeddef; + end; { class reference ? } if is_class(hdef) or is_objcclass(hdef) then begin - if is_objectpascal_classhelper(hdef) then - begin - Message(parser_e_no_category_as_types); - { for recovery we use the extended class } - hdef:=tobjectdef(hdef).childof; - end; if getaddr and (token=_POINT) then begin consume(_POINT); @@ -2140,7 +2141,7 @@ implementation if token=_ID then begin structh:=tobjectdef(tclassrefdef(p1.resultdef).pointeddef); - searchsym_in_class(tobjectdef(structh),tobjectdef(structh),pattern,srsym,srsymtable); + searchsym_in_class(tobjectdef(structh),tobjectdef(structh),pattern,srsym,srsymtable,true); if assigned(srsym) then begin check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg); @@ -2164,7 +2165,7 @@ implementation if token=_ID then begin structh:=tobjectdef(p1.resultdef); - searchsym_in_class(tobjectdef(structh),tobjectdef(structh),pattern,srsym,srsymtable); + searchsym_in_class(tobjectdef(structh),tobjectdef(structh),pattern,srsym,srsymtable,true); if assigned(srsym) then begin check_hints(srsym,srsym.symoptions,srsym.deprecatedmsg); @@ -2354,7 +2355,16 @@ implementation assigned(current_structdef) and (current_structdef.typ=objectdef) then begin - hclassdef:=tobjectdef(current_structdef).childof; + { In Object Pascal helpers "inherited" always calls a + method of the extended class } + if is_objectpascal_helper(current_structdef) then + begin + if not is_class(tobjectdef(current_structdef).extendeddef) then + Internalerror(2011021701); + hclassdef:=tobjectdef(tobjectdef(current_structdef).extendeddef); + end + else + hclassdef:=tobjectdef(current_structdef).childof; { Objective-C categories *replace* methods in the class they extend, or add methods to it. So calling an inherited method always calls the method inherited from @@ -2378,7 +2388,8 @@ implementation if (po_msgstr in pd.procoptions) then searchsym_in_class_by_msgstr(hclassdef,pd.messageinf.str^,srsym,srsymtable) else - searchsym_in_class(hclassdef,tobjectdef(current_structdef),hs,srsym,srsymtable); + { disable search for helpers } + searchsym_in_class(hclassdef,tobjectdef(current_structdef),hs,srsym,srsymtable,false); end else begin @@ -2386,7 +2397,8 @@ implementation hsorg:=orgpattern; consume(_ID); anon_inherited:=false; - searchsym_in_class(hclassdef,tobjectdef(current_structdef),hs,srsym,srsymtable); + { disable search for helpers } + searchsym_in_class(hclassdef,tobjectdef(current_structdef),hs,srsym,srsymtable,false); end; if assigned(srsym) then begin @@ -2420,7 +2432,7 @@ implementation if (po_msgint in pd.procoptions) or (po_msgstr in pd.procoptions) then begin - searchsym_in_class(hclassdef,hclassdef,'DEFAULTHANDLER',srsym,srsymtable); + searchsym_in_class(hclassdef,hclassdef,'DEFAULTHANDLER',srsym,srsymtable,true); if not assigned(srsym) or (srsym.typ<>procsym) then internalerror(200303171); diff --git a/compiler/pinline.pas b/compiler/pinline.pas index 2c3904abae..9843924677 100644 --- a/compiler/pinline.pas +++ b/compiler/pinline.pas @@ -434,7 +434,7 @@ implementation { search the constructor also in the symbol tables of the parents } afterassignment:=false; - searchsym_in_class(classh,classh,pattern,srsym,srsymtable); + searchsym_in_class(classh,classh,pattern,srsym,srsymtable,true); consume(_ID); do_member_read(classh,false,srsym,p1,again,[cnf_new_call]); { we need to know which procedure is called } diff --git a/compiler/ptype.pas b/compiler/ptype.pas index 6092597ef8..6fdbf2b000 100644 --- a/compiler/ptype.pas +++ b/compiler/ptype.pas @@ -568,7 +568,8 @@ implementation Message(parser_e_no_generics_as_types); def:=generrordef; end - else if is_classhelper(def) then + else if is_classhelper(def) and + not (stoParseClassParent in options) then begin Message(parser_e_no_category_as_types); def:=generrordef @@ -1498,12 +1499,12 @@ implementation _CLASS : begin consume(_CLASS); - def:=object_dec(odt_class,name,genericdef,genericlist,nil); + def:=object_dec(odt_class,name,genericdef,genericlist,nil,ht_none); end; _OBJECT : begin consume(_OBJECT); - def:=object_dec(odt_object,name,genericdef,genericlist,nil); + def:=object_dec(odt_object,name,genericdef,genericlist,nil,ht_none); end; else def:=record_dec(name,genericdef,genericlist); @@ -1518,7 +1519,7 @@ implementation if not(m_class in current_settings.modeswitches) then Message(parser_f_need_objfpc_or_delphi_mode); consume(token); - def:=object_dec(odt_dispinterface,name,genericdef,genericlist,nil); + def:=object_dec(odt_dispinterface,name,genericdef,genericlist,nil,ht_none); end; _CLASS : begin @@ -1548,15 +1549,15 @@ implementation if (idtoken=_HELPER) then begin consume(_HELPER); - def:=object_dec(odt_classhelper,name,genericdef,genericlist,nil); + def:=object_dec(odt_helper,name,genericdef,genericlist,nil,ht_class); end else - def:=object_dec(odt_class,name,genericdef,genericlist,nil); + def:=object_dec(odt_class,name,genericdef,genericlist,nil,ht_none); end; _CPPCLASS : begin consume(token); - def:=object_dec(odt_cppclass,name,genericdef,genericlist,nil); + def:=object_dec(odt_cppclass,name,genericdef,genericlist,nil,ht_none); end; _OBJCCLASS : begin @@ -1564,7 +1565,7 @@ implementation Message(parser_f_need_objc); consume(token); - def:=object_dec(odt_objcclass,name,genericdef,genericlist,nil); + def:=object_dec(odt_objcclass,name,genericdef,genericlist,nil,ht_none); end; _INTERFACE : begin @@ -1574,9 +1575,9 @@ implementation Message(parser_f_need_objfpc_or_delphi_mode); consume(token); if current_settings.interfacetype=it_interfacecom then - def:=object_dec(odt_interfacecom,name,genericdef,genericlist,nil) + def:=object_dec(odt_interfacecom,name,genericdef,genericlist,nil,ht_none) else {it_interfacecorba} - def:=object_dec(odt_interfacecorba,name,genericdef,genericlist,nil); + def:=object_dec(odt_interfacecorba,name,genericdef,genericlist,nil,ht_none); end; _OBJCPROTOCOL : begin @@ -1584,7 +1585,7 @@ implementation Message(parser_f_need_objc); consume(token); - def:=object_dec(odt_objcprotocol,name,genericdef,genericlist,nil); + def:=object_dec(odt_objcprotocol,name,genericdef,genericlist,nil,ht_none); end; _OBJCCATEGORY : begin @@ -1592,12 +1593,12 @@ implementation Message(parser_f_need_objc); consume(token); - def:=object_dec(odt_objccategory,name,genericdef,genericlist,nil); + def:=object_dec(odt_objccategory,name,genericdef,genericlist,nil,ht_none); end; _OBJECT : begin consume(token); - def:=object_dec(odt_object,name,genericdef,genericlist,nil); + def:=object_dec(odt_object,name,genericdef,genericlist,nil,ht_none); end; _PROCEDURE, _FUNCTION: diff --git a/compiler/symconst.pas b/compiler/symconst.pas index 1656bbdb76..66828d6fae 100644 --- a/compiler/symconst.pas +++ b/compiler/symconst.pas @@ -329,7 +329,13 @@ type odt_objcclass, odt_objcprotocol, odt_objccategory, { note that these are changed into odt_class afterwards } - odt_classhelper + odt_helper + ); + + { defines the type of the extended "structure"; only used for parsing } + thelpertype=(ht_none, + ht_class, + ht_record ); { Variations in interfaces implementation } diff --git a/compiler/symdef.pas b/compiler/symdef.pas index dea831d6bf..1b1a8c6650 100644 --- a/compiler/symdef.pas +++ b/compiler/symdef.pas @@ -259,12 +259,9 @@ interface childof : tobjectdef; childofderef : tderef; - { for Object Pascal class helpers: the parent class helper is only - used to extend the scope of a used class helper by another class - helper for the same extended class or a superclass (which is defined - by childof } - helperparent : tobjectdef; - helperparentderef: tderef; + { for Object Pascal helpers } + extendeddef : tabstractrecorddef; + extendeddefderef: tderef; { for C++ classes: name of the library this class is imported from } import_lib, { for Objective-C: protocols and classes can have the same name there } @@ -322,7 +319,6 @@ interface procedure set_parent(c : tobjectdef); function find_destructor: tprocdef; function implements_any_interfaces: boolean; - procedure finish_classhelper; { dispinterface support } function get_next_dispid: longint; { enumerator support } @@ -788,7 +784,7 @@ interface function is_object(def: tdef): boolean; function is_class(def: tdef): boolean; function is_cppclass(def: tdef): boolean; - function is_objectpascal_classhelper(def: tdef): boolean; + function is_objectpascal_helper(def: tdef): boolean; function is_objcclass(def: tdef): boolean; function is_objcclassref(def: tdef): boolean; function is_objcprotocol(def: tdef): boolean; @@ -4153,7 +4149,7 @@ implementation fcurrent_dispid:=0; objecttype:=ot; childof:=nil; - if objecttype in [odt_classhelper] then + if objecttype=odt_helper then owner.includeoption(sto_has_classhelper); symtable:=tObjectSymtable.create(self,n,current_settings.packrecords); { create space for vmt !! } @@ -4163,7 +4159,7 @@ implementation if objecttype in [odt_interfacecorba,odt_interfacecom,odt_dispinterface] then prepareguid; { setup implemented interfaces } - if objecttype in [odt_class,odt_objcclass,odt_objcprotocol,odt_classhelper] then + if objecttype in [odt_class,odt_objcclass,odt_objcprotocol] then ImplementedInterfaces:=TFPObjectList.Create(true) else ImplementedInterfaces:=nil; @@ -4205,8 +4201,8 @@ implementation iidstr:=stringdup(ppufile.getstring); end; - if oo_is_classhelper in objectoptions then - ppufile.getderef(helperparentderef); + if objecttype=odt_helper then + ppufile.getderef(extendeddefderef); vmtentries:=TFPList.Create; vmtentries.count:=ppufile.getlongint; @@ -4369,8 +4365,8 @@ implementation ppufile.putguid(iidguid^); ppufile.putstring(iidstr^); end; - if oo_is_classhelper in objectoptions then - ppufile.putderef(helperparentderef); + if objecttype=odt_helper then + ppufile.putderef(extendeddefderef); ppufile.putlongint(vmtentries.count); for i:=0 to vmtentries.count-1 do @@ -4429,8 +4425,8 @@ implementation else tstoredsymtable(symtable).buildderef; - if oo_is_classhelper in objectoptions then - helperparentderef.build(helperparent); + if objecttype=odt_helper then + extendeddefderef.build(extendeddef); for i:=0 to vmtentries.count-1 do begin @@ -4460,8 +4456,8 @@ implementation end else tstoredsymtable(symtable).deref; - if oo_is_classhelper in objectoptions then - helperparent:=tobjectdef(helperparentderef.resolve); + if objecttype=odt_helper then + extendeddef:=tobjectdef(extendeddefderef.resolve); for i:=0 to vmtentries.count-1 do begin vmtentry:=pvmtentry(vmtentries[i]); @@ -4743,14 +4739,9 @@ implementation (assigned(childof) and childof.implements_any_interfaces); end; - procedure tobjectdef.finish_classhelper; - begin - self.symtable.DefList.foreachcall(@create_class_helper_for_procdef,nil); - end; - function tobjectdef.size : aint; begin - if objecttype in [odt_class,odt_interfacecom,odt_interfacecorba,odt_dispinterface,odt_objcclass,odt_objcprotocol] then + if objecttype in [odt_class,odt_interfacecom,odt_interfacecorba,odt_dispinterface,odt_objcclass,odt_objcprotocol,odt_helper] then result:=sizeof(pint) else result:=tObjectSymtable(symtable).datasize; @@ -4759,7 +4750,7 @@ implementation function tobjectdef.alignment:shortint; begin - if objecttype in [odt_class,odt_interfacecom,odt_interfacecorba,odt_dispinterface,odt_objcclass,odt_objcprotocol] then + if objecttype in [odt_class,odt_interfacecom,odt_interfacecorba,odt_dispinterface,odt_objcclass,odt_objcprotocol,odt_helper] then alignment:=sizeof(pint) else alignment:=tObjectSymtable(symtable).recordalignment; @@ -4773,6 +4764,7 @@ implementation odt_class: { the +2*sizeof(pint) is size and -size } vmtmethodoffset:=(index+10)*sizeof(pint)+2*sizeof(pint); + odt_helper, odt_objcclass, odt_objcprotocol: vmtmethodoffset:=0; @@ -4799,6 +4791,7 @@ implementation function tobjectdef.needs_inittable : boolean; begin case objecttype of + odt_helper, odt_class : needs_inittable:=false; odt_dispinterface, @@ -5472,16 +5465,12 @@ implementation end; - function is_objectpascal_classhelper(def: tdef): boolean; + function is_objectpascal_helper(def: tdef): boolean; begin result:= assigned(def) and (def.typ=objectdef) and - { if used as a forward type } - ((tobjectdef(def).objecttype=odt_classhelper) or - { if used as after it has been resolved } - ((tobjectdef(def).objecttype=odt_class) and - (oo_is_classhelper in tobjectdef(def).objectoptions))); + (tobjectdef(def).objecttype=odt_helper); end; @@ -5537,7 +5526,7 @@ implementation function is_classhelper(def: tdef): boolean; begin result:= - is_objectpascal_classhelper(def) or + is_objectpascal_helper(def) or is_objccategory(def); end; diff --git a/compiler/symtable.pas b/compiler/symtable.pas index 01e63a0410..566657f5c8 100644 --- a/compiler/symtable.pas +++ b/compiler/symtable.pas @@ -220,7 +220,7 @@ interface function searchsym_type(const s : TIDString;out srsym:tsym;out srsymtable:TSymtable):boolean; function searchsym_in_module(pm:pointer;const s : TIDString;out srsym:tsym;out srsymtable:TSymtable):boolean; function searchsym_in_named_module(const unitname, symname: TIDString; out srsym: tsym; out srsymtable: tsymtable): boolean; - function searchsym_in_class(classh,contextclassh:tobjectdef;const s : TIDString;out srsym:tsym;out srsymtable:TSymtable):boolean; + function searchsym_in_class(classh,contextclassh:tobjectdef;const s : TIDString;out srsym:tsym;out srsymtable:TSymtable;searchhelper:boolean):boolean; function searchsym_in_record(recordh:tabstractrecorddef;const s : TIDString;out srsym:tsym;out srsymtable:TSymtable):boolean; function searchsym_in_class_by_msgint(classh:tobjectdef;msgid:longint;out srdef : tdef;out srsym:tsym;out srsymtable:TSymtable):boolean; function searchsym_in_class_by_msgstr(classh:tobjectdef;const s:string;out srsym:tsym;out srsymtable:TSymtable):boolean; @@ -229,7 +229,7 @@ interface function search_struct_member(pd : tabstractrecorddef;const s : string):tsym; function search_assignment_operator(from_def,to_def:Tdef;explicit:boolean):Tprocdef; function search_enumerator_operator(from_def,to_def:Tdef):Tprocdef; - function search_last_objectpascal_classhelper(pd : tobjectdef;out odef : tobjectdef):boolean; + function search_last_objectpascal_helper(pd : tabstractrecorddef;out odef : tobjectdef):boolean; function search_objectpascal_class_helper(pd,contextclassh : tobjectdef;const s : string; out srsym: tsym; out srsymtable: tsymtable):boolean; function search_class_helper(pd : tobjectdef;const s : string; out srsym: tsym; out srsymtable: tsymtable):boolean; function search_objc_method(const s : string; out srsym: tsym; out srsymtable: tsymtable):boolean; @@ -1906,7 +1906,7 @@ implementation srsymtable:=stackitem^.symtable; if (srsymtable.symtabletype=objectsymtable) then begin - if searchsym_in_class(tobjectdef(srsymtable.defowner),tobjectdef(srsymtable.defowner),s,srsym,srsymtable) then + if searchsym_in_class(tobjectdef(srsymtable.defowner),tobjectdef(srsymtable.defowner),s,srsym,srsymtable,true) then begin result:=true; exit; @@ -2136,19 +2136,27 @@ implementation end; - function searchsym_in_class(classh,contextclassh:tobjectdef;const s : TIDString;out srsym:tsym;out srsymtable:TSymtable):boolean; + function searchsym_in_class(classh,contextclassh:tobjectdef;const s : TIDString;out srsym:tsym;out srsymtable:TSymtable;searchhelper:boolean):boolean; var hashedid : THashedIDString; + exdef : tabstractrecorddef; orgclass : tobjectdef; i : longint; begin { search for a class helper method first if this is an Object Pascal class } - if is_class(classh) then + if is_class(classh) and searchhelper then begin result:=search_objectpascal_class_helper(classh,contextclassh,s,srsym,srsymtable); if result then - exit; + begin + { if the procsym is overloaded we need to use the "original" + symbol; the helper symbol will be find when searching for + overloads } + if (srsym.typ<>procsym) or + not (sp_has_overloaded in tprocsym(srsym).symoptions) then + Exit; + end; end; orgclass:=classh; @@ -2159,8 +2167,9 @@ implementation classh:=find_real_objcclass_definition(classh,true); { The contextclassh is used for visibility. The classh must be equal to or be a parent of contextclassh. E.g. for inherited searches the classh is the - parent. } - if not contextclassh.is_related(classh) then + parent or a class helper. } + if not (contextclassh.is_related(classh) or + (contextclassh.extendeddef=classh)) then internalerror(200811161); end; result:=false; @@ -2180,7 +2189,7 @@ implementation end; for i:=0 to classh.ImplementedInterfaces.count-1 do begin - if searchsym_in_class(TImplementedInterface(classh.ImplementedInterfaces[i]).intfdef,contextclassh,s,srsym,srsymtable) then + if searchsym_in_class(TImplementedInterface(classh.ImplementedInterfaces[i]).intfdef,contextclassh,s,srsym,srsymtable,true) then begin result:=true; exit; @@ -2189,6 +2198,24 @@ implementation end else begin + { if we're searching for a symbol inside a helper, we must search in + the extended class/record/whatever first } + if is_objectpascal_helper(classh) then + begin + { important: disable the search for helpers here! } + if is_class(classh.extendeddef) and + searchsym_in_class(tobjectdef(classh.extendeddef), tobjectdef(classh.extendeddef), s, srsym, srsymtable, false) then + begin + result:=true; + exit; + end + else if is_record(classh.extendeddef) and + searchsym_in_record(classh.extendeddef, s, srsym, srsymtable) then + begin + result:=true; + exit; + end; + end; while assigned(classh) do begin srsymtable:=classh.symtable; @@ -2435,7 +2462,7 @@ implementation end; end; - function search_last_objectpascal_classhelper(pd : tobjectdef;out odef : tobjectdef):boolean; + function search_last_objectpascal_helper(pd : tabstractrecorddef;out odef : tobjectdef):boolean; var stackitem : psymtablestackitem; i : integer; @@ -2455,11 +2482,11 @@ implementation begin if not (srsymtable.symlist[i] is ttypesym) then continue; - if not is_objectpascal_classhelper(ttypesym(srsymtable.symlist[i]).typedef) then + if not is_objectpascal_helper(ttypesym(srsymtable.symlist[i]).typedef) then continue; odef:=tobjectdef(ttypesym(srsymtable.symlist[i]).typedef); { does the class helper extend the correct class? } - result:=odef.childof=pd; + result:=odef.extendeddef=pd; if result then exit else @@ -2482,7 +2509,7 @@ implementation { if there is no class helper for the class then there is no need to search further } - if not search_last_objectpascal_classhelper(pd,classh) then + if not search_last_objectpascal_helper(pd,classh) then exit; hashedid.id:=s; @@ -2524,8 +2551,8 @@ implementation end; end; - { try the class helper "parent" if available } - classh:=classh.helperparent; + { try the class helper parent if available } + classh:=classh.childof; until classh=nil; srsym:=nil;