+ support for automatically generating setters/getters for properties on the

    JVM target, since Java bytecode itself has no support for properties and
    hence exposing properties to external Java code can only be done through
    getters/setters. Use the new parameters to do so:
      -CTautogetterprefix=XXX
      -CTautosetterprefix=YYY
    The getter/setter will get the same visibility as the property. If a
    getter/setter with the same naming convention was already specified for a
    property and this getter/setter is declared in the same class as the
    property, then the visibility of this existing getter/setter is
    modified and no new routine is generated.

    Newly generated getters/setters are virtual methods, because that is
    the only way in Java bytecode to allow redefining these getters/setters
    in child classes. However, that also means that using these switches can
    change the behvaviour of code, since normally the used property definition
    is only determined by the declared type of its associated class instance,
    and not by the actual instance type. The compiler will therefore warn when
    such an automatically generated getter/setter is overridden by another
    automatically generated getter/setter in a child class.

git-svn-id: trunk@22959 -

compiler/globals.pas

@@ -319,6 +319,13 @@ interface
 
        features : tfeatures;
 
+       { prefix added to automatically generated setters/getters. If empty,
+         no getters/setters will be automatically generated except if required
+         for visibility reasons (but in that case the names will be mangled so
+         they are unique) }
+       prop_auto_getter_prefix,
+       prop_auto_setter_prefix : string;
+
     const
        DLLsource : boolean = false;
 
@@ -1335,28 +1342,42 @@ implementation
 
     function UpdateTargetSwitchStr(s: string; var a: ttargetswitches): boolean;
       var
-        tok   : string;
+        tok,
+        value : string;
+        setstr: string[2];
+        equalspos: longint;
         doset,
+        gotvalue,
         found : boolean;
         opt   : ttargetswitch;
       begin
         result:=true;
-        uppervar(s);
         repeat
           tok:=GetToken(s,',');
           if tok='' then
            break;
-          if Copy(tok,1,2)='NO' then
+          setstr:=upper(copy(tok,1,2));
+          if setstr='NO' then
             begin
               delete(tok,1,2);
               doset:=false;
             end
           else
             doset:=true;
+          { value specified? }
+          gotvalue:=false;
+          equalspos:=pos('=',tok);
+          if equalspos<>0 then
+            begin
+              value:=copy(tok,equalspos+1,length(tok));
+              delete(tok,equalspos,length(tok));
+              gotvalue:=true;
+            end;
           found:=false;
+          uppervar(tok);
           for opt:=low(ttargetswitch) to high(ttargetswitch) do
             begin
-              if TargetSwitchStr[opt]=tok then
+              if TargetSwitchStr[opt].name=tok then
                 begin
                   found:=true;
                   break;
@@ -1364,10 +1385,35 @@ implementation
             end;
           if found then
             begin
-              if doset then
-                include(a,opt)
+              if not TargetSwitchStr[opt].hasvalue then
+                begin
+                  if gotvalue then
+                    result:=false;
+                  if doset then
+                    include(a,opt)
+                  else
+                    exclude(a,opt)
+                end
               else
-                exclude(a,opt);
+                begin
+                  if not gotvalue or
+                     not doset then
+                    result:=false
+                  else
+                    begin
+                      case opt of
+                        ts_auto_getter_prefix:
+                          prop_auto_getter_prefix:=value;
+                        ts_auto_setter_predix:
+                          prop_auto_setter_prefix:=value;
+                        else
+                          begin
+                            writeln('Internalerror 2012053001');
+                            halt(1);
+                          end;
+                      end;
+                    end;
+                end;
             end
           else
             result:=false;

compiler/globtype.pas

@@ -221,8 +221,11 @@ interface
            of the current class, then this virtual method may already have
            initialized that field with another value and the constructor
            initialization will result in data loss }
-         ts_jvm_enum_field_init
-
+         ts_jvm_enum_field_init,
+         { when automatically generating getters/setters for properties, use
+           these strings as prefixes for the generated getters/setter names }
+         ts_auto_getter_prefix,
+         ts_auto_setter_predix
        );
        ttargetswitches = set of ttargetswitch;
 
@@ -271,6 +274,11 @@ interface
           flashbase, flashsize, srambase, sramsize, eeprombase, eepromsize: dword;
        end;
 
+       ttargetswitchinfo = record
+          name: string[22];
+          hasvalue: boolean;
+       end;
+
     const
        OptimizerSwitchStr : array[toptimizerswitch] of string[11] = ('',
          'LEVEL1','LEVEL2','LEVEL3',
@@ -286,10 +294,14 @@ interface
        DebugSwitchStr : array[tdebugswitch] of string[22] = ('',
          'DWARFSETS','STABSABSINCLUDES','DWARFMETHODCLASSPREFIX');
 
-       TargetSwitchStr : array[ttargetswitch] of string[19] = ('',
-         'SMALLTOC',
-         'COMPACTINTARRAYINIT',
-         'ENUMFIELDINIT');
+       TargetSwitchStr : array[ttargetswitch] of ttargetswitchinfo = (
+         (name: '';                    hasvalue: false),
+         (name: 'SMALLTOC';            hasvalue: false),
+         (name: 'COMPACTINTARRAYINIT'; hasvalue: false),
+         (name:  'ENUMFIELDINIT';      hasvalue: false),
+         (name: 'AUTOGETTERPREFIX';    hasvalue: true ),
+         (name: 'AUTOSETTERPREFIX';    hasvalue: true )
+       );
 
        { switches being applied to all CPUs at the given level }
        genericlevel1optimizerswitches = [cs_opt_level1];

compiler/jvm/pjvm.pas

@@ -52,15 +52,15 @@ interface
       visibility, then we have to create a getter and/or setter with that same
       higher visibility to make sure that using the property does not result
       in JVM verification errors }
-    procedure jvm_create_getter_for_property(p: tpropertysym);
-    procedure jvm_create_setter_for_property(p: tpropertysym);
+    procedure jvm_create_getter_for_property(p: tpropertysym; orgaccesspd: tprocdef);
+    procedure jvm_create_setter_for_property(p: tpropertysym; orgaccesspd: tprocdef);
 
 
 implementation
 
   uses
     cutils,cclasses,
-    verbose,systems,
+    verbose,globals,systems,
     fmodule,
     parabase,aasmdata,
     pdecsub,ngenutil,pparautl,
@@ -850,17 +850,22 @@ implementation
       end;
 
 
-    procedure jvm_create_getter_or_setter_for_property(p: tpropertysym; getter: boolean);
+    procedure jvm_create_getter_or_setter_for_property(p: tpropertysym; orgaccesspd: tprocdef; getter: boolean);
       var
         obj: tabstractrecorddef;
         ps: tprocsym;
         pvs: tparavarsym;
-        pd: tprocdef;
+        sym: tsym;
+        pd, parentpd, accessorparapd: tprocdef;
         tmpaccesslist: tpropaccesslist;
         callthroughpropname,
         name: string;
         callthroughprop: tpropertysym;
         accesstyp: tpropaccesslisttypes;
+        sktype: tsynthetickind;
+        procoptions: tprocoptions;
+        paranr: word;
+        explicitwrapper: boolean;
       begin
         obj:=current_structdef;
         { if someone gets the idea to add a property to an external class
@@ -870,108 +875,241 @@ implementation
           exit;
         symtablestack.push(obj.symtable);
 
-        if getter then
-          accesstyp:=palt_read
-        else
-          accesstyp:=palt_write;
-
-        { create a property for the old symaccesslist with a new name, so that
-          we can reuse it in the implementation (rather than having to
-          translate the symaccesslist back to Pascal code) }
-        callthroughpropname:='__fpc__'+p.realname;
-        if getter then
-          callthroughpropname:=callthroughpropname+'__getter_wrapper'
-        else
-          callthroughpropname:=callthroughpropname+'__setter_wrapper';
-        callthroughprop:=tpropertysym.create(callthroughpropname);
-        callthroughprop.visibility:=p.visibility;
-        callthroughprop.default:=longint($80000000);
-        if sp_static in p.symoptions then
-          include(callthroughprop.symoptions, sp_static);
-        { copy original property target to callthrough property (and replace
-          original one with the new empty list; will be filled in later) }
-        tmpaccesslist:=callthroughprop.propaccesslist[accesstyp];
-        callthroughprop.propaccesslist[accesstyp]:=p.propaccesslist[accesstyp];
-        p.propaccesslist[accesstyp]:=tmpaccesslist;
-        p.owner.insert(callthroughprop);
-
-        { we can't use str_parse_method_dec here because the type of the field
-          may not be visible at the Pascal level }
-
-        { create procdef }
-        pd:=tprocdef.create(normal_function_level);
-        if df_generic in obj.defoptions then
-          include(pd.defoptions,df_generic);
-
-        { construct procsym name (unique for this access; reusing the same
-          helper for multiple accesses to the same field is hard because the
-          propacesslist can contain subscript nodes etc) }
-        name:=visibilityName[p.visibility];
-        replace(name,' ','_');
-        if getter then
-          name:=name+'$getter'
-        else
-          name:=name+'$setter';
-        name:='$'+obj.symtable.realname^+'$'+p.realname+'$'+name+'$'+tostr(pd.defid);
-
-        { new procsym }
-        ps:=tprocsym.create(name);
-        obj.symtable.insert(ps);
-        { associate procsym with procdef}
-        pd.procsym:=ps;
-
-        { method of this objectdef }
-        pd.struct:=obj;
-        { visibility }
-        pd.visibility:=p.visibility;
-        { function/procedure }
-        if getter then
-          begin
-            pd.proctypeoption:=potype_function;
-            pd.synthetickind:=tsk_field_getter;
-            { result type }
-            pd.returndef:=p.propdef;
-          end
-        else
-          begin
-            pd.proctypeoption:=potype_procedure;
-            pd.synthetickind:=tsk_field_setter;
-            pd.returndef:=voidtype;
-            { parameter with value to set }
-            pvs:=tparavarsym.create('__fpc_newval__',10,vs_const,p.propdef,[]);
-            pd.parast.insert(pvs);
-          end;
-        pd.skpara:=callthroughprop;
-        { needs to be exported }
-        include(pd.procoptions,po_global);
-        { class property -> static class method }
-        if sp_static in p.symoptions then
-          pd.procoptions:=pd.procoptions+[po_classmethod,po_staticmethod];
-        { calling convention, self, ... }
-        if obj.typ=recorddef then
-          handle_calling_convention(pd,[hcc_check])
-        else
-          handle_calling_convention(pd,hcc_all);
-        { register forward declaration with procsym }
-        proc_add_definition(pd);
+        try
+          if getter then
+            accesstyp:=palt_read
+          else
+            accesstyp:=palt_write;
+
+          { we can't use str_parse_method_dec here because the type of the field
+            may not be visible at the Pascal level }
+
+          explicitwrapper:=
+            { private methods are not visibile outside the current class, so
+              no use in making life harder for us by introducing potential
+              (future or current) naming conflicts }
+            (p.visibility<>vis_private) and
+            (getter and
+             (prop_auto_getter_prefix<>'')) or
+            (not getter and
+             (prop_auto_getter_prefix<>''));
+          sym:=nil;
+          procoptions:=[];
+          if explicitwrapper then
+            begin
+              if getter then
+                name:=prop_auto_getter_prefix+p.realname
+              else
+                name:=prop_auto_setter_prefix+p.realname;
+              sym:=search_struct_member_no_helper(obj,upper(name));
+              if getter then
+                sktype:=tsk_field_getter
+              else
+                sktype:=tsk_field_setter;
+              if assigned(sym) then
+                begin
+                  if ((sym.typ<>procsym) or
+                      (tprocsym(sym).procdeflist.count<>1) or
+                      (tprocdef(tprocsym(sym).procdeflist[0]).synthetickind<>sktype)) and
+                     (not assigned(orgaccesspd) or
+                      (sym<>orgaccesspd.procsym)) then
+                    begin
+                      MessagePos2(p.fileinfo,parser_e_cannot_generate_property_getter_setter,name,FullTypeName(tdef(sym.owner.defowner),nil)+'.'+name);
+                      exit;
+                    end
+                  else
+                    begin
+                      if name<>sym.realname then
+                        MessagePos2(p.fileinfo,parser_w_case_difference_auto_property_getter_setter_prefix,sym.realname,name);
+                      { is the specified getter/setter defined in the current
+                        struct and was it originally specified as the getter/
+                        setter for this property? If so, simply adjust its
+                        visibility if necessary.
+                      }
+                      if assigned(orgaccesspd) then
+                        parentpd:=orgaccesspd
+                      else
+                        parentpd:=tprocdef(tprocsym(sym).procdeflist[0]);
+                      if parentpd.owner.defowner=p.owner.defowner then
+                        begin
+                          parentpd.visibility:=p.visibility;
+                          include(parentpd.procoptions,po_auto_raised_visibility);
+                          { we are done, no need to create a wrapper }
+                          exit
+                        end
+                      { a parent already included this getter/setter -> try to
+                        override it }
+                      else if parentpd.visibility<>vis_private then
+                        begin
+                          if po_virtualmethod in parentpd.procoptions then
+                            begin
+                              procoptions:=procoptions+[po_virtualmethod,po_overridingmethod];
+                              Message2(parser_w_overriding_property_getter_setter,name,FullTypeName(tdef(parentpd.owner.defowner),nil));
+                            end;
+                          { otherwise we can't do anything, and
+                            proc_add_definition will give an error }
+                        end
+                    end;
+                end;
+              { make the artificial getter/setter virtual so we can override it in
+                children if necessary }
+              if not(sp_static in p.symoptions) and
+                 (obj.typ=objectdef) then
+                include(procoptions,po_virtualmethod);
+              { prevent problems in Delphi mode }
+              include(procoptions,po_overload);
+            end
+          else
+            begin
+              { construct procsym name (unique for this access; reusing the same
+                helper for multiple accesses to the same field is hard because the
+                propacesslist can contain subscript nodes etc) }
+              name:=visibilityName[p.visibility];
+              replace(name,' ','_');
+              if getter then
+                name:=name+'$getter'
+              else
+                name:=name+'$setter';
+            end;
+
+          { create procdef }
+          if not assigned(orgaccesspd) then
+            begin
+              pd:=tprocdef.create(normal_function_level);
+              if df_generic in obj.defoptions then
+                include(pd.defoptions,df_generic);
+              { method of this objectdef }
+              pd.struct:=obj;
+              { can only construct the artificial name now, because it requires
+                pd.defid }
+              if not explicitwrapper then
+                name:='$'+obj.symtable.realname^+'$'+p.realname+'$'+name+'$'+tostr(pd.defid);
+            end
+          else
+            begin
+              { getter/setter could have parameters in case of indexed access
+                -> copy original procdef }
+              pd:=tprocdef(orgaccesspd.getcopy);
+              { can only construct the artificial name now, because it requires
+                pd.defid }
+              if not explicitwrapper then
+                name:='$'+obj.symtable.realname^+'$'+p.realname+'$'+name+'$'+tostr(pd.defid);
+              finish_copied_procdef(pd,name,obj.symtable,obj);
+              sym:=pd.procsym;
+            end;
+          { add previously collected procoptions }
+          pd.procoptions:=pd.procoptions+procoptions;
+          { visibility }
+          pd.visibility:=p.visibility;
+
+          { new procsym? }
+          if not assigned(sym) or
+             (sym.owner<>p.owner)  then
+            begin
+              ps:=tprocsym.create(name);
+              obj.symtable.insert(ps);
+            end
+          else
+            ps:=tprocsym(sym);
+          { associate procsym with procdef}
+          pd.procsym:=ps;
 
-        { make the property call this new function }
-        p.propaccesslist[accesstyp].addsym(sl_call,ps);
-        p.propaccesslist[accesstyp].procdef:=pd;
 
-        symtablestack.pop(obj.symtable);
+
+          { function/procedure }
+          accessorparapd:=nil;
+          if getter then
+            begin
+              pd.proctypeoption:=potype_function;
+              pd.synthetickind:=tsk_field_getter;
+              { result type }
+              pd.returndef:=p.propdef;
+              if (ppo_hasparameters in p.propoptions) and
+                 not assigned(orgaccesspd) then
+                accessorparapd:=pd;
+            end
+          else
+            begin
+              pd.proctypeoption:=potype_procedure;
+              pd.synthetickind:=tsk_field_setter;
+              pd.returndef:=voidtype;
+              if not assigned(orgaccesspd) then
+                begin
+                  { parameter with value to set }
+                  pvs:=tparavarsym.create('__fpc_newval__',10,vs_const,p.propdef,[]);
+                  pd.parast.insert(pvs);
+                end;
+              if (ppo_hasparameters in p.propoptions) and
+                 not assigned(orgaccesspd) then
+                accessorparapd:=pd;
+            end;
+
+          { create a property for the old symaccesslist with a new name, so that
+            we can reuse it in the implementation (rather than having to
+            translate the symaccesslist back to Pascal code) }
+          callthroughpropname:='__fpc__'+p.realname;
+          if getter then
+            callthroughpropname:=callthroughpropname+'__getter_wrapper'
+          else
+            callthroughpropname:=callthroughpropname+'__setter_wrapper';
+          callthroughprop:=tpropertysym.create(callthroughpropname);
+          callthroughprop.visibility:=p.visibility;
+
+          if getter then
+            p.makeduplicate(callthroughprop,accessorparapd,nil,paranr)
+          else
+            p.makeduplicate(callthroughprop,nil,accessorparapd,paranr);
+
+          callthroughprop.default:=longint($80000000);
+          callthroughprop.default:=0;
+          callthroughprop.propoptions:=callthroughprop.propoptions-[ppo_stored,ppo_enumerator_current,ppo_overrides,ppo_defaultproperty];
+          if sp_static in p.symoptions then
+            include(callthroughprop.symoptions, sp_static);
+          { copy original property target to callthrough property (and replace
+            original one with the new empty list; will be filled in later) }
+          tmpaccesslist:=callthroughprop.propaccesslist[accesstyp];
+          callthroughprop.propaccesslist[accesstyp]:=p.propaccesslist[accesstyp];
+          p.propaccesslist[accesstyp]:=tmpaccesslist;
+          p.owner.insert(callthroughprop);
+
+          pd.skpara:=callthroughprop;
+          { needs to be exported }
+          include(pd.procoptions,po_global);
+          { class property -> static class method }
+          if sp_static in p.symoptions then
+            pd.procoptions:=pd.procoptions+[po_classmethod,po_staticmethod];
+
+          { in case we made a copy of the original accessor, this has all been
+            done already }
+          if not assigned(orgaccesspd) then
+            begin
+              { calling convention, self, ... }
+              if obj.typ=recorddef then
+                handle_calling_convention(pd,[hcc_check])
+              else
+                handle_calling_convention(pd,hcc_all);
+              { register forward declaration with procsym }
+              proc_add_definition(pd);
+            end;
+
+          { make the property call this new function }
+          p.propaccesslist[accesstyp].addsym(sl_call,ps);
+          p.propaccesslist[accesstyp].procdef:=pd;
+        finally
+          symtablestack.pop(obj.symtable);
+        end;
       end;
 
 
-    procedure jvm_create_getter_for_property(p: tpropertysym);
+    procedure jvm_create_getter_for_property(p: tpropertysym; orgaccesspd: tprocdef);
       begin
-        jvm_create_getter_or_setter_for_property(p,true);
+        jvm_create_getter_or_setter_for_property(p,orgaccesspd,true);
       end;
 
 
-    procedure jvm_create_setter_for_property(p: tpropertysym);
+    procedure jvm_create_setter_for_property(p: tpropertysym; orgaccesspd: tprocdef);
       begin
-        jvm_create_getter_or_setter_for_property(p,false);
+        jvm_create_getter_or_setter_for_property(p,orgaccesspd,false);
       end;
 
 end.

compiler/msg/errore.msg

@@ -390,7 +390,7 @@ scan_w_unavailable_system_codepage=02091_W_Current system codepage "$1" is not a
 #
 # Parser
 #
-# 03324 is the last used one
+# 03327 is the last used one
 #
 % \section{Parser messages}
 % This section lists all parser messages. The parser takes care of the
@@ -1446,12 +1446,31 @@ parser_e_jvm_invalid_virtual_constructor_call=03321_E_Calling a virtual construc
 % for the current instance inside another constructor.
 parser_e_method_lower_visibility=03322_E_Overriding method "$1" cannot have a lower visibility ($2) than in parent class $3 ($4)
 % The JVM does not allow lowering the visibility of an overriding method.
-% \end{description}
 parser_w_nostackframe_without_assembler=03323_W_Procedure/Function declared with call option NOSTACKFRAME but without ASSEMBLER
 % nostackframe call modifier is supposed to be used in conjunction with assembler.
 parser_e_nostackframe_with_locals=03324_E_Procedure/Function declared with call option NOSTACKFRAME but local stack size is $1
 % nostackframe call modifier used without assembler modifier
 % might still generate local stack needs.
+parser_e_cannot_generate_property_getter_setter=03325_E_Cannot generate property getter/setter $1 because its name clashes with existing identifier $2
+% Automatically generated getters/setters cannot have the same name as existing
+% identifiers, because this may change the behaviour of existing code.
+parser_w_overriding_property_getter_setter=03326_W_Automatically generated property getter/setter $1 overrides the same-named getter/setter in class $2
+% Automatically generated property getters/setters on the JVM platform are virtual methods, because
+% the JVM does not support non-virtual methods that can be changed in child classes. This means
+% that if a child class changes an inherited property definition, the behaviour of that property
+% can change compared to native targets since even if a variable is declared as the parent type,
+% by calling the virtual method the getter from the child will be used. This is different from
+% the behaviour on native targets or when not activating automatically generated setters/getters,
+% because in that case only the declared type of a variable influences the property behaviour.
+parser_w_case_difference_auto_property_getter_setter_prefix=03327_W_Case mismatch between declared property getter/setter $1 and automatically constructed name $2, not changing declared name
+% If a property's specified getter/setter already corresponded to the naming convention specified
+% by the automatic getter/setter generation setting except in terms of upper/lowercase, the
+% compiler will print a warning because it cannot necessarily change that other declaration itself
+% not can it add one using the correct case (it could conflict with the original declaration).
+% Manually correct the case of the getter/setter to conform to the desired coding rules.
+% \var{TChild} overrides
+%
+% \end{description}
 %
 # Type Checking
 #
@@ -3359,8 +3378,10 @@ J*2CT<x>_Target-specific code generation options
 p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed (AIX)
 P*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed (AIX)
 J*3CTcompactintarrayinit_ Generate smaller (but potentially slower) code for initializing integer array constants
-K*3CTenumfieldinit_ Initialize enumeration fields in constructors to enumtype(0), after calling inherited constructors
+J*3CTenumfieldinit_ Initialize enumeration fields in constructors to enumtype(0), after calling inherited constructors
 J*2Cv_Var/out parameter copy-out checking
+J*3CTautogetterprefix=X_ Automatically create getters for properties with prefix X (empty string disables)
+J*3CTautosetterprefix=X_ Automatically create setters for properties with prefix X (empty string disables)
 **2CX_Create also smartlinked library
 **1d<x>_Defines the symbol <x>
 **1D_Generate a DEF file

compiler/msgidx.inc

@@ -419,6 +419,9 @@ const
   parser_e_method_lower_visibility=03322;
   parser_w_nostackframe_without_assembler=03323;
   parser_e_nostackframe_with_locals=03324;
+  parser_e_cannot_generate_property_getter_setter=03325;
+  parser_w_overriding_property_getter_setter=03326;
+  parser_w_case_difference_auto_property_getter_setter_prefix=03327;
   type_e_mismatch=04000;
   type_e_incompatible_types=04001;
   type_e_not_equal_types=04002;
@@ -957,9 +960,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 67227;
+  MsgTxtSize = 67784;
 
   MsgIdxMax : array[1..20] of longint=(
-    26,92,325,120,87,56,125,26,202,63,
+    26,92,328,120,87,56,125,26,202,63,
     53,20,1,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000280] of string[240]=(
+const msgtxt : array[0..000282] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000280,1..240] of char=(
+const msgtxt : array[0..000282,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -520,654 +520,658 @@ const msgtxt : array[0..000280,1..240] of char=(
   'without ASSEMBLER'#000+
   '03324_E_Procedure/Function declared w','ith call option NOSTACKFRAME bu'+
   't local stack size is $1'#000+
+  '03325_E_Cannot generate property getter/setter $1 because its name cla'+
+  'shes with existing identifier $2'#000+
+  '03326_W_Automatically generated property getter/setter $1 overrides th'+
+  'e same-name','d getter/setter in class $2'#000+
+  '03327_W_Case mismatch between declared property getter/setter $1 and a'+
+  'utomatically constructed name $2, not changing declared name'#000+
   '04000_E_Type mismatch'#000+
   '04001_E_Incompatible types: got "$1" expected "$2"'#000+
-  '04002_E_Type mismatch between "$1" and "$2"'#000+
+  '04002_E_','Type mismatch between "$1" and "$2"'#000+
   '04003_E_Type identifier expected'#000+
-  '04004_E_Variable identifier expect','ed'#000+
+  '04004_E_Variable identifier expected'#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+
+  '04007_E_Ordinal expression expecte','d'#000+
   '04008_E_pointer type expected, but got "$1"'#000+
   '04009_E_class type expected, but got "$1"'#000+
-  '04011_E_Can'#039't e','valuate constant expression'#000+
+  '04011_E_Can'#039't evaluate constant expression'#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+
-  '04015_H_use DIV instead to get an integer r','esult'#000+
+  '04014_W_Automatic type con','version from floating type to COMP which i'+
+  's an integer type'#000+
+  '04015_H_use DIV instead to get an integer result'#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+
+  '04018_E_Can'#039't re','ad or write variables of this type'#000+
   '04019_E_Can'#039't use readln or writeln on typed file'#000+
-  '04020_E_Can'#039't use ','read or write on untyped file.'#000+
+  '04020_E_Can'#039't use read or write on untyped file.'#000+
   '04021_E_Type conflict between set elements'#000+
   '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
-  '04023_E_Integer or real expression expected'#000+
+  '0','4023_E_Integer or real expression expected'#000+
   '04024_E_Wrong type "$1" in array constructor'#000+
-  '04025_E_Incompa','tible type for arg no. $1: Got "$2", expected "$3"'#000+
+  '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+
   '04026_E_Method (variable) and Procedure (variable) are not compatible'#000+
-  '04027_E_Illegal constant passed to internal math function'#000+
+  '04027_E_Illegal ','constant passed to internal math function'#000+
   '04028_E_Can'#039't take the address of constant expressions'#000+
-  '04029_','E_Argument can'#039't be assigned to'#000+
+  '04029_E_Argument can'#039't be assigned to'#000+
   '04030_E_Can'#039't assign local procedure/function to procedure variabl'+
   'e'#000+
-  '04031_E_Can'#039't assign values to an address'#000+
+  '04031_E_Can'#039't assign values to an add','ress'#000+
   '04032_E_Can'#039't assign values to const variable'#000+
   '04033_E_Array type required'#000+
-  '04034_E_interface type e','xpected, but got "$1"'#000+
+  '04034_E_interface type expected, but got "$1"'#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+
+  '04036_W_Mixing signed expressions and cardinal','s here may cause a ran'+
+  'ge check error'#000+
   '04037_E_Typecast has different size ($1 -> $2) in assignment'#000+
-  '04038','_E_enums with assignments can'#039't be used as array index'#000+
+  '04038_E_enums with 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+
+  '04040_W_Class types "$','1" and "$2" are not related'#000+
   '04041_E_Class or interface type expected, but got "$1"'#000+
-  '04042_E_Type "$1" is',' not completely defined'#000+
+  '04042_E_Type "$1" is not completely defined'#000+
   '04043_W_String literal has more characters than short string length'#000+
-  '04044_W_Comparison might be always false due to range of constant and '+
-  'expression'#000+
-  '04045_W_Comparison might be always true due to range of constant an','d'+
-  ' expression'#000+
+  '04044_W_Comparison might be always false due ','to range of constant an'+
+  'd expression'#000+
+  '04045_W_Comparison might be always true due to range of constant and e'+
+  'xpression'#000+
   '04046_W_Constructing a class "$1" with abstract method "$2"'#000+
-  '04047_H_The 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, poss','ible loss of data / range check erro'+
-  'r'#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+
-  '04051_E_Assignments to formal parameters and open arrays are not possi'+
-  'ble'#000+
+  '04051_E_Assignments to formal parameters a','nd open arrays are not pos'+
+  'sible'#000+
   '04052_E_Constant Expression expected'#000+
-  '04053_E_Operation "$1" not support','ed 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_Conversion 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 overloa','ded function to call'#000+
+  '04057_E_Can'#039't determine which overloaded function to call'#000+
   '04058_E_Illegal counter variable'#000+
   '04059_W_Converting constant real value to double for C variable argume'+
-  'nt, add explicit typecast to prevent this.'#000+
+  'nt, add expli','cit typecast to prevent this.'#000+
   '04060_E_Class or COM interface type expected, but got "$1"'#000+
-  '04061_E_Consta','nt packed arrays are not yet supported'#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+
+  '04063_E_Incompatib','le type for arg no. $1: Got "$2" expected "(not pa'+
+  'cked) 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 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 mark','ed as local'#000+
+  '04066_W_Arithmetic "$1" on u','ntyped pointer is unportable to {$T+}, s'+
+  'uggest typecast'#000+
+  '04076_E_Can'#039't take address of a subroutine marked as local'#000+
   '04077_E_Can'#039't export subroutine marked as local from a unit'#000+
   '04078_E_Type is not automatable: "$1"'#000+
-  '04079_H_Converting the operands to "$1" before doing the add could pre'+
-  'vent overflow errors.'#000+
-  '04080_H_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'+
+  '04079_H_Converting the oper','ands to "$1" before doing the add could p'+
+  'revent overflow errors.'#000+
+  '04080_H_Converting the operands to "$1" before doing the subtract coul'+
   'd prevent overflow errors.'#000+
+  '04081_H_Converting the operands to "$1" before doing the multiply coul'+
+  'd preven','t overflow errors.'#000+
   '04082_W_Converting pointers to signed integers may result in wrong com'+
-  'parison result','s and range errors, use an unsigned type instead.'#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+
+  '04085_E_','Expected Objective-C method, but got $1'#000+
   '04086_E_Expected Objective-C method or constant method name'#000+
-  '040','87_E_No type info available for this type'#000+
+  '04087_E_No type info available for this type'#000+
   '04088_E_Ordinal or string expression expected'#000+
   '04089_E_String expression expected'#000+
-  '04090_W_Converting 0 to NIL'#000+
+  '04090_W_Conver','ting 0 to NIL'#000+
   '04091_E_Objective-C protocol type expected, but got "$1"'#000+
-  '04092_E_The type "$1" is not sup','ported for interaction with the Obje'+
-  'ctive-C runtime.'#000+
+  '04092_E_The type "$1" is not supported for interaction with the Object'+
+  'ive-C runtime.'#000+
   '04093_E_Class or objcclass type expected, but got "$1"'#000+
-  '04094_E_Objcclass type expected'#000+
+  '04094_E_Objcclass type expect','ed'#000+
   '04095_W_Coerced univ parameter type in procedural variable may cause c'+
-  'rash or memory corruption: $1 ','to $2'#000+
+  'rash or memory corruption: $1 to $2'#000+
   '04096_E_Type parameters of specializations of generics cannot referenc'+
   '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 declaratio'+
-  'n'#000+
+  '04097_E_Type parameters are ','not allowed on non-generic class/record/'+
+  'object procedure or function'#000+
+  '04098_E_Generic declaration of "$1" differs from previous declaration'#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+
+  '04101_E_Derived class helper must extend a ','subclass of "$1" or the c'+
+  'lass itself'#000+
   '04102_E_Derived record helper must extend "$1"'#000+
-  '04103_E_Invalid ass','ignment, procedures return no value'#000+
+  '04103_E_Invalid assignment, procedures return no value'#000+
   '04104_W_Implicit string type conversion from "$1" to "$2"'#000+
-  '04105_W_Implicit string type conversion with potential data loss from '+
-  '"$1" to "$2"'#000+
+  '04105_W_Implicit string type conversion wit','h potential data loss fro'+
+  'm "$1" to "$2"'#000+
   '04106_-W_Explicit string typecast from "$1" to "$2"'#000+
-  '04107_-W_Ex','plicit string typecast with potential data loss from "$1"'+
-  ' to "$2"'#000+
+  '04107_-W_Explicit string typecast with potential data loss from "$1" t'+
+  'o "$2"'#000+
   '04108_W_Unicode constant cast with potential data loss'#000+
-  '04109_E_range check error while evaluating constants ($1 must be betwe'+
-  'en $2 and $3)'#000+
-  '04110_W_range check error while eva','luating constants ($1 must be bet'+
+  '04109_E_range ch','eck error while evaluating constants ($1 must be bet'+
   'ween $2 and $3)'#000+
+  '04110_W_range check error while evaluating constants ($1 must be betwe'+
+  'en $2 and $3)'#000+
   '04111_E_This type is not supported for the Default() intrinsic'#000+
-  '04112_E_JVM virtual class methods cannot be static'#000+
+  '04112_E_JVM virtual class',' methods cannot be static'#000+
   '04113_E_Final (class) fields can only be assigned in their class'#039' '+
-  '(class) con','structor'#000+
+  '(class) constructor'#000+
   '04114_E_It is not possible to typecast untyped parameters on managed p'+
   'latforms, simply assign a value to them instead.'#000+
-  '04115_E_The assignment side of an expression cannot be typecasted to a'+
-  ' supertype on managed platforms'#000+
-  '04116_-W_T','he interface method "$1" raises the visibility of "$2" to '+
-  'public when accessed via an interface instance'#000+
-  '04117_E_The interface method "$1" has a higher visibility (public) tha'+
-  'n "$2"'#000+
+  '04115_E_T','he assignment side of an expression cannot be typecasted to'+
+  ' a supertype on managed platforms'#000+
+  '04116_-W_The interface method "$1" raises the visibility of "$2" to pu'+
+  'blic when accessed via an interface instance'#000+
+  '04117_E_The interface method "$1','" has a higher visibility (public) t'+
+  'han "$2"'#000+
   '04118_E_TYPEOF can only be used on object types with VMT'#000+
-  '0','4119_E_It is not possible to define a default value for a parameter'+
-  ' of type "$1"'#000+
+  '04119_E_It is not possible to define a default value for a parameter o'+
+  'f type "$1"'#000+
   '05000_E_Identifier not found "$1"'#000+
-  '05001_F_Internal Error in SymTableStack()'#000+
+  '05001_F_Internal Error',' in SymTableStack()'#000+
   '05002_E_Duplicate identifier "$1"'#000+
-  '05003_H_Identifier already defined in $1 at line ','$2'#000+
+  '05003_H_Identifier already defined in $1 at line $2'#000+
   '05004_E_Unknown identifier "$1"'#000+
   '05005_E_Forward declaration not solved "$1"'#000+
   '05007_E_Error in type definition'#000+
-  '05009_E_Forward type not resolved "$1"'#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_re','cord or class type expected'#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 defined "$1"'#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+
+  '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_illegal type declaration of set elements'#000+
+  '05021_E_illegal typ','e declaration of set elements'#000+
   '05022_E_Forward class definition not resolved "$1"'#000+
-  '05023_H_Unit "$1" not ','used in $2'#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 never used'#000+
-  '05027_N_Local variable "$1" is assigned but never used'#000+
+  '0','5027_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+
+  '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+
-  '05032_E_Set type expected'#000+
+  '05032_E_S','et type expected'#000+
   '05033_W_Function result does not seem to be set'#000+
-  '05034_W_Type "$1" is not aligned corre','ctly in current record for C'#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 initialized'#000+
-  '05037_W_Variable "$1" does not seem to be initialized'#000+
+  '050','37_W_Variable "$1" does not seem to be initialized'#000+
   '05038_E_identifier idents no member "$1"'#000+
-  '05039_H_Fou','nd declaration: $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_Symbol "$1" is deprecated'#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+
+  '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 seem to be initialized'#000+
+  '05058_H_Variable "$1" does not seem to be i','nitialized'#000+
   '05059_W_Function result variable does not seem to initialized'#000+
-  '05060_H_Function result variab','le does not seem to be 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_Symbol "$1" is experimental'#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+
+  '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+
+  '05068_E_Cannot find a "M','oveNext" 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'+
-  ' colons in message string.'#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+
-  '05072_N_Private const "$1.$2" never used'#000+
+  '05072_N_Pr','ivate const "$1.$2" never used'#000+
   '05073_N_Private property "$1.$2" never used'#000+
-  '05074_W_Unit "$1" is depreca','ted'#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_Unit "$1" is not implemented'#000+
+  '05078_W_Unit "$1" i','s not implemented'#000+
   '05079_W_Unit "$1" is experimental'#000+
-  '05080_E_No complete definition of the formally decl','ared class "$1" i'+
-  's in scope'#000+
+  '05080_E_No complete definition of the formally declared class "$1" is '+
+  'in scope'#000+
   '05081_E_Gotos into initialization or finalization blocks of units are '+
   'not allowed'#000+
-  '05082_E_Invalid external name "$1" for formal class "$2"'#000+
+  '05082_E_Invalid external na','me "$1" for formal class "$2"'#000+
   '05083_E_Complete class definition with external name "$1" here'#000+
-  '05084_W_Po','ssible library conflict: symbol "$1" from library "$2" als'+
-  'o found in library "$3"'#000+
-  '05085_E_Cannot add implicit constructor '#039'Create'#039' because ident'+
-  'ifier already used by "$1"'#000+
-  '05086_E_Cannot generate default constructor for class, because parent',
-  ' has no parameterless constructor'#000+
+  '05084_W_Possible library conflict: symbol "$1" from library "$2" also '+
+  'found in library "$3"'#000+
+  '05085_E_Cannot add implicit constructor '#039'Create'#039' becaus','e ide'+
+  'ntifier already used by "$1"'#000+
+  '05086_E_Cannot generate default constructor for class, because parent '+
+  'has no parameterless constructor'#000+
   '06009_E_Parameter list size exceeds 65535 bytes'#000+
   '06012_E_File types must be var parameters'#000+
-  '06013_E_The use of a far pointer isn'#039't allowed there'#000+
+  '06013_E_The u','se of a far pointer isn'#039't allowed there'#000+
   '06015_E_EXPORT declared functions can'#039't be called'#000+
-  '06016_W_Possi','ble illegal call of constructor or destructor'#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+
+  '06020_E_Abstract methods can'#039't be called ','directly'#000+
   '06027_DL_Register $1 weight $2 $3'#000+
   '06029_DL_Stack frame is omitted'#000+
-  '06031_E_Object or class meth','ods can'#039't be inline.'#000+
+  '06031_E_Object or class methods can'#039't be inline.'#000+
   '06032_E_Procvar calls cannot be inline.'#000+
   '06033_E_No code for inline procedure stored'#000+
-  '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
-  'sed, use (set)length instead'#000+
-  '06037_E_Constructors or destructors cann','ot be called inside a '#039'w'+
-  'ith'#039' clause'#000+
+  '06035_E_Element zero of an ansi/','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+
+  '06039_E_Jump in or outside of an exception block',#000+
   '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
-  '06041_W_Parameters size exceeds limi','t for certain cpu'#039's'#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+
+  '06044','_E_BREAK not allowed'#000+
   '06045_E_CONTINUE not allowed'#000+
-  '06046_F_Unknown compilerproc "$1". Check if you use t','he correct run '+
-  'time library.'#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+
+  '06048_H_Inherited call ','to abstract method ignored'#000+
   '06049_E_Goto label "$1" not defined or optimized away'#000+
-  '06050_F_Cannot find ty','pe "$1" in unit "$2". Check if you use the cor'+
-  'rect run time library.'#000+
-  '06051_E_Interprocedural gotos are allowed only to outer subroutines'#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 in the same scope as it is declared'#000+
-  '06053_E_Leaving procedures containing',' explicit or implicit exception'+
-  's frames using goto is not allowed'#000+
+  '06053_E_Leaving procedures containing explicit or implicit exceptions '+
+  'frames using goto is not allowed'#000+
   '06054_E_In ISO mode, the mod operator is defined only for positive quo'+
-  'tient'#000+
+  't','ient'#000+
   '06055_DL_Auto inlining: $1'#000+
   '07000_DL_Starting $1 styled assembler parsing'#000+
-  '07001_DL_Finished $1 styl','ed assembler parsing'#000+
+  '07001_DL_Finished $1 styled assembler parsing'#000+
   '07002_E_Non-label pattern contains @'#000+
   '07004_E_Error building record offset'#000+
   '07005_E_OFFSET used without identifier'#000+
-  '07006_E_TYPE used without identifier'#000+
+  '070','06_E_TYPE used without identifier'#000+
   '07007_E_Cannot use local variable or parameters here'#000+
-  '07008_E_need to ','use OFFSET 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+
+  '0','7012_E_Invalid constant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
-  '07014_E_Invalid reference ','syntax'#000+
+  '07014_E_Invalid reference 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+
+  '07017_E_Invalid base and inde','x register usage'#000+
   '07018_W_Possible error in object field handling'#000+
   '07019_E_Wrong scale factor specified'#000+
-  '0','7020_E_Multiple index register usage'#000+
+  '07020_E_Multiple index register usage'#000+
   '07021_E_Invalid operand type'#000+
   '07022_E_Invalid string as opcode operand: $1'#000+
-  '07023_W_@CODE and @DATA not supported'#000+
+  '07023_W_@CODE and @DATA no','t 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+
+  '07026_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+
+  '07029_W_Fwait can cause emulation problems wit','h emu387'#000+
   '07030_W_$1 without operand translated into $1P'#000+
-  '07031_W_ENTER instruction is not supported by L','inux kernel'#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+
+  '07034_E_Constant value out of b','ounds'#000+
   '07035_E_Error converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
-  '07037_E_Error converting bi','nary $1'#000+
+  '07037_E_Error converting binary $1'#000+
   '07038_E_Error converting hexadecimal $1'#000+
   '07039_H_$1 translated to $2'#000+
   '07040_W_$1 is associated to an overloaded function'#000+
-  '07041_E_Cannot use SELF outside a method'#000+
+  '07041_E_Ca','nnot use SELF outside a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
-  '07043_W_Procedures ','can'#039't return any value in asm code'#000+
+  '07043_W_Procedures can'#039't return any value in asm code'#000+
   '07044_E_SEG not supported'#000+
   '07045_E_Size suffix and destination or source size do not match'#000+
-  '07046_W_Size suffix and destination or source size do not match'#000+
+  '07046_W_Size',' suffix and destination or source size do not match'#000+
   '07047_E_Assembler syntax error'#000+
-  '07048_E_Invalid comb','ination 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+
+  '07051_E_Invalid Strin','g expression'#000+
   '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
-  '07053_E_Unrecognized',' opcode $1'#000+
+  '07053_E_Unrecognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#000+
   '07055_E_Invalid combination of prefix and opcode: $1'#000+
-  '07056_E_Invalid combination of override and opcode: $1'#000+
+  '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_Dupl','icate 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+
+  '07064_E_Invalid',' floating point register name'#000+
   '07066_W_Modulo not supported'#000+
   '07067_E_Invalid floating point constant $1'#000+
-  '0','7068_E_Invalid floating point expression'#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+
+  '07071_E_','Invalid segment override expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
-  '07073_E_Strings not allowed',' as constants'#000+
+  '07073_E_Strings not allowed as constants'#000+
   '07074_E_No type of variable specified'#000+
   '07075_E_assembler code not returned to text section'#000+
-  '07076_E_Not a directive or local symbol $1'#000+
+  '07076_E_Not a directive or local ','symbol $1'#000+
   '07077_E_Using a defined name as a local label'#000+
-  '07078_E_Dollar token is used without an identif','ier'#000+
+  '07078_E_Dollar token is used without an identifier'#000+
   '07079_W_32bit constant created for address'#000+
   '07080_N_.align is target specific, use .balign or .p2align'#000+
-  '07081_E_Can'#039't access fields directly for parameters'#000+
+  '07081_E_Can'#039't access fields dir','ectly for parameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
-  '07083_E_No size specified ','and unable to determine the size of the op'+
-  'erands'#000+
+  '07083_E_No size specified and unable to determine the size of the oper'+
+  'ands'#000+
   '07084_E_Cannot use RESULT in this function'#000+
-  '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
+  '07086_W_"$1" without operand translated into ','"$1 %st,%st(1)"'#000+
   '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
-  '07088_W_"$1 %st(n)" translated into',' "$1 %st(n),%st"'#000+
+  '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
   '07089_E_Char < not allowed here'#000+
   '07090_E_Char > not allowed here'#000+
   '07093_W_ALIGN not supported'#000+
-  '07094_E_Inc and Dec cannot be together'#000+
+  '07094_E_Inc and Dec cannot b','e together'#000+
   '07095_E_Invalid reglist for movem'#000+
   '07096_E_Reglist invalid for opcode'#000+
-  '07097_E_Higher cpu mode',' required ($1)'#000+
+  '07097_E_Higher cpu mode required ($1)'#000+
   '07098_W_No size specified and unable to determine the size of the oper'+
   'ands, using DWORD as default'#000+
-  '07099_E_Syntax error while trying to parse a shifter operand'#000+
+  '07099_E_Syntax error wh','ile trying to parse a shifter operand'#000+
   '07100_E_Address of packed component is not at a byte boundary'#000+
-  '071','01_W_No size specified and unable to determine the size of the op'+
-  'erands, using BYTE as default'#000+
-  '07102_W_Use of +offset(%ebp) for parameters invalid here'#000+
+  '07101_W_No size specified and unable to determine the size of the oper'+
+  'ands, using BYTE as default'#000+
+  '07102_W_Use of +offset(%ebp) for parameter','s invalid here'#000+
   '07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+
   #000+
-  '07104_W_Use of -o','ffset(%ebp) is not recommended for local variable a'+
-  'ccess'#000+
+  '07104_W_Use of -offset(%ebp) is not recommended for local variable acc'+
+  'ess'#000+
   '07105_W_Use of -offset(%esp), access may cause a crash or value may be'+
   ' lost'#000+
-  '07106_E_VMTOffset must be used in combination with a virtual method, a'+
-  'nd "$1" is not virtual'#000+
-  '07107_E_Genera','ting PIC, but reference is not PIC-safe'#000+
+  '0710','6_E_VMTOffset must be used in combination with a virtual method,'+
+  ' and "$1" is not virtual'#000+
+  '07107_E_Generating 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+
+  '07109_E_A register set',' cannot be empty'#000+
   '07110_W_@GOTPCREL is useless and potentially dangereous for local symb'+
   'ols'#000+
-  '07111_W_Cons','tant with general purpose segment register'#000+
+  '07111_W_Constant with general purpose segment register'#000+
   '07112_E_Invalid offset value for $1'#000+
   '07113_E_Invalid register for $1'#000+
-  '07114_E_SEH directives are allowed only in pure assembler procedures'#000+
-  '07115_E_Directive "$1" is not supported for the current targ','et'#000+
+  '07114_E_SEH directives are',' allowed only in pure assembler procedures'+
+  #000+
+  '07115_E_Directive "$1" is not supported for the current target'#000+
   '07116_E_This function'#039's result location cannot be encoded directly'+
   ' in a single operand when "nostackframe" is used'#000+
-  '07117_E_GOTPCREL references in Intel assembler syntax cannot contain a'+
-  ' base or index register, and their offset must 0.'#000+
-  '07','118_E_The current target does not support GOTPCREL relocations'#000+
+  '07117_E_GOTPCREL re','ferences in Intel assembler syntax cannot contain'+
+  ' a base or index register, and their offset must 0.'#000+
+  '07118_E_The current target does not support GOTPCREL relocations'#000+
   '07119_W_Exported/global symbols should accessed via the GOT'#000+
-  '07120_W_Check size of memory operand "$1"'#000+
+  '07120_W_Check ','size of memory operand "$1"'#000+
   '07121_W_Check size of memory operand "$1: memory-operand-size is $2 bi'+
-  'ts, b','ut expected [$3 bits]"'#000+
+  'ts, but expected [$3 bits]"'#000+
   '07122_W_Check size of memory operand "$1: memory-operand-size is $2 bi'+
-  'ts, but expected [$3 bits + $4 byte offset]"'#000+
+  'ts, but expected [$3 bits + $4 byte offset]"',#000+
   '07123_W_Check "$1: offset of memory operand is negative "$2 byte"'#000+
-  '07124_W_Check "$1: size of memory op','erand is empty, but es exists di'+
-  'fferent definitions of the memory size =>> map to $2 (smallest option)'+
-  '"'#000+
-  '08000_F_Too many assembler files'#000+
+  '07124_W_Check "$1: size of memory operand is empty, but es exists diff'+
+  'erent definitions of the memory size =>> map to $2 (smallest option)"'#000+
+  '08000_F_Too many assembler files'#000,
   '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
-  '08003_F_Direct not support f','or binary writers'#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+
+  '08006_E_Asm: Opcode $1 not ','in table'#000+
   '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
-  '08008_E_Asm: 16 Bit references not ','supported'#000+
+  '08008_E_Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
-  '08012_E_Asm: Short jump is out of range $1'#000+
+  '080','12_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
-  '08014_E_Asm: Comp type not supp','orted for this target'#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+
+  '08017_E_Asm: Redefined lab','el $1'#000+
   '08018_E_Asm: First defined here'#000+
   '08019_E_Asm: Invalid register $1'#000+
-  '08020_E_Asm: 16 or 32 Bit refere','nces not supported'#000+
+  '08020_E_Asm: 16 or 32 Bit references not supported'#000+
   '08021_E_Asm: 64 Bit operands not supported'#000+
   '08022_E_Asm: AH,BH,CH or DH cannot be used in an instruction requiring'+
-  ' REX prefix'#000+
+  ' REX ','prefix'#000+
   '08023_E_Missing .seh_endprologue directive'#000+
   '08024_E_Function prologue exceeds 255 bytes'#000+
-  '08025_E_.','seh_handlerdata directive without preceding .seh_handler'#000+
+  '08025_E_.seh_handlerdata directive without preceding .seh_handler'#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
-  '09002_E_Can'#039't create assembler file: $1'#000+
+  '09002_E_C','an'#039't create assembler file: $1'#000+
   '09003_E_Can'#039't create object file: $1 (error code: $2)'#000+
-  '09004_E_Can'#039't crea','te archive 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+
+  '09007_E_Error while asse','mbling exitcode $1'#000+
   '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
   'ssembling'#000+
-  '09009_I_','Assembling $1'#000+
+  '09009_I_Assembling $1'#000+
   '09010_I_Assembling with smartlinking $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
-  '09012_W_Library $1 not found, Linking may fail !'#000+
+  '09012_W_Library $1 not found, Linki','ng may fail !'#000+
   '09013_E_Error while linking'#000+
-  '09014_E_Can'#039't call the linker, switching to external linking'#000,
+  '09014_E_Can'#039't call the 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+
+  '09018_E_Creation of Executables not sup','ported'#000+
   '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
-  '09021_E_res','ource compiler "$1" not found, switching to external mode'+
-  #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+
+  '09023_T_unit $1 can'#039't be statically linked, switc','hing 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 link'+
-  'ing'#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+
+  '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 comp','iling resources'#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+
+  '09032_E_C','an'#039't write resource file "$1"'#000+
   '09033_N_File "$1" not found for backquoted cat command'#000+
-  '09128_F_Can'#039't post',' process executable $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+
+  '09132_X','_Size of uninitialized data: $1 bytes'#000+
   '09133_X_Stack space reserved: $1 bytes'#000+
-  '09134_X_Stack space commit','ted: $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+
+  '09201_W_Object file "$1" contains 32-bit absolute relocation to sym','b'+
+  'ol "$2".'#000+
   '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
-  '1000','4_U_PPU Crc: $1'#000+
+  '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
   '10006_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
-  '10008_U_PPU Invalid Version $1'#000+
+  '10008_U_PPU Invalid Vers','ion $1'#000+
   '10009_U_PPU is compiled for another processor'#000+
   '10010_U_PPU is compiled for another target'#000+
-  '10011_U','_PPU Source: $1'#000+
+  '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
-  '10016_F_Invalid PPU-File entry: $1'#000+
+  '10016_F','_Invalid PPU-File entry: $1'#000+
   '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
-  '10019_F_Too muc','h units'#000+
+  '10019_F_Too much units'#000+
   '10020_F_Circular unit reference between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
-  '10022_F_Can'#039't find unit $1 used by $2'#000+
+  '10022_F_Can'#039't find unit $1 ','used by $2'#000+
   '10023_W_Unit $1 was not found but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
-  '10025_W_Co','mpiling the system unit requires the -Us switch'#000+
+  '10025_W_Compiling the system unit requires the -Us switch'#000+
   '10026_F_There were $1 errors compiling module, stopping'#000+
-  '10027_U_Load from $1 ($2) unit $3'#000+
+  '10027_U_Load from $1 ($2) unit $3',#000+
   '10028_U_Recompiling $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
-  '10030_U_Reco','mpiling unit, static lib is older than ppufile'#000+
+  '10030_U_Recompiling unit, static lib is older than ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
+  '10032_U_Recompiling unit, obj a','nd asm are older than ppufile'#000+
   '10033_U_Recompiling unit, obj is older than asm'#000+
-  '10034_U_Parsing interface',' of $1'#000+
+  '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
-  '10041_U_File $1 is newer than the one used for creating PPU file ','$2'#000+
+  '10040_W_Can'#039't recompile uni','t $1, but found modifed include files'+
+  #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+
+  '10044_U_Loading impl','ementation units from $1'#000+
   '10045_U_Interface CRC changed for unit $1'#000+
-  '10046_U_Implementation CRC changed f','or 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+
+  '10050_U_No rel','oad, already in second compile: $1'#000+
   '10051_U_Flag for reload: $1'#000+
   '10052_U_Forced reloading'#000+
-  '10053_U_Previou','s state of $1: $2'#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+
+  '10057_U_R','egistering new unit $1'#000+
   '10058_U_Re-resolving unit $1'#000+
-  '10059_U_Skipping re-resolving unit $1, still loadin','g used units'#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 input file for this compil','ation invocation'#000+
+  'ion fe','edback 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] <inputfile> [options]'#000+
-  '11001_W_Only one source file supported, changing source file to compil'+
-  'e from "$1" into "$2"'#000+
-  '11002_W_DEF file ca','n be created only for OS/2'#000+
+  '11001_W_','Only one source file supported, changing source 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+
+  '11005_N_No option ','inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
-  '11008_F_Too many confi','g files nested'#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 file $1 at line $2 too many',' \var{\#IF(N)DEFs} enc'+
-  'ountered'#000+
+  '11012_W_Shared',' libs not supported on DOS platform, reverting 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+
+  '11015_F_Open conditional at th','e end of the options file'#000+
   '11016_W_Debug information generation is not supported by this executab'+
   'le'#000+
-  '1101','7_H_Try recompiling with -dGDB'#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_Assembler output selected "$1" i','s not compatible with "$2"'#000+
+  '1','1020_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+
+  '11027_T_Reading options from environmen','t $1'#000+
   '11028_D_Handling option "$1"'#000+
   '11029_O_*** press enter ***'#000+
   '11030_H_Start of reading config file $1'#000+
-  '1','1031_H_End of reading config file $1'#000+
+  '11031_H_End of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
   '11036_D_interpreting firstpass option "$1"'#000+
-  '11033_D_interpreting file option "$1"'#000+
+  '11033_D_interpreting fil','e option "$1"'#000+
   '11034_D_Reading config file "$1"'#000+
   '11035_D_found source file name "$1"'#000+
-  '11039_E_Unknown code','page "$1"'#000+
+  '11039_E_Unknown codepage "$1"'#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+
+  '110','42_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 platform'#000+
-  '11046_N_DWARF debu','g information cannot be used with smart linking on'+
-  ' this target, switching to static linking'#000+
-  '11047_W_Option "$1" is ignored for the current target platform.'#000+
+  '11','045_F_The feature "$1" is not, or not yet, supported 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 curren','t target platform.'#000+
   '11048_W_Disabling external debug information because it is unsupported'+
-  ' for the selec','ted target/debug format combination.'#000+
+  ' for the selected target/debug format combination.'#000+
   '11049_N_DWARF debug information cannot be used with smart linking with'+
-  ' external assembler, disabling static library creation.'#000+
+  ' external assembler, disabling',' static library creation.'#000+
   '11050_E_Invalid value for MACOSX_DEPLOYMENT_TARGET environment variabl'+
   'e: $1'#000+
-  '1','1051_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environment var'+
-  'iable: $1'#000+
-  '11052_E_You must use a FPU type of VFPV2, VFPV3 or VFPV3_D16 when usin'+
-  'g the EABIHF ABI target'#000+
+  '11051_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environment varia'+
+  'ble: $1'#000+
+  '11052_E_You must use a FPU type of VFPV2, VFPV3 or VFPV3_D16',' when us'+
+  'ing the EABIHF ABI target'#000+
   '12000_F_Cannot open whole program optimization feedback file "$1"'#000+
-  '120','01_D_Processing whole program optimization information in wpo fee'+
-  'dback 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 wp','o feed'+
-  'back file'#000+
+  '12001_D_Processing whole program optimization information in wpo feedb'+
+  'ack file "$1"'#000+
+  '12002_D_Finished processing the whole program optimizati','on informati'+
+  'on in wpo feedback file "$1"'#000+
+  '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+
+  'ck file'#000+
   '12004_W_No handler registered for whole program optimization section "'+
   '$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 previousl'+
-  'y 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 '+
-  'the generated info in (using -FW)'#000+
+  '12005','_D_Found whole program optimization section "$1" with informati'+
+  'on 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 information necessary to pe','rform "$1" whole pro'+
+  'gram optimization found'#000+
+  '12008_F_Specify a whole program optimization feedback file to store th'+
+  'e generated info in (using -FW)'#000+
   '12009_E_Not generating any whole program optimization information, yet'+
-  ' a feedback file was specified (using -FW)'#000+
+  ' a feedback file was spe','cified (using -FW)'#000+
   '12010_E_Not performing any whole program optimizations, yet an input f'+
-  'eedback file w','as specified (using -Fw)'#000+
+  'eedback file was specified (using -Fw)'#000+
   '12011_D_Skipping whole program optimization section "$1", because not '+
   'needed by the requested optimizations'#000+
-  '12012_W_Overriding previously read information for "$1" from feedback '+
-  'input file using information in secti','on "$2"'#000+
+  '1201','2_W_Overriding previously read information for "$1" from feedbac'+
+  'k 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_Cannot extract symbol liveness information from program when w'+
-  'hen not linking'#000+
-  '12015_F_Cannot find "$1" or "$2" to extract symbo','l liveness informat'+
-  'ion from linked program'#000+
+  '12014_E_Cannot extract symbol li','veness information from program when'+
+  ' when not linking'#000+
+  '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+
+  'n from linked program'#000+
   '12016_E_Error during reading symbol liveness information produced by "'+
   '$1"'#000+
-  '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'+
-  ' using smart linking, use -CX -XX'#000+
-  '12019_E_Cannot create specified whole program optimisation feedback fi'+
-  'le "$1"'#000+
+  '12017_F_Error execut','ing "$1" (exitcode: $2) to extract symbol inform'+
+  'ation 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 program optimisation feedb','ack '+
+  'file "$1"'#000+
   '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
   'CPU'#010+
-  'Copyright (c) 1','993-2012 by Florian Klaempfl and others'#000+
+  'Copyright (c) 1993-2012 by Florian Klaempfl and others'#000+
   '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
-  'Compiler CPU Target: $FPCCPU'#010+
+  'Compiler CPU Target',': $FPCCPU'#010+
   #010+
   'Supported targets:'#010+
   '  $OSTARGETS'#010+
@@ -1175,7 +1179,7 @@ const msgtxt : array[0..000280,1..240] of char=(
   'Supported CPU instruction sets:'#010+
   '  $INSTRUCTIONSETS'#010+
   #010+
-  'Support','ed FPU instruction sets:'#010+
+  'Supported FPU instruction sets:'#010+
   '  $FPUINSTRUCTIONSETS'#010+
   #010+
   'Supported ABI targets:'#010+
@@ -1184,372 +1188,374 @@ const msgtxt : array[0..000280,1..240] of char=(
   'Supported Optimizations:'#010+
   '  $OPTIMIZATIONS'#010+
   #010+
-  'Supported Whole Program Optimizations:'#010+
+  'Supporte','d Whole Program Optimizations:'#010+
   '  All'#010+
   '  $WPOPTIMIZATIONS'#010+
   #010+
   'Supported Microcontroller types:'#010+
-  '  $CONTROLLER','TYPES'#010+
+  '  $CONTROLLERTYPES'#010+
   #010+
   'This program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.v2'#010+
   #010+
-  'Please report bugs in our bug tracker on:'#010+
+  'Please report bugs in our bug tracke','r on:'#010+
   '                 http://bugs.freepascal.org'#010+
   #010+
-  'More information may be found on our WWW pages (incl','uding directions'+
-  #010+
+  'More information may be found on our WWW pages (including directions'#010+
   'for mailing lists useful for asking questions or discussing potential'#010+
   'new features, etc.):'#010+
-  '                 http://www.freepascal.org'#000+
+  '                 http://www.f','reepascal.org'#000+
   '11025_**0*_Put + after a boolean switch option to enable it, - to disa'+
   'ble it'#010+
-  '**1a_The com','piler doesn'#039't delete the generated 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 (-dEXTDEBUG compiler)'#010+
+  '**2an_List node info in assembler file (-','dEXTDEBUG compiler)'#010+
   '*L2ap_Use pipes instead of creating temporary assembler files'#010+
-  '**2ar_List register a','llocation/release info in assembler file'#010+
+  '**2ar_List register allocation/release info in assembler file'#010+
   '**2at_List temp allocation/release info in assembler file'#010+
   '**1A<x>_Output format:'#010+
-  '**2Adefault_Use default assembler'#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*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+
   '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
   '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+
   '3*2Anasmwin32_Win32 object file using Nasm'#010+
-  '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
+  '3*','2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
   '3*2Awasm_Obj file using Wasm (Watcom)'#010+
-  '3*2Anasmobj_Obj fi','le using Nasm'#010+
+  '3*2Anasmobj_Obj file using Nasm'#010+
   '3*2Amasm_Obj file using Masm (Microsoft)'#010+
   '3*2Atasm_Obj file using Tasm (Borland)'#010+
   '3*2Aelf_ELF (Linux) using internal writer'#010+
-  '3*2Acoff_COFF (Go32v2) using internal writer'#010+
+  '3','*2Acoff_COFF (Go32v2) using internal writer'#010+
   '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
-  '4*2Aas_Ass','emble using GNU AS'#010+
+  '4*2Aas_Assemble using GNU AS'#010+
   '4*2Agas_Assemble using GNU GAS'#010+
   '4*2Agas-darwin_Assemble darwin Mach-O64 using GNU GAS'#010+
-  '4*2Amasm_Win64 object file using ml64 (Microsoft)'#010+
+  '4*2Amasm_Win64 object file using ','ml64 (Microsoft)'#010+
   '4*2Apecoff_PE-COFF (Win64) using internal writer'#010+
-  '4*2Aelf_ELF (Linux-64bit) using inter','nal writer'#010+
+  '4*2Aelf_ELF (Linux-64bit) using internal writer'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
-  '6*2Amot_Standard Motorola assembler'#010+
+  '6*2Amot_Standard Motorola assemble','r'#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+
+  '**1b_Generate browser info'#010+
   '**2bl_Generate local symbol info'#010+
   '**1B_Build all modules'#010+
   '**1C<x>_Code generation options:'#010+
-  '**2C3<x>_Turn on ieee error checking for constants'#010+
+  '**2C3<x>_Turn on ieee error checkin','g for constants'#010+
   '**2Ca<x>_Select ABI, see fpc -i for possible values'#010+
   '**2Cb_Generate big-endian code'#010+
-  '**2C','c<x>_Set default calling convention to <x>'#010+
+  '**2Cc<x>_Set default calling convention to <x>'#010+
   '**2CD_Create also dynamic library (not supported)'#010+
-  '**2Ce_Compilation with emulated floating point opcodes'#010+
+  '**2Ce_Compilation with emulated floating poi','nt opcodes'#010+
   '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
   'lues'#010+
-  '**2CF<x>_Minimal ','floating point constant precision (default, 32, 64)'+
-  #010+
+  '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
   '**2Cg_Generate PIC code'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
-  '**2Ci_IO-checking'#010+
+  '**2Ci_IO-','checking'#010+
   '**2Cn_Omit linking stage'#010+
   'P*2CN_Generate nil-pointer checks (AIX-only)'#010+
-  '**2Co_Check overflow of ','integer operations'#010+
+  '**2Co_Check overflow of integer operations'#010+
   '**2CO_Check for possible overflow of integer operations'#010+
-  '**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+
+  '**2Cp<x>_Select instruction set, see fpc -i for possible value','s'#010+
   '**2CP<x>=<y>_ packing settings'#010+
-  '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 ',
+  '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
   'and 8'#010+
   '**2Cr_Range checking'#010+
   '**2CR_Verify object method call validity'#010+
   '**2Cs<n>_Set stack checking size to <n>'#010+
-  '**2Ct_Stack checking (for testing only, see manual)'#010+
+  '**2Ct_Stack checking (for tes','ting only, see manual)'#010+
   'p*2CT<x>_Target-specific code generation options'#010+
-  'P*2CT<x>_Target-specific code g','eneration options'#010+
+  'P*2CT<x>_Target-specific code generation options'#010+
   'J*2CT<x>_Target-specific code generation options'#010+
-  'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
+  'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed',
   ' (AIX)'#010+
   'P*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
   ' (AIX)'#010+
-  'J*3CTcompactintarra','yinit_ Generate smaller (but potentially slower) '+
-  'code for initializing integer array constants'#010+
-  'K*3CTenumfieldinit_ Initialize enumeration fields in constructors to e'+
-  'numtype(0), after calling inherited constructors'#010+
-  'J*2Cv_Var/out parameter co','py-out checking'#010+
+  'J*3CTcompactintarrayinit_ Generate smaller (but potentially slower) co'+
+  'de for initializing integer array constants'#010+
+  'J*3CTenumfieldinit_ Initialize enumeration',' fields in constructors to'+
+  ' enumtype(0), after calling inherited constructors'#010+
+  'J*2Cv_Var/out parameter copy-out checking'#010+
+  'J*3CTautogetterprefix=X_ Automatically create getters for properties w'+
+  'ith prefix X (empty string disables)'#010+
+  'J*3CTautosette','rprefix=X_ Automatically create setters for properties'+
+  ' with prefix X (empty string disables)'#010+
   '**2CX_Create also smartlinked library'#010+
   '**1d<x>_Defines the symbol <x>'#010+
   '**1D_Generate a DEF file'#010+
   '**2Dd<x>_Set description to <x>'#010+
-  '**2Dv<x>_Set DLL version to <x>'#010+
+  '**2Dv<x>_Set DLL vers','ion to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_Set path to executable'#010+
-  '**1E_Same as -','Cn'#010+
+  '**1E_Same as -Cn'#010+
   '**1fPIC_Same as -Cg'#010+
   '**1F<x>_Set file names and paths:'#010+
   '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
   'sed'#010+
-  '**2Fc<x>_Set input codepage to <x>'#010+
+  '**2Fc<x>_Set input codepage to <','x>'#010+
   '**2FC<x>_Set RC compiler binary name to <x>'#010+
-  '**2Fd_Disable the compiler'#039's i','nternal directory cache'#010+
+  '**2Fd_Disable the compiler'#039's internal directory cache'#010+
   '**2FD<x>_Set the directory where to search for compiler utilities'#010+
   '**2Fe<x>_Redirect error output to <x>'#010+
-  '**2Ff<x>_Add <x> to framework path (Darwin only)'#010+
+  '**2Ff<x>_Add <x> to framework path ','(Darwin only)'#010+
   '**2FE<x>_Set exe/unit output path to <x>'#010+
-  '**2Fi<x>_Add <x> to in','clude path'#010+
+  '**2Fi<x>_Add <x> to include path'#010+
   '**2Fl<x>_Add <x> to library path'#010+
   '**2FL<x>_Use <x> as dynamic linker'#010+
   '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+
   'r'#010+
-  '**2Fo<x>_Add <x> to object path'#010+
+  '**2Fo<x>_Add',' <x> to object path'#010+
   '**2Fr<x>_Load error message file <x>'#010+
-  '**2FR<x>_Set resourc','e (.res) linker to <x>'#010+
+  '**2FR<x>_Set resource (.res) linker to <x>'#010+
   '**2Fu<x>_Add <x> to unit path'#010+
   '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
-  '**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
-  '**2Fw<x>_Load previously stored whole-program optimization feedback',' '+
-  'from <x>'#010+
+  '**2FW<x>_Store generated whole-program optimization feedba','ck in <x>'#010+
+  '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
+  'om <x>'#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+
+  '*g2gh_Use heaptrace unit (for memory leak/corruption debug','ging)'#010+
   '*g2gl_Use line info unit (show more info with backtraces)'#010+
-  '*g2go<x>_Set ','debug information options'#010+
+  '*g2go<x>_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 cla','ss'+
-  ' name'#010+
+  '*g3gostabsabsincludes_ Store absolute/full include file path','s in Sta'+
+  'bs'#010+
+  '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
+  'ame'#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_Generate DWARFv2 debug information (s','ame as -gw2)'#010+
+  '*g2gv_Generates',' programs traceable with Valgrind'#010+
+  '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
   '*g2gw2_Generate DWARFv2 debug information'#010+
   '*g2gw3_Generate DWARFv3 debug information'#010+
   '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+
-  '**1i_Information'#010+
+  '**1i_Info','rmation'#010+
   '**2iD_Return compiler date'#010+
   '**2iV_Return short compiler version'#010+
-  '**2iW_','Return full 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<x>_Add <x> to include path'#010+
+  '**1I<x>_Add <x>',' to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_Write logo'#010+
-  '**1M<x>_Set l','anguage mode to <x>'#010+
+  '**1M<x>_Set language mode to <x>'#010+
   '**2Mfpc_Free Pascal dialect (default)'#010+
   '**2Mobjfpc_FPC mode with Object Pascal support'#010+
   '**2Mdelphi_Delphi 7 compatibility mode'#010+
-  '**2Mtp_TP/BP 7.0 compatibility mode'#010+
+  '**2Mtp_TP/BP 7.0 co','mpatibility mode'#010+
   '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
-  '**1n','_Do not read the default config files'#010+
+  '**1n_Do not read the default config files'#010+
   '**1o<x>_Change the name of the executable produced to <x>'#010+
   '**1O<x>_Optimizations:'#010+
   '**2O-_Disable optimizations'#010+
-  '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
-  '**2O2_Level 2 optimizations (-O1 + ','quick optimizations)'#010+
+  '**2O1_Level 1 op','timizations (quick and debugger friendly)'#010+
+  '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
   '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
   '**2O4_Level 4 optimizations (-O3 + optimizations which might have unex'+
-  'pected side effects)'#010+
+  'pected side effec','ts)'#010+
   '**2Oa<x>=<y>_Set alignment'#010+
-  '**2Oo[NO]<x>_Enable or disable optimizations, ','see fpc -i for possibl'+
-  'e values'#010+
+  '**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i for possible '+
+  'values'#010+
   '**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+
   #010+
-  '**2OW<x>_Generate whole-program optimization feedback for optimization'+
-  ' <x>, see fpc -i for possible values'#010+
-  '**2Ow<x>_Perform whole-program ','optimization <x>, see fpc -i for poss'+
-  'ible values'#010+
+  '**2OW<x>_Generate whole-program optimization feedback for opt','imizati'+
+  'on <x>, see fpc -i for possible values'#010+
+  '**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possib'+
+  'le values'#010+
   '**2Os_Optimize for size rather than speed'#010+
   '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
-  'F*1P<x>_Target CPU / compiler related options:'#010+
+  'F*1P<x>_Targ','et CPU / compiler related options:'#010+
   'F*2PB_Show default compiler binary'#010+
-  'F*2PP_S','how default target cpu'#010+
+  'F*2PP_Show default target cpu'#010+
   'F*2P<x>_Set target CPU (arm,i386,m68k,mips,mipsel,powerpc,powerpc64,sp'+
   'arc,x86_64'#010+
   '**1R<x>_Assembler reading style:'#010+
-  '**2Rdefault_Use default assembler for target'#010+
+  '**2Rdefault_Use default as','sembler for target'#010+
   '3*2Ratt_Read AT&T style assembler'#010+
-  '3*2Rintel_Read Intel sty','le assembler'#010+
+  '3*2Rintel_Read Intel style assembler'#010+
   '6*2RMOT_Read motorola style assembler'#010+
   '**1S<x>_Syntax options:'#010+
   '**2S2_Same as -Mobjfpc'#010+
   '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
-  '**2Sa_Turn on assertions'#010+
+  '**2Sa_Turn on as','sertions'#010+
   '**2Sd_Same as -Mdelphi'#010+
-  '**2Se<x>_Error options. <x> is a combination ','of the following:'#010+
+  '**2Se<x>_Error options. <x> is a combination of the following:'#010+
   '**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
   '**3*_w : Compiler also halts after warnings'#010+
-  '**3*_n : Compiler also halts after notes'#010+
+  '**3*_n : Compiler also halts after note','s'#010+
   '**3*_h : Compiler also halts after hints'#010+
-  '**2Sg_Enable LABEL and GOTO (defau','lt in -Mtp and -Mdelphi)'#010+
+  '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
   '**2Sh_Use reference counted strings (ansistring by default) instead of'+
   ' shortstrings'#010+
-  '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
+  '**2Si_Turn on inlining of procedures/functions declare','d as "inline"'#010+
   '**2Sk_Load fpcylix unit'#010+
   '**2SI<x>_Set interface style to <x>'#010+
-  '**3','SIcom_COM compatible interface (default)'#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+
   '**2Sy_@<pointer> returns a typed pointer, same as $T+'#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+
+  '**2st_Gener','ate script to link on target'#010+
+  '**2sr_Skip register allocation phase (use with -alr)'#010+
   '**1T<x>_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 v','ersions: -T'+
-  'darwin)'#010+
+  '3*2Tgo32v2_Version 2 of DJ D','elorie DOS extender'#010+
+  '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tda'+
+  'rwin)'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnativent_Native NT API (experimental)'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
-  '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
+  '3*2Tnetwlibc_Novell Netware',' Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
-  '3*2Tsunos_SunOS','/Solaris'#010+
+  '3*2Tsunos_SunOS/Solaris'#010+
   '3*2Tsymbian_Symbian OS'#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+
+  '3*2Twince_Windo','ws CE'#010+
   '4*2Tdarwin_Darwin/Mac OS X'#010+
   '4*2Tlinux_Linux'#010+
-  '4*2Twin64_Win64 (64 bit Wind','ows systems)'#010+
+  '4*2Twin64_Win64 (64 bit Windows systems)'#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux'#010+
   '6*2Tpalmos_PalmOS'#010+
   'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+
   'A*2Tlinux_Linux'#010+
-  'A*2Twince_Windows CE'#010+
+  'A*2Twince_Windows',' CE'#010+
   'P*2Tamiga_AmigaOS'#010+
   'P*2Tdarwin_Darwin/Mac OS X'#010+
   'P*2Tlinux_Linux'#010+
-  'P*2Tmacos_Ma','c OS (classic)'#010+
+  'P*2Tmacos_Mac OS (classic)'#010+
   'P*2Tmorphos_MorphOS'#010+
   'S*2Tsolaris_Solaris'#010+
   'S*2Tlinux_Linux'#010+
   '**1u<x>_Undefines the symbol <x>'#010+
   '**1U_Unit options:'#010+
-  '**2Un_Do not check where the unit name matches the file name'#010+
-  '**2Ur_Generate release unit files (never automatically r','ecompiled)'#010+
+  '**2Un_Do not check where the unit name m','atches the file name'#010+
+  '**2Ur_Generate release unit files (never automatically recompiled)'#010+
   '**2Us_Compile a system unit'#010+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
-  '**2*_e : Show errors (default)       0 : Show nothing (except errors)'#010+
+  '**2*_e : Show errors (default)       0 : Show nothing (ex','cept errors'+
+  ')'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
-  '**2*_n :',' Show notes                  t : Show tried/used files'#010+
+  '**2*_n : Show notes                  t : Show tried/used files'#010+
   '**2*_h : Show hints                  c : Show conditionals'#010+
-  '**2*_i : Show general info           d : Show debug info'#010+
-  '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode',
-  #010+
+  '**2*_i : Show general info           d : Show deb','ug 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 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*_b : Write file names mess','ages   p : Write tree.log with parse t'+
+  'ree'#010+
+  '**2*_    with full path              v : Write fpcdebug.txt with'#010+
   '**2*_                                    lots of debugging info'#010+
   '**2*_m<x>,<y> : Don'#039't show messages numbered <x> and <y>'#010+
-  'F*1V<x>_Append '#039'-<x>'#039' to the used compiler binary name (e.g. f'+
-  'or version)'#010+
-  '**1W<x>_Target-','specific options (targets)'#010+
+  'F*1V<x>_Appe','nd '#039'-<x>'#039' to the used compiler binary name (e.g.'+
+  ' for version)'#010+
+  '**1W<x>_Target-specific options (targets)'#010+
   '3*2WA_Specify native type application (Windows)'#010+
   '4*2WA_Specify native type application (Windows)'#010+
-  'A*2WA_Specify native type application (Windows)'#010+
+  'A*2WA_Specify native type application (W','indows)'#010+
   '3*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  'P*2Wb_Create a bu','ndle 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+
   'A*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  '4*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  '3*2WB_Create a relocatable image (Windows, Symbia','n)'#010+
+  '4*2Wb_Create a bundle in','stead of a library (Darwin)'#010+
+  '3*2WB_Create a relocatable image (Windows, Symbian)'#010+
   '3*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+
   '4*2WB_Create a relocatable image (Windows)'#010+
   '4*2WBxxxx_Set image base to xxxx (Windows)'#010+
-  'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
-  'A*2WBxxxx_Set image base to xxxx (Windows, Symb','ian)'#010+
+  'A*2WB_Create a relocat','able image (Windows, Symbian)'#010+
+  'A*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+
   '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
   '4*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
-  'A*2WC_Specify console type application (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+
+  '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
   '4*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+
+  'A*2WD_Use DEFFILE to export functions of DLL or E','XE (Windows)'#010+
   '3*2We_Use external resources (Darwin)'#010+
-  '4*2We_Use external resourc','es (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 (Darwin)'#010+
-  '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
-  '3*2WG_Specify graphic type application (EMX, OS/2, Windows)',#010+
+  '3*2WF_Specify full-screen type applic','ation (EMX, OS/2)'#010+
+  '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
   '4*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+
+  'P*2WG_Specify graphic type application (Classic Mac O','S)'#010+
   '3*2Wi_Use internal resources (Darwin)'#010+
-  '4*2Wi_Use internal resources (Darwin',')'#010+
+  '4*2Wi_Use internal resources (Darwin)'#010+
   'A*2Wi_Use internal resources (Darwin)'#010+
   'P*2Wi_Use internal resources (Darwin)'#010+
   'p*2Wi_Use internal resources (Darwin)'#010+
-  '3*2WI_Turn on/off the usage of import sections (Windows)'#010+
+  '3*2WI_Turn on/off the usage of import sections ','(Windows)'#010+
   '4*2WI_Turn on/off the usage of import sections (Windows)'#010+
-  'A*2WI_Turn',' on/off the usage of import sections (Windows)'#010+
+  'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
   '3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  '4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
-  'n)'#010+
-  'p*2WM<x>_Minimum Mac OS X deployment version: 1','0.4, 10.5.1, ... (Dar'+
+  '4*2WM<x>_Minimum Mac OS X deployment versio','n: 10.4, 10.5.1, ... (Dar'+
   'win)'#010+
+  'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
+  'n)'#010+
   'P*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  'A','*2WN_Do not generate relocation code, needed for debugging (Windows'+
+  '3*2WN_Do not generate relocation code, needed for debugging (Win','dows'+
   ')'#010+
+  '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
+  'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   'A*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+
-  'V*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+
-  '3*2WP<x>_Minimum iOS deployment',' version: 3.0, 5.0.1, ... (iphonesim)'+
-  #010+
+  'V*2Wpxxxx_Specify the co','ntroller type, see fpc -i for possible value'+
+  's'#010+
+  '3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+
   'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+
   '3*2WR_Generate relocation code (Windows)'#010+
-  '4*2WR_Generate relocation code (Windows)'#010+
+  '4*2WR_Generate rel','ocation code (Windows)'#010+
   'A*2WR_Generate relocation code (Windows)'#010+
-  'P*2WT_Specify',' MPW tool type application (Classic Mac OS)'#010+
+  'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
   '**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 search default library path (sometimes require','d for cro'+
-  'ss-compiling when not using -XR)'#010+
+  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin',', FreeBSD, L'+
+  'inux)'#010+
+  '**2Xd_Do not search default library path (sometimes required for cross'+
+  '-compiling when not using -XR)'#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 l','inker'#010+
+  '**2XD_Try t','o link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
+  '**2Xi_Use internal linker'#010+
   '**2Xm_Generate link map'#010+
   '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
   's '#039'main'#039')'#010+
-  'F*2Xp<x>_First search for the compiler binary in the directory <x>'#010+
+  'F*2Xp<x>_First search for the compiler binary in the director','y <x>'#010+
   '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
-  '**2Xr<x>_Set th','e linker'#039's rlink-path to <x> (needed for cross co'+
-  'mpile, see the ld manual for more information) (BeOS, Linux)'#010+
-  '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
-  ', Linux, Mac OS, Solaris)'#010+
-  '**2Xs_Strip all symbols from execu','table'#010+
+  '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
+  'ile, see the ld manual for more information) (BeOS, Linux)'#010+
+  '**2XR<x>_Prepend <x> to all linker search paths (BeOS',', Darwin, FreeB'+
+  'SD, Linux, Mac OS, Solaris)'#010+
+  '**2Xs_Strip all symbols from executable'#010+
   '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
   '**2Xt_Link with static libraries (-static is passed to linker)'#010+
-  '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
+  '**2XX_Try to smartlink u','nits             (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+
-  '**1h_Show','s this help without waiting'
+  '**1h_Shows this help without waiting'
 );

compiler/nobj.pas

@@ -423,13 +423,21 @@ implementation
                   { Give a note if the new visibility is lower. For a higher
                     visibility update the vmt info }
                   if vmtentryvis>pd.visibility then
+                    begin
+                      if po_auto_raised_visibility in vmtpd.procoptions then
+                        begin
+                          if updatevalues then
+                            pd.visibility:=vmtentryvis;
+                        end
+                      else
 {$ifdef jvm}
-                    MessagePos4(pd.fileinfo,parser_e_method_lower_visibility,
+                        MessagePos4(pd.fileinfo,parser_e_method_lower_visibility,
 {$else jvm}
-                    MessagePos4(pd.fileinfo,parser_n_ignore_lower_visibility,
+                        MessagePos4(pd.fileinfo,parser_n_ignore_lower_visibility,
 {$endif jvm}
-                         pd.fullprocname(false),
-                         visibilityname[pd.visibility],tobjectdef(vmtpd.owner.defowner).objrealname^,visibilityname[vmtentryvis])
+                          pd.fullprocname(false),
+                          visibilityname[pd.visibility],tobjectdef(vmtpd.owner.defowner).objrealname^,visibilityname[vmtentryvis])
+                      end
                   else if pd.visibility>vmtentryvis then
                     begin
                       if updatevalues then

compiler/pdecvar.pas

@@ -334,6 +334,9 @@ implementation
          hdef : tdef;
          arraytype : tdef;
          def : tdef;
+{$ifdef jvm}
+         orgaccesspd : tprocdef;
+{$endif}
          pt : tnode;
          sc : TFPObjectList;
          paranr : word;
@@ -532,6 +535,7 @@ implementation
                           else
                             begin
 {$ifdef jvm}
+                              orgaccesspd:=tprocdef(p.propaccesslist[palt_read].procdef);
                               { if the visibility of the getter is lower than
                                 the visibility of the property, wrap it so that
                                 we can call it from all contexts in which the
@@ -541,6 +545,9 @@ implementation
                                   p.propaccesslist[palt_read].procdef:=jvm_wrap_method_with_vis(tprocdef(p.propaccesslist[palt_read].procdef),p.visibility);
                                   p.propaccesslist[palt_read].firstsym^.sym:=tprocdef(p.propaccesslist[palt_read].procdef).procsym;
                                 end;
+                              if (prop_auto_getter_prefix<>'') and
+                                 (p.propaccesslist[palt_read].firstsym^.sym.RealName<>prop_auto_getter_prefix+p.RealName) then
+                                jvm_create_getter_for_property(p,orgaccesspd);
 {$endif jvm}
                             end;
                         end;
@@ -563,8 +570,9 @@ implementation
                                visibility of the property, wrap it in a getter
                                so that we can access it from all contexts in
                                which the property is visibile }
-                             if (tfieldvarsym(sym).visibility<p.visibility) then
-                               jvm_create_getter_for_property(p);
+                             if (prop_auto_getter_prefix<>'') or
+                                (tfieldvarsym(sym).visibility<p.visibility) then
+                               jvm_create_getter_for_property(p,nil);
 {$endif}
                            end
                           else
@@ -608,7 +616,8 @@ implementation
                           else
                             begin
 {$ifdef jvm}
-                              { if the visibility of the getter is lower than
+                              orgaccesspd:=tprocdef(p.propaccesslist[palt_write].procdef);
+                              { if the visibility of the setter is lower than
                                 the visibility of the property, wrap it so that
                                 we can call it from all contexts in which the
                                 property is visible }
@@ -617,6 +626,9 @@ implementation
                                   p.propaccesslist[palt_write].procdef:=jvm_wrap_method_with_vis(tprocdef(p.propaccesslist[palt_write].procdef),p.visibility);
                                   p.propaccesslist[palt_write].firstsym^.sym:=tprocdef(p.propaccesslist[palt_write].procdef).procsym;
                                 end;
+                              if (prop_auto_setter_prefix<>'') and
+                                 (sym.RealName<>prop_auto_setter_prefix+p.RealName) then
+                                jvm_create_setter_for_property(p,orgaccesspd);
 {$endif jvm}
                             end;
                         end;
@@ -639,8 +651,9 @@ implementation
                                visibility of the property, wrap it in a getter
                                so that we can access it from all contexts in
                                which the property is visibile }
-                             if (tfieldvarsym(sym).visibility<p.visibility) then
-                               jvm_create_setter_for_property(p);
+                             if (prop_auto_setter_prefix<>'') or
+                                (tfieldvarsym(sym).visibility<p.visibility) then
+                               jvm_create_setter_for_property(p,nil);
 {$endif}
                            end
                           else

compiler/symconst.pas

@@ -334,7 +334,11 @@ type
       inherited, so we explicitly have to add the constructors of the parent
       class to the child class; this influences the overload resolution logic
       though, so ignore them there) }
-    po_ignore_for_overload_resolution
+    po_ignore_for_overload_resolution,
+    { the visibility of of this procdef was raised automatically by the
+      compiler, e.g. because it was designated as a getter/setter for a property
+      with a higher visibility on the JVM target }
+    po_auto_raised_visibility
   );
   tprocoptions=set of tprocoption;
 

compiler/symcreat.pas

@@ -832,22 +832,87 @@ implementation
 
   procedure implement_field_getter(pd: tprocdef);
     var
+      i: longint;
+      pvs: tparavarsym;
       str: ansistring;
       callthroughprop: tpropertysym;
+      propaccesslist: tpropaccesslist;
+      lastparanr: longint;
+      firstpara: boolean;
     begin
       callthroughprop:=tpropertysym(pd.skpara);
-      str:='begin result:='+callthroughprop.realname+'; end;';
+      str:='begin result:='+callthroughprop.realname;
+      if ppo_hasparameters in callthroughprop.propoptions then
+        begin
+          if not callthroughprop.getpropaccesslist(palt_read,propaccesslist) then
+            internalerror(2012100701);
+          str:=str+'[';
+          firstpara:=true;
+          lastparanr:=tprocdef(propaccesslist.procdef).paras.count-1;
+          if ppo_indexed in callthroughprop.propoptions then
+            dec(lastparanr);
+          for i:=0 to lastparanr do
+            begin
+              { skip self/vmt/parentfp, passed implicitly }
+              pvs:=tparavarsym(tprocdef(propaccesslist.procdef).paras[i]);
+              if ([vo_is_self,vo_is_vmt,vo_is_parentfp]*pvs.varoptions)<>[] then
+                continue;
+              if not firstpara then
+                str:=str+',';
+              firstpara:=false;
+              str:=str+pvs.realname;
+            end;
+          str:=str+']';
+        end;
+      str:=str+'; end;';
       str_parse_method_impl(str,pd,po_classmethod in pd.procoptions)
     end;
 
 
   procedure implement_field_setter(pd: tprocdef);
     var
-      str: ansistring;
+      i, lastparaindex: longint;
+      pvs: tparavarsym;
+      paraname,  str: ansistring;
       callthroughprop: tpropertysym;
+      propaccesslist: tpropaccesslist;
+      firstpara: boolean;
     begin
       callthroughprop:=tpropertysym(pd.skpara);
-      str:='begin '+callthroughprop.realname+':=__fpc_newval__; end;';
+      str:='begin '+callthroughprop.realname;
+      if not callthroughprop.getpropaccesslist(palt_write,propaccesslist) then
+        internalerror(2012100702);
+      if ppo_hasparameters in callthroughprop.propoptions then
+        begin
+          str:=str+'[';
+          firstpara:=true;
+          { last parameter is the value to be set, skip (only add index
+            parameters here) }
+          lastparaindex:=tprocdef(propaccesslist.procdef).paras.count-2;
+          if ppo_indexed in callthroughprop.propoptions then
+            dec(lastparaindex);
+          for i:=0 to lastparaindex do
+            begin
+              { skip self/vmt/parentfp/index, passed implicitly }
+              pvs:=tparavarsym(tprocdef(propaccesslist.procdef).paras[i]);
+              if ([vo_is_self,vo_is_vmt,vo_is_parentfp]*pvs.varoptions)<>[] then
+                continue;
+              if not firstpara then
+                str:=str+',';
+              firstpara:=false;
+              str:=str+pvs.realname;
+            end;
+          str:=str+']';
+        end;
+      { the value-to-be-set }
+      if assigned(propaccesslist.procdef) then
+        begin
+          pvs:=tparavarsym(tprocdef(propaccesslist.procdef).paras[tprocdef(propaccesslist.procdef).paras.count-1]);
+          paraname:=pvs.realname;
+        end
+      else
+        paraname:='__fpc_newval__';
+      str:=str+':='+paraname+'; end;';
       str_parse_method_impl(str,pd,po_classmethod in pd.procoptions)
     end;
 

compiler/utils/ppudump.pp

@@ -1523,7 +1523,8 @@ const
      (mask:po_delphi_nested_cc;str: 'Delphi-style nested frameptr'),
      (mask:po_java_nonvirtual; str: 'Java non-virtual method'),
      (mask:po_ignore_for_overload_resolution;str: 'Ignored for overload resolution'),
-     (mask:po_rtlproc;         str: 'RTL procedure')
+     (mask:po_rtlproc;         str: 'RTL procedure'),
+     (mask:po_auto_raised_visibility; str: 'Visibility raised by compiler')
   );
 var
   proctypeoption  : tproctypeoption;