+ support for objcencode() (equivalent of Objective-C's @encode()) + test

  + functionality to encode Objective-C function signatures (untested)

git-svn-id: branches/objc@13557 -

.gitattributes

@@ -8226,6 +8226,7 @@ tests/test/tmsg4.pp svneol=native#text/plain
 tests/test/tmt1.pp svneol=native#text/plain
 tests/test/tobjc1.pp svneol=native#text/plain
 tests/test/tobjc10.pp svneol=native#text/plain
+tests/test/tobjc11.pp svneol=native#text/plain
 tests/test/tobjc2.pp svneol=native#text/plain
 tests/test/tobjc3.pp svneol=native#text/plain
 tests/test/tobjc4.pp svneol=native#text/plain

compiler/compinnr.inc

@@ -78,6 +78,7 @@ const
    in_rol_x_x           = 68;
    in_objc_selector_x   = 69;
    in_objc_protocol_x   = 70;
+   in_objc_encode_x     = 71;
 
 
 { Internal constant functions }

compiler/cutils.pas

@@ -126,6 +126,9 @@ interface
     { ambivalent to pchar2pshortstring }
     function pshortstring2pchar(p : pshortstring) : pchar;
 
+    { allocate a new pchar with the contents of a}
+    function ansistring2pchar(const a: ansistring) : pchar;
+
     { Ansistring (pchar+length) support }
     procedure ansistringdispose(var p : pchar;length : longint);
     function compareansistrings(p1,p2 : pchar;length1,length2 : longint) : longint;
@@ -975,6 +978,18 @@ implementation
       end;
 
 
+    function ansistring2pchar(const a: ansistring) : pchar;
+      var
+        len: ptrint;
+      begin
+        len:=length(a);
+        getmem(result,len+1);
+        if (len<>0) then
+          move(a[1],result[0],len);
+        result[len]:=#0;
+      end;
+
+
     function lowercase(c : char) : char;
        begin
           case c of

compiler/msg/errore.msg

@@ -1234,7 +1234,7 @@ parser_e_objc_message_name_changed=03262_E_Message name "$1" in inherited class
 #
 # Type Checking
 #
-# 04088 is the last used one
+# 04089 is the last used one
 #
 % \section{Type checking errors}
 % This section lists all errors that can occur when type checking is
@@ -1534,6 +1534,13 @@ type_e_no_type_info=04087_E_No type info available for this type
 % from zero).
 type_e_protocol_type_expected=04088_E_Objective-C protocol type expected, but got "$1"
 % The compiler expected a protocol type name, but found something else.
+type_e_objc_type_unsupported=04089_E_The type "$1" is not supported for interaction with the Objective-C runtime.
+% Objective-C makes extensive use of run time type information (RTTI). This format
+% is defined by the maintainers of the run time and can therefore not be adapted
+% to all possible Object Pascal types. In particular, types that depend on
+% reference counting by the compiler (such as ansistrings and certain kinds of
+% interfaces) cannot be used as fields of Objective-C classes, cannot be
+% directly passed to Objective-C methods, and cannot be encoded using \var{objc_encode}.
 % \end{description}
 #
 # Symtable

compiler/msgidx.inc

@@ -429,6 +429,7 @@ const
   type_e_expected_objc_method=04086;
   type_e_no_type_info=04087;
   type_e_protocol_type_expected=04088;
+  type_e_objc_type_unsupported=04089;
   sym_e_id_not_found=05000;
   sym_f_internal_error_in_symtablestack=05001;
   sym_e_duplicate_id=05002;
@@ -801,9 +802,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 52654;
+  MsgTxtSize = 52739;
 
   MsgIdxMax : array[1..20] of longint=(
-    24,87,263,89,65,51,108,22,202,62,
+    24,87,263,90,65,51,108,22,202,62,
     47,20,1,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -503,438 +503,442 @@ const msgtxt : array[0..000219,1..240] of char=(
   '04086_E_Expected Objective-C method or constant ','method name'#000+
   '04087_E_No type info available for this type'#000+
   '04088_E_Objective-C protocol type expected, but got "$1"'#000+
+  '04089_E_The type "$1" is not supported for interaction with the Object'+
+  'ive-C runtime.'#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_Identifi','er 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+
-  '05010_E_Only static variables can be used in static meth','ods or outsi'+
-  'de methods'#000+
+  '05009_E_Fo','rward type not resolved "$1"'#000+
+  '05010_E_Only static variables can be used in static methods or outside'+
+  ' methods'#000+
   '05012_F_record or class type expected'#000+
   '05013_E_Instances of classes or objects with an abstract method are no'+
   't allowed'#000+
-  '05014_W_Label not defined "$1"'#000+
+  '05014_W_Label ','not defined "$1"'#000+
   '05015_E_Label used but not defined "$1"'#000+
-  '05016_E_Illegal label declar','ation'#000+
+  '05016_E_Illegal label declaration'#000+
   '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
   '05018_E_Label not found'#000+
   '05019_E_identifier isn'#039't a label'#000+
   '05020_E_label already defined'#000+
-  '05021_E_illegal type declaration of set elements'#000+
-  '05022_E_Forward class definition not res','olved "$1"'#000+
+  '0502','1_E_illegal type declaration of set elements'#000+
+  '05022_E_Forward class definition not resolved "$1"'#000+
   '05023_H_Unit "$1" not used in $2'#000+
   '05024_H_Parameter "$1" not used'#000+
   '05025_N_Local variable "$1" not used'#000+
-  '05026_H_Value parameter "$1" is assigned but never used'#000+
+  '05026_H_Value parameter "$1" is assigned b','ut never used'#000+
   '05027_N_Local variable "$1" is assigned but never used'#000+
-  '05028_H_Local $1',' "$2" is not used'#000+
+  '05028_H_Local $1 "$2" is not used'#000+
   '05029_N_Private field "$1.$2" is never used'#000+
   '05030_N_Private field "$1.$2" is assigned but never used'#000+
-  '05031_N_Private method "$1.$2" never used'#000+
+  '05031_N_Private method "$1.$2" never',' used'#000+
   '05032_E_Set type expected'#000+
   '05033_W_Function result does not seem to be set'#000+
-  '05034','_W_Type "$1" is not aligned correctly in current record for C'#000+
+  '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+
+  '05036_W_Local variable "$1" does not seem to be ','initialized'#000+
   '05037_W_Variable "$1" does not seem to be initialized'#000+
-  '05038_E_identifier ','idents no member "$1"'#000+
+  '05038_E_identifier idents no member "$1"'#000+
   '05039_H_Found declaration: $1'#000+
   '05040_E_Data element too large'#000+
   '05042_E_No matching implementation for interface method "$1" found'#000+
-  '05043_W_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+
+  '05055_W_Symbol "$1" is not implemented'#000+
   '05056_E_Can'#039't create unique type from this type'#000+
   '05057_H_Local variable "$1" does not seem to be initialized'#000+
-  '05058_H_Variable "$1" does not seem to be initialized'#000+
-  '05059_W_Function result variable does not seem to initializ','ed'#000+
+  '05058_H_Variable "$1" does n','ot seem to be initialized'#000+
+  '05059_W_Function result variable does not seem to initialized'#000+
   '05060_H_Function result variable does not seem to be initialized'#000+
   '05061_W_Variable "$1" read but nowhere assigned'#000+
   '05062_H_Found abstract method: $1'#000+
-  '05063_W_Symbol "$1" is experimental'#000+
-  '05064_W_Forward declaration "$1" not resolved, assumed',' external'#000+
+  '05063','_W_Symbol "$1" is experimental'#000+
+  '05064_W_Forward declaration "$1" not resolved, assumed external'#000+
   '06009_E_Parameter list size exceeds 65535 bytes'#000+
   '06012_E_File types must be var parameters'#000+
   '06013_E_The use of a far pointer isn'#039't allowed there'#000+
-  '06015_E_EXPORT declared functions can'#039't be called'#000+
-  '06016_W_Possible illegal call of cons','tructor or destructor'#000+
+  '06','015_E_EXPORT declared functions can'#039't be called'#000+
+  '06016_W_Possible illegal call of constructor or destructor'#000+
   '06017_N_Inefficient code'#000+
   '06018_W_unreachable code'#000+
   '06020_E_Abstract methods can'#039't be called directly'#000+
-  '06027_DL_Register $1 weight $2 $3'#000+
+  '06027_DL_Register $1 weight $2 $3',#000+
   '06029_DL_Stack frame is omitted'#000+
   '06031_E_Object or class methods can'#039't be inline.'#000+
-  '060','32_E_Procvar calls cannot 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 can not be called inside a '#039,'w'+
-  'ith'#039' clause'#000+
+  'sed, use',' (set)length instead'#000+
+  '06037_E_Constructors or destructors can not be called inside a '#039'wi'+
+  'th'#039' clause'#000+
   '06038_E_Cannot call message handler methods directly'#000+
   '06039_E_Jump in or outside of an exception block'#000+
-  '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
+  '06040_E_Control flow statements aren'#039't a','llowed in a finally bloc'+
+  'k'#000+
   '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+
-  '060','42_W_Local variable size exceed limit for certain cpu'#039's'#000+
+  '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+
   '06043_E_Local variables size exceeds supported limit'#000+
   '06044_E_BREAK not allowed'#000+
-  '06045_E_CONTINUE not allowed'#000+
+  '06045_E_CONTINUE not',' allowed'#000+
   '06046_F_Unknown compilerproc "$1". Check if you use the correct run ti'+
-  'me lib','rary.'#000+
+  '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+
-  '06049_E_Goto label "$1" not defined or optimized away'#000+
-  '06050_F_Cannot find type "$1" in unit "$2". C','heck if you use the cor'+
-  'rect run time library.'#000+
+  '06049_E_Goto l','abel "$1" not defined or optimized away'#000+
+  '06050_F_Cannot find type "$1" in unit "$2". Check if you use the corre'+
+  'ct run time library.'#000+
   '07000_DL_Starting $1 styled assembler parsing'#000+
   '07001_DL_Finished $1 styled assembler parsing'#000+
-  '07002_E_Non-label pattern contains @'#000+
+  '07002_E_Non-label',' pattern contains @'#000+
   '07004_E_Error building record offset'#000+
-  '07005_E_OFFSET used without ','identifier'#000+
+  '07005_E_OFFSET used without identifier'#000+
   '07006_E_TYPE used without identifier'#000+
   '07007_E_Cannot use local variable or parameters here'#000+
   '07008_E_need to use OFFSET here'#000+
-  '07009_E_need to use $ here'#000+
+  '07009_E_need to use $ ','here'#000+
   '07010_E_Cannot use multiple relocatable symbols'#000+
-  '07011_E_Relocatable symbol can o','nly be added'#000+
+  '07011_E_Relocatable symbol can only be added'#000+
   '07012_E_Invalid constant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
   '07014_E_Invalid reference syntax'#000+
-  '07015_E_You can not reach $1 from that code'#000+
+  '07015_E_You can not reach $1 fr','om that code'#000+
   '07016_E_Local symbols/labels aren'#039't allowed as references'#000+
-  '07017_E_Invali','d base and index register usage'#000+
+  '07017_E_Invalid base and index register usage'#000+
   '07018_W_Possible error in object field handling'#000+
   '07019_E_Wrong scale factor specified'#000+
-  '07020_E_Multiple index register 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_@CO','DE and @DATA not supported'#000+
+  '07023_W_@CODE and @DATA not supported'#000+
   '07024_E_Null label references are not allowed'#000+
   '07025_E_Divide by zero in asm evaluator'#000+
   '07026_E_Illegal expression'#000+
-  '07027_E_escape sequence ignored: $1'#000+
+  '07027_E_escape ','sequence ignored: $1'#000+
   '07028_E_Invalid symbol reference'#000+
-  '07029_W_Fwait can cause emulati','on problems with emu387'#000+
+  '07029_W_Fwait can cause emulation problems with emu387'#000+
   '07030_W_$1 without operand translated into $1P'#000+
   '07031_W_ENTER instruction is not supported by Linux kernel'#000+
-  '07032_W_Calling an overload function in assembler'#000+
+  '07032_W_Calling an overlo','ad function in assembler'#000+
   '07033_E_Unsupported symbol type for operand'#000+
-  '07034_E_Constant',' value out of bounds'#000+
+  '07034_E_Constant value out of bounds'#000+
   '07035_E_Error converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
   '07037_E_Error converting binary $1'#000+
-  '07038_E_Error converting hexadecimal $1'#000+
+  '07038_E_Error converting hexa','decimal $1'#000+
   '07039_H_$1 translated to $2'#000+
-  '07040_W_$1 is associated to an overloaded func','tion'#000+
+  '07040_W_$1 is associated to an overloaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
   '07043_W_Procedures can'#039't return any value in asm code'#000+
-  '07044_E_SEG not supported'#000+
-  '07045_E_Size suffix and destination or source size do not mat','ch'#000+
+  '07','044_E_SEG not supported'#000+
+  '07045_E_Size suffix and destination or source size do not match'#000+
   '07046_W_Size suffix and destination or source size do not match'#000+
   '07047_E_Assembler syntax error'#000+
   '07048_E_Invalid combination of opcode and operands'#000+
-  '07049_E_Assembler syntax error in operand'#000+
+  '07049_','E_Assembler syntax error in operand'#000+
   '07050_E_Assembler syntax error in constant'#000+
-  '07051_','E_Invalid String expression'#000+
+  '07051_E_Invalid String expression'#000+
   '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
   '07053_E_Unrecognized opcode $1'#000+
-  '07054_E_Invalid or missing opcode'#000+
+  '07054_E_Invalid or missing',' opcode'#000+
   '07055_E_Invalid combination of prefix and opcode: $1'#000+
-  '07056_E_Invalid combinat','ion of override and opcode: $1'#000+
+  '07056_E_Invalid combination of override and opcode: $1'#000+
   '07057_E_Too many operands on line'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
-  '07061_E_Undefined local symbol $1'#000+
+  '07061_E_Undefin','ed local symbol $1'#000+
   '07062_E_Unknown label identifier $1'#000+
-  '07063_E_Invalid register name'#000,
+  '07063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
   '07066_W_Modulo not supported'#000+
   '07067_E_Invalid floating point constant $1'#000+
-  '07068_E_Invalid floating point expression'#000+
+  '07068_E_Invalid floating point express','ion'#000+
   '07069_E_Wrong symbol type'#000+
-  '07070_E_Cannot index a local var or parameter with a re','gister'#000+
+  '07070_E_Cannot index a local var or parameter with a register'#000+
   '07071_E_Invalid segment override expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
-  '07074_No type of variable specified'#000+
+  '07074_No type of variab','le specified'#000+
   '07075_E_assembler code not returned to text section'#000+
-  '07076_E_Not a direct','ive or local symbol $1'#000+
+  '07076_E_Not a directive or local symbol $1'#000+
   '07077_E_Using a defined name as a local label'#000+
   '07078_E_Dollar token is used without an identifier'#000+
-  '07079_W_32bit constant created for address'#000+
+  '07079_W_32bit constant created for ','address'#000+
   '07080_N_.align is target specific, use .balign or .p2align'#000+
-  '07081_E_Can'#039't acce','ss fields directly for parameters'#000+
+  '07081_E_Can'#039't access fields directly for parameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
-  '07083_E_No size specified and unable to determine the size of the oper'+
-  'ands'#000+
+  '07083_E_No size specified and unable to determine the size of the',' op'+
+  'erands'#000+
   '07084_E_Cannot use RESULT in this function'#000+
-  '07086_W_"$1" without operand tra','nslated into "$1 %st,%st(1)"'#000+
+  '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
   '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
   '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
-  '07089_E_Char < not allowed here'#000+
+  '07089_E_Char < not all','owed 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 be together'#000+
   '07095_E_Invalid reglist for movem'#000+
   '07096_E_Reglist invalid for opcode'#000+
   '07097_E_Higher cpu mode required ($1)'#000+
-  '07098_W_No size specified and unable to determine the size of the oper'+
-  'ands, using DWORD as default'#000+
-  '07099_E_Sy','ntax error while trying to parse a shifter operand'#000+
+  '07098_W_No size specifie','d and unable to determine the size of the op'+
+  'erands, using DWORD as default'#000+
+  '07099_E_Syntax error while trying to parse a shifter operand'#000+
   '07100_E_Address of packed component is not at a byte boundary'#000+
-  '07101_W_No size specified and unable to determine the size of the oper'+
-  'ands, using BYTE as default'#000+
-  '07102_W_Use of +offset(%ebp) ','for parameters invalid here'#000+
+  '07101_W_No size specified and unable to de','termine the size of the op'+
+  'erands, using BYTE as default'#000+
+  '07102_W_Use of +offset(%ebp) for parameters invalid here'#000+
   '07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+
   #000+
-  '07104_W_Use of -offset(%ebp) is not recommended for local variable acc'+
-  'ess'#000+
-  '07105_W_Use of -offset(%esp), access may cause a crash or value may',' '+
-  'be lost'#000+
+  '07104_W_Use of -offset(%ebp) is not recommended for loca','l variable a'+
+  'ccess'#000+
+  '07105_W_Use of -offset(%esp), access may cause a crash or value may be'+
+  ' lost'#000+
   '07106_E_VMTOffset must be used in combination with a virtual method, a'+
   'nd "$1" is not virtual'#000+
-  '07107_E_Generating PIC, but reference is not PIC-safe'#000+
+  '07107_E_Generating PIC, but reference is not PIC-safe',#000+
   '08000_F_Too many assembler files'#000+
   '08001_F_Selected assembler output not supported'#000+
-  '080','02_F_Comp not supported'#000+
+  '08002_F_Comp not supported'#000+
   '08003_F_Direct not support for binary writers'#000+
   '08004_E_Allocating of data is only allowed in bss section'#000+
-  '08005_F_No binary writer selected'#000+
+  '08005_F_No binary writer se','lected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
-  '08007_E_Asm: $1 invalid combination of opc','ode and operands'#000+
+  '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
   '08008_E_Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
-  '08011_E_Asm: $1 value exceeds bounds $2'#000+
+  '08011_E_A','sm: $1 value exceeds bounds $2'#000+
   '08012_E_Asm: Short jump is out of range $1'#000+
-  '08013_E_Asm',': Undefined label $1'#000+
+  '08013_E_Asm: Undefined label $1'#000+
   '08014_E_Asm: Comp type not supported for this target'#000+
   '08015_E_Asm: Extended type not supported for this target'#000+
-  '08016_E_Asm: Duplicate label $1'#000+
+  '08016_E_Asm: Duplicate l','abel $1'#000+
   '08017_E_Asm: Redefined label $1'#000+
   '08018_E_Asm: First defined here'#000+
-  '08019_E_Asm: ','Invalid register $1'#000+
+  '08019_E_Asm: Invalid register $1'#000+
   '08020_E_Asm: 16 or 32 Bit references not supported'#000+
   '08021_E_Asm: 64 Bit operands not supported'#000+
-  '09000_W_Source operating system redefined'#000+
+  '09000_W_Source operating system redefined',#000+
   '09001_I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assembler file: $1'#000+
-  '09003_E_Can'#039't c','reate object file: $1'#000+
+  '09003_E_Can'#039't create object file: $1'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
   '09005_E_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
-  '09007_E_Error while assembling exitcode $1'#000+
-  '09008_E_Can'#039't call the assembler, error $1 s','witching to external'+
-  ' assembling'#000+
+  '09','007_E_Error while assembling exitcode $1'#000+
+  '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
+  'ssembling'#000+
   '09009_I_Assembling $1'#000+
   '09010_I_Assembling with smartlinking $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
-  '09012_W_Library $1 not found, Linking may fail !'#000+
+  '09012_W_Libra','ry $1 not found, Linking may fail !'#000+
   '09013_E_Error while linking'#000+
-  '09014_E_Can'#039't call th','e 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+
-  '09019_E_Creation of Dynamic/Shared Libraries not support','ed'#000+
+  '09018_E_Creation ','of Executables not supported'#000+
+  '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
   '09021_E_resource compiler "$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+
-  '09024_T_unit $1 can'#039't be smart linked, sw','itching to static linki'+
-  'ng'#000+
+  '09023_T_unit $1 can'#039't be st','atically linked, switching to smart l'+
+  'inking'#000+
+  '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
+  #000+
   '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
   'g'#000+
   '09026_E_unit $1 can'#039't be smart or static linked'#000+
-  '09027_E_unit $1 can'#039't be shared or static linked'#000+
-  '09028_D_Calling resource compiler "$1" with "$2" ','as command line'#000+
+  '09027_E_unit ','$1 can'#039't be shared or static linked'#000+
+  '09028_D_Calling resource compiler "$1" with "$2" as command line'#000+
   '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+
+  '09031_E_Can'#039't open resour','ce file "$1"'#000+
   '09032_E_Can'#039't write resource file "$1"'#000+
-  '09128_F_Can'#039't post process execut','able $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 b','ytes'#000+
   '09133_X_Stack space reserved: $1 bytes'#000+
   '09134_X_Stack space committed: $1 bytes'#000+
-  '0','9200_F_Executable image size is too big for $1 target.'#000+
+  '09200_F_Executable image size is too big for $1 target.'#000+
   '09201_W_Object file "$1" contains 32-bit absolute relocation to symbol'+
   ' "$2".'#000+
-  '10000_T_Unitsearch: $1'#000+
+  '10000_T_Unitsearch: $1'#000,
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
-  '10004_U_PPU Crc: $1',#000+
+  '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
   '10006_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
-  '10009_U_PPU is compiled for another processor'#000+
+  '10009_U_PPU is compiled fo','r another processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
-  '10011_U_PPU Source: $','1'#000+
+  '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
   '10016_F_Invalid PPU-File entry: $1'#000+
-  '10017_F_PPU Dbx count problem'#000+
+  '1001','7_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_','F_Circular unit reference between $1 and $2'#000+
+  '10020_F_Circular unit reference between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
   '10022_F_Can'#039't find unit $1 used by $2'#000+
-  '10023_W_Unit $1 was not found but $2 exists'#000+
+  '10023_W_Unit $1 was n','ot found but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
-  '10025_W_Compiling the sy','stem 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+
-  '10028_U_Recompiling $1, checksum changed for $2'#000+
+  '10028_U_Recompiling $1, checksu','m changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
-  '10030_U_Recompiling unit, ','static lib is older than ppufile'#000+
+  '10030_U_Recompiling unit, static lib is older than ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
   '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
-  '10033_U_Recompiling unit, obj is older than asm'#000+
+  '10','033_U_Recompiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
-  '10035_U','_Parsing implementation of $1'#000+
+  '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
+  '10040_W_Can'#039't recompile unit $1, but found modifed include ','files'+
+  #000+
   '10041_U_File $1 is newer than PPU file $2'#000+
-  '10042_U_Trying to use a unit which wa','s compiled with a different FPU'+
-  ' mode'#000+
+  '10042_U_Trying to use a unit which was compiled with a different FPU m'+
+  'ode'#000+
   '10043_U_Loading interface units from $1'#000+
   '10044_U_Loading implementation units from $1'#000+
-  '10045_U_Interface CRC changed for unit $1'#000+
+  '10045_U_Interface CRC changed for',' unit $1'#000+
   '10046_U_Implementation CRC changed for unit $1'#000+
-  '10047_U_Finished compiling un','it $1'#000+
+  '10047_U_Finished compiling unit $1'#000+
   '10048_U_Add dependency of $1 to $2'#000+
   '10049_U_No reload, is caller: $1'#000+
   '10050_U_No reload, already in second compile: $1'#000+
   '10051_U_Flag for reload: $1'#000+
-  '10052_U_Forced reloading'#000+
+  '1005','2_U_Forced reloading'#000+
   '10053_U_Previous state of $1: $2'#000+
-  '10054_U_Already compiling $1, s','etting second compile'#000+
+  '10054_U_Already compiling $1, setting second compile'#000+
   '10055_U_Loading unit $1'#000+
   '10056_U_Finished loading unit $1'#000+
   '10057_U_Registering new unit $1'#000+
   '10058_U_Re-resolving unit $1'#000+
-  '10059_U_Skipping re-resolving unit $1, still loading used units'#000+
-  '10060_U_Unloading resource unit $1 (','not needed)'#000+
+  '10059_U_Skippin','g 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 compilation invocation'#000+
-  '11000_O_$1 [options] <inputfile>',' [options]'#000+
+  'wpo',' feedback input file for this compilation invocation'#000+
+  '11000_O_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported, changing source file to compil'+
   'e from "$1" into "$2"'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
-  '11003_E_nested response files are not supported'#000+
-  '11004_F_No source file name in command line',#000+
+  '11003_','E_nested response files are not supported'#000+
+  '11004_F_No source file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
-  '11009_F_Unable to open file $1'#000+
+  '11009_F_Unable to ','open file $1'#000+
   '11010_D_Reading further options from $1'#000+
-  '11011_W_Target is already set to',': $1'#000+
+  '11011_W_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} encou'+
   'ntered'#000+
-  '11014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} encoun'+
-  'tered'#000+
-  '11015_F_Ope','n conditional at the end of the options file'#000+
+  '11','014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} enco'+
+  'untered'#000+
+  '11015_F_Open conditional at the end of the options file'#000+
   '11016_W_Debug information generation is not supported by this executab'+
   'le'#000+
   '11017_H_Try recompiling with -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+
+  '11','018_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" is not compatible with "$2"'#000+
-  '11022_W_"$1" assembler use forced'#000+
+  '11022_','W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
-  '11027_T_Reading opti','ons from environment $1'#000+
+  '11027_T_Reading options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
   '11029_O_*** press enter ***'#000+
   '11030_H_Start of reading config file $1'#000+
-  '11031_H_End of reading config file $1'#000+
+  '11031_H_End of reading config file',' $1'#000+
   '11032_D_interpreting option "$1"'#000+
   '11036_D_interpreting firstpass option "$1"'#000+
-  '11033','_D_interpreting file option "$1"'#000+
+  '11033_D_interpreting file option "$1"'#000+
   '11034_D_Reading config file "$1"'#000+
   '11035_D_found source file name "$1"'#000+
   '11039_E_Unknown code page'#000+
-  '11040_F_Config file $1 is a directory'#000+
+  '11040_F_Config file $1 is a',' directory'#000+
   '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
-  'uggi','ng disabled'#000+
+  '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+
-  '11044_F_Option "$1" is not, or not yet, supported on the current tar','g'+
-  'et platform'#000+
+  '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 debug information cannot be used with smart linking on t'+
-  'his target, switching to static linking'#000+
-  '12000_F_Cannot open whole prog','ram optimization feedback file "$1"'#000+
+  '11046_N_DWARF debug information cannot be used with sma','rt linking on'+
+  ' this target, switching to static linking'#000+
+  '12000_F_Cannot open whole program optimization feedback file "$1"'#000+
   '12001_D_Processing whole program optimization information in wpo feedb'+
   'ack file "$1"'#000+
-  '12002_D_Finished processing the whole program optimization information'+
-  ' in wpo feedback file "$1"'#000+
-  '12003_E_Expected sectio','n header, but got "$2" at line $1 of wpo feed'+
-  'back file'#000+
+  '12002_D_Finished processing the who','le program optimization informati'+
+  'on in wpo feedback file "$1"'#000+
+  '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+
+  'ck file'#000+
   '12004_W_No handler registered for whole program optimization section "'+
-  '$2" at line $1 of wpo feedback file, ignoring'#000+
-  '12005_D_Found whole program optimization section "$1" with informatio',
-  'n about "$2"'#000+
+  '$2" at line $1 of wpo feedback',' file, ignoring'#000+
+  '12005_D_Found whole program optimization section "$1" with information'+
+  ' about "$2"'#000+
   '12006_F_The selected whole program optimizations require a previously '+
   'generated feedback file (use -Fw to specify)'#000+
-  '12007_E_No collected information necessary to perform "$1" whole progr'+
-  'am optimization found'#000+
-  '12008_F_Specify a wh','ole program optimization feedback file to store '+
-  'the generated info in (using -FW)'#000+
+  '12007_E_No collected inform','ation necessary to perform "$1" whole pro'+
+  'gram optimization found'#000+
+  '12008_F_Specify a whole program optimization feedback file to store th'+
+  'e generated info in (using -FW)'#000+
   '12009_E_Not generating any whole program optimization information, yet'+
-  ' a feedback file was specified (using -FW)'#000+
-  '12010_E_Not performing any whole program opti','mizations, yet an input'+
-  ' feedback file was specified (using -Fw)'#000+
+  ' a ','feedback file was specified (using -FW)'#000+
+  '12010_E_Not performing any whole program optimizations, yet an input f'+
+  'eedback file was specified (using -Fw)'#000+
   '12011_D_Skipping whole program optimization section "$1", because not '+
-  'needed by the requested optimizations'#000+
-  '12012_W_Overriding previously read information for "$1" from feedbac','k'+
-  ' input file using information in section "$2"'#000+
+  'needed by the request','ed optimizations'#000+
+  '12012_W_Overriding previously read information for "$1" from feedback '+
+  'input file using information in section "$2"'#000+
   '12013_E_Cannot extract symbol liveness information from program when s'+
   'tripping symbols, use -Xs-'#000+
-  '12014_E_Cannot extract symbol liveness information from program when w'+
-  'hen not linking'#000+
-  '12015_F_Ca','nnot find "$1" or "$2" to extract symbol liveness informat'+
-  'ion from linked program'#000+
+  '12014_E_Can','not extract symbol liveness information from program when'+
+  ' when not linking'#000+
+  '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+
+  'n from linked program'#000+
   '12016_E_Error during reading symbol liveness information produced by "'+
-  '$1"'#000+
+  '$1"',#000+
   '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+
-  'ion from linke','d program'#000+
+  'ion from linked program'#000+
   '12018_E_Collection of symbol liveness information can only help when u'+
   'sing smart linking, use -CX -XX'#000+
-  '12019_E_Cannot create specified whole program optimisation feedback fi'+
-  'le "$1"'#000+
-  '11023_Free Pascal Compiler version $FPCFULLVERSION',' [$FPCDATE] for $F'+
-  'PCCPU'#010+
+  '12019_E_Cannot create specified whole progr','am optimisation feedback '+
+  'file "$1"'#000+
+  '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
+  'CPU'#010+
   'Copyright (c) 1993-2009 by Florian Klaempfl'#000+
   '11024_Free Pascal 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+
   #010+
-  'Supported CPU instruction sets:',#010+
+  'Supported CPU instruction sets:'#010+
   '  $INSTRUCTIONSETS'#010+
   #010+
   'Supported FPU instruction sets:'#010+
@@ -944,298 +948,300 @@ const msgtxt : array[0..000219,1..240] of char=(
   '  $ABITARGETS'#010+
   #010+
   'Supported Optimizations:'#010+
-  '  $OPTIMIZATIONS'#010+
+  '  $OPTIMIZATIONS',#010+
   #010+
   'Supported Whole Program Optimizations:'#010+
   '  All'#010+
   '  $WPOPTIMIZATIONS'#010+
   #010+
-  'Supported Microcon','troller types:'#010+
+  'Supported Microcontroller types:'#010+
   '  $CONTROLLERTYPES'#010+
   #010+
   'This program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.FPC'#010+
   #010+
-  'Report bugs, suggestions, etc. to:'#010+
+  'Report bugs, suggestions,',' etc. to:'#010+
   '                 http://bugs.freepascal.org'#010+
   'or'#010+
-  '                 bugs@freepa','scal.org'#000+
+  '                 [email protected]'#000+
   '11025_**0*_Put + after a boolean switch option to enable it, - to disa'+
   'ble it'#010+
   '**1a_The compiler doesn'#039't delete the generated assembler file'#010+
-  '**2al_List sourcecode lines in assembler file'#010+
+  '**2al_L','ist sourcecode lines in assembler file'#010+
   '**2an_List node info in assembler file'#010+
-  '*L2ap_U','se pipes instead of creating temporary assembler files'#010+
+  '*L2ap_Use pipes instead of creating temporary assembler files'#010+
   '**2ar_List register allocation/release info in assembler file'#010+
-  '**2at_List temp allocation/release info in assembler file'#010+
+  '**2at_List temp allocation/release inf','o in assembler file'#010+
   '**1A<x>_Output format:'#010+
   '**2Adefault_Use default assembler'#010+
-  '3*2Aas_A','ssemble using GNU AS'#010+
+  '3*2Aas_Assemble using GNU AS'#010+
   '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
   '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+
   '3*2Anasmwin32_Win32 object file using Nasm'#010+
-  '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
+  '3*2Ana','smwdosx_Win32/WDOSX object file using Nasm'#010+
   '3*2Awasm_Obj file using Wasm (Watcom)'#010+
-  '3*2A','nasmobj_Obj file 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*2Apecoff_PE-COFF (Win32) using internal wri','ter'#010+
+  '3*2Ac','off_COFF (Go32v2) using internal writer'#010+
+  '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
   '4*2Aas_Assemble using GNU AS'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
-  '6*2Amot_Standard Motorola assembler'#010+
+  '6*2Amot_Standard Motorola asse','mbler'#010+
   'A*2Aas_Assemble using GNU AS'#010+
   'P*2Aas_Assemble using GNU AS'#010+
-  'S*2Aas_Assemble using',' GNU AS'#010+
+  'S*2Aas_Assemble using GNU AS'#010+
   '**1b_Generate browser info'#010+
   '**2bl_Generate local symbol info'#010+
   '**1B_Build all modules'#010+
   '**1C<x>_Code generation options:'#010+
-  '**2Ca<x>_Select ABI, see fpc -i for possible values'#010+
+  '**2Ca<x>_Select ABI, see fpc -i',' for possible values'#010+
   '**2Cb_Generate big-endian code'#010+
-  '**2Cc<x>_Set default calling conv','ention to <x>'#010+
+  '**2Cc<x>_Set default calling convention to <x>'#010+
   '**2CD_Create also dynamic library (not supported)'#010+
   '**2Ce_Compilation with emulated floating point opcodes'#010+
-  '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
-  'lues'#010+
-  '**2CF<x>_Minimal floating point constant preci','sion (default, 32, 64)'+
-  #010+
+  '**2Cf<x>_Select fpu instruction set ','to use, see fpc -i for possible '+
+  'values'#010+
+  '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
   '**2Cg_Generate PIC code'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_Omit linking stage'#010+
-  '**2Co_Check overflow of integer operations'#010+
-  '**2CO_Check for possible overflow of integer operations',#010+
+  '**2Co_Check o','verflow of integer operations'#010+
+  '**2CO_Check for possible overflow of integer operations'#010+
   '**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+
   '**2CP<x>=<y>_ packing settings'#010+
-  '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
-  'and 8'#010+
+  '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NO','RMAL, 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+
+  '**2Cs<n>_Set stack checking size to <n>'#010+
   '**2Ct_Stack checking (for testing only, see manual)'#010+
   '**2CX_Create also smartlinked library'#010+
-  '**1d<x>_Defines the symbol <x>'#010+
+  '**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 version to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_Set path to executable'#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+
+  '**2Fa<x>[,y]_(for a program)',' load units <x> and [y] before uses is p'+
+  'arsed'#010+
   '**2Fc<x>_Set input codepage to <x>'#010+
-  '**2F','C<x>_Set RC compiler binary name to <x>'#010+
+  '**2FC<x>_Set RC compiler binary name to <x>'#010+
   '**2Fd_Disable the compiler'#039's internal directory cache'#010+
-  '**2FD<x>_Set the directory where to search for compiler utilities'#010+
+  '**2FD<x>_Set the directory where to search for compiler utili','ties'#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 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+
+  '**2Fm<','x>_Load unicode conversion table from <x>.txt in the compiler '+
+  'dir'#010+
+  '**2Fo<x>_Add <x> to object path'#010+
   '**2Fr<x>_Load error message file <x>'#010+
   '**2FR<x>_Set resource (.res) linker 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+
+  '**2FU<x>_Set unit output path to',' <x>, overrides -FE'#010+
+  '**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
   '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
   'om <x>'#010+
   '*g1g_Generate debug information (default format for target)'#010+
-  '*g2gc_Generate checks for pointers'#010+
+  '*g2gc_Generate ','checks for pointers'#010+
   '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
-  '*','g2gl_Use line info unit (show more info with backtraces)'#010+
+  '*g2gl_Use line info unit (show more info with backtraces)'#010+
   '*g2go<x>_Set debug information options'#010+
-  '*g3godwarfsets_ Enable DWARF set debug information (breaks gdb < 6.5)'#010+
+  '*g3godwarfsets_ Enable DWARF set debug information (breaks ','gdb < 6.5'+
+  ')'#010+
   '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
   #010+
-  '*g2','gp_Preserve case in stabs symbol names'#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 (same as -gw2',')'#010+
+  '*g2gv_Generates pr','ograms traceable with Valgrind'#010+
+  '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
   '*g2gw2_Generate DWARFv2 debug information'#010+
   '*g2gw3_Generate DWARFv3 debug information'#010+
   '**1i_Information'#010+
   '**2iD_Return compiler date'#010+
-  '**2iV_Return short compiler version'#010+
+  '**2iV_Return short compil','er version'#010+
   '**2iW_Return full compiler version'#010+
   '**2iSO_Return compiler OS'#010+
-  '**2iSP_Return',' compiler host processor'#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+
   '**1k<x>_Pass <x> to the linker'#010+
-  '**1l_Write logo'#010+
+  '**1l_Write l','ogo'#010+
   '**1M<x>_Set language mode to <x>'#010+
   '**2Mfpc_Free Pascal dialect (default)'#010+
-  '**2Mobjfpc','_FPC mode with Object Pascal support'#010+
+  '**2Mobjfpc_FPC mode with Object Pascal support'#010+
   '**2Mdelphi_Delphi 7 compatibility mode'#010+
   '**2Mtp_TP/BP 7.0 compatibility mode'#010+
-  '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
+  '**2Mmacpas_Macintosh Pascal dialects compat','ibility mode'#010+
   '**1n_Do not read the default config files'#010+
-  '**1N<x>_Node tree optimization','s'#010+
+  '**1N<x>_Node tree optimizations'#010+
   '**2Nu_Unroll loops'#010+
   '**1o<x>_Change the name of the executable produced to <x>'#010+
   '**1O<x>_Optimizations:'#010+
   '**2O-_Disable optimizations'#010+
-  '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
-  '**2O2_Level 2 optimizations (-O1 + quick optimizatio','ns)'#010+
+  '**2O1_Level 1 optimizatio','ns (quick and debugger friendly)'#010+
+  '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
   '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
   '**2Oa<x>=<y>_Set alignment'#010+
-  '**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i for possible '+
-  '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 optimizati'+
-  'on <x>, see fpc -i for possible values'#010+
-  '**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possib'+
-  'le 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 f','pc -i for poss'+
+  'ible values'#010+
   '**2Os_Optimize for size rather than speed'#010+
-  '**1pg_Generate pr','ofile code for gprof (defines FPC_PROFILE)'#010+
+  '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
   '**1R<x>_Assembler reading style:'#010+
   '**2Rdefault_Use default assembler for target'#010+
-  '3*2Ratt_Read AT&T style assembler'#010+
+  '3*2Ratt_Read AT&T style assembler'#010,
   '3*2Rintel_Read Intel style assembler'#010+
   '6*2RMOT_Read motorola style assembler'#010+
-  '**1S<x>_Sy','ntax options:'#010+
+  '**1S<x>_Syntax options:'#010+
   '**2S2_Same as -Mobjfpc'#010+
   '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_Turn on assertions'#010+
   '**2Sd_Same as -Mdelphi'#010+
-  '**2Se<x>_Error options. <x> is a combination of the following:'#010+
-  '**3*_<n> : Compiler halts after the <n> err','ors (default is 1)'#010+
+  '**2Se<x>_Error option','s. <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*_h : Compiler also halts after hints'#010+
-  '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
-  '**2Sh_Use ansistrings by default ins','tead of shortstrings'#010+
+  '**2Sg_Enab','le LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
+  '**2Sh_Use ansistrings by default instead of shortstrings'#010+
   '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
   '**2Sk_Load fpcylix unit'#010+
   '**2SI<x>_Set interface style to <x>'#010+
-  '**3SIcom_COM compatible interface (default)'#010+
+  '**3SIc','om_COM compatible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
-  '**2Sm_Sup','port macros like C (global)'#010+
+  '**2Sm_Support macros like C (global)'#010+
   '**2So_Same as -Mtp'#010+
   '**2Ss_Constructor name must be init (destructor must be done)'#010+
   '**2St_Allow static keyword in objects'#010+
-  '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
-  '**1s_Do not call assembler a','nd linker'#010+
+  '**2Sx_En','able exception keywords (default in Delphi/ObjFPC modes)'#010+
+  '**1s_Do not call assembler and linker'#010+
   '**2sh_Generate script to link on host'#010+
   '**2st_Generate script to link on target'#010+
   '**2sr_Skip register allocation phase (use with -alr)'#010+
-  '**1T<x>_Target operating system:'#010+
+  '**1T<x>_Target',' operating system:'#010+
   '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
-  '3*2Tfreebsd_Free','BSD'#010+
+  '3*2Tfreebsd_FreeBSD'#010+
   '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
-  '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
+  '3*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*2Twatcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
   '3*2Twince_Windows CE'#010+
-  '4*2Tlinux_Linux'#010+
+  '4*2Tlinux_Linux',#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux/m68k'#010+
-  '6*2Tmacos_M','acintosh m68k (not supported)'#010+
+  '6*2Tmacos_Macintosh m68k (not supported)'#010+
   '6*2Tpalmos_PalmOS'#010+
   'A*2Tlinux_Linux'#010+
   'A*2Twince_Windows CE'#010+
   'P*2Tamiga_AmigaOS on PowerPC'#010+
-  'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+
+  'P*2Tdarwin_Darwin and Mac OS X on PowerPC',#010+
   'P*2Tlinux_Linux on PowerPC'#010+
   'P*2Tmacos_Mac OS (classic) on PowerPC'#010+
-  'P*2Tmorphos_MorphOS',#010+
+  'P*2Tmorphos_MorphOS'#010+
   'S*2Tlinux_Linux'#010+
   '**1u<x>_Undefines the symbol <x>'#010+
   '**1U_Unit options:'#010+
   '**2Un_Do not check where the unit name matches the file name'#010+
-  '**2Ur_Generate release unit files (never automatically recompiled)'#010+
+  '**2Ur_Generate release un','it files (never automatically recompiled)'#010+
   '**2Us_Compile a system unit'#010+
-  '**1v<x>_Be verb','ose. <x> is a combination of the following letters:'#010+
+  '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
   '**2*_e : Show errors (default)       0 : Show nothing (except errors)'#010+
-  '**2*_w : Show warnings               u : Show unit info'#010+
-  '**2*_n : Show notes                  t : Show tried/used files',#010+
+  '**2*_w : Show warnings           ','    u : Show unit info'#010+
+  '**2*_n : Show notes                  t : Show tried/used files'#010+
   '**2*_h : Show hints                  c : Show conditionals'#010+
   '**2*_i : Show general info           d : Show debug info'#010+
-  '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
-  '**2*_s : Show time stamps            q : Show message',' numbers'#010+
+  '**2*_l : Show linenumbers            r',' : Rhide/GCC compatibility mod'+
+  'e'#010+
+  '**2*_s : Show time stamps            q : Show message numbers'#010+
   '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
   '**2*_b : Write file names messages   p : Write tree.log with parse tre'+
   'e'#010+
-  '**2*_    with full path              v : Write fpcdebug.txt with'#010+
-  '**2*_                   ','                 lots of debugging info'#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+
   '3*1W<x>_Target-specific options (targets)'#010+
-  'A*1W<x>_Target-specific options (targets)'#010+
+  'A*1W<x>_Target-s','pecific options (targets)'#010+
   'P*1W<x>_Target-specific options (targets)'#010+
-  'p*1W<x>_Target-sp','ecific options (targets)'#010+
+  'p*1W<x>_Target-specific options (targets)'#010+
   '3*2Wb_Create a bundle instead of a library (Darwin)'#010+
   'P*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
+  'p*2Wb_Create a bundle inst','ead of a library (Darwin)'#010+
   '3*2WB_Create a relocatable image (Windows)'#010+
-  'A*2WB_Create a r','elocatable image (Windows, Symbian)'#010+
+  'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
   '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
   'A*2WC_Specify console type application (Windows)'#010+
-  'P*2WC_Specify console type application (Classic Mac OS)'#010+
-  '3*2WD_Use DEFFILE to export functions o','f DLL or EXE (Windows)'#010+
+  'P*2WC_Spec','ify console type application (Classic Mac OS)'#010+
+  '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
   'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
   '3*2We_Use external resources (Darwin)'#010+
-  'P*2We_Use external resources (Darwin)'#010+
+  'P*2We_Use external resources (Da','rwin)'#010+
   'p*2We_Use external resources (Darwin)'#010+
-  '3*2WF_Specify full-screen type applicatio','n (EMX, OS/2)'#010+
+  '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
   '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
   'A*2WG_Specify graphic type application (Windows)'#010+
-  'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
+  'P*2WG_Specify graphic type appli','cation (Classic Mac OS)'#010+
   '3*2Wi_Use internal resources (Darwin)'#010+
-  'P*2Wi_Use internal reso','urces (Darwin)'#010+
+  'P*2Wi_Use internal resources (Darwin)'#010+
   'p*2Wi_Use internal resources (Darwin)'#010+
   '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
+  'A*2WN_Do not generate relocation',' code, needed for debugging (Windows'+
+  ')'#010+
   '3*2WR_Generate relocation code (Windows)'#010+
-  'A*2WR_','Generate relocation code (Windows)'#010+
+  'A*2WR_Generate relocation code (Windows)'#010+
   'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
   '3*2WX_Enable executable stack (Linux)'#010+
-  'A*2WX_Enable executable stack (Linux)'#010+
+  'A*2WX_Enable executable s','tack (Linux)'#010+
   'p*2WX_Enable executable stack (Linux)'#010+
-  'P*2WX_Enable executable stack (Lin','ux)'#010+
+  'P*2WX_Enable executable stack (Linux)'#010+
   '**1X_Executable options:'#010+
   '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
   'ux)'#010+
-  '**2Xd_Do not use standard library search path (needed for cross compil'+
-  'e)'#010+
+  '**2Xd_Do not use standard library search path (neede','d for cross comp'+
+  'ile)'#010+
   '**2Xe_Use external linker'#010+
-  '**2Xg_Create debuginfo in a separate f','ile and add a debuglink sectio'+
-  'n to executable'#010+
+  '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
+  'to executable'#010+
   '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
   '**2Xi_Use internal linker'#010+
-  '**2Xm_Generate link map'#010+
+  '**2Xm_Generate ','link map'#010+
   '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
   's '#039'main'#039')'#010+
-  '**2X','P<x>_Prepend the binutils names with the prefix <x>'#010+
+  '**2XP<x>_Prepend the binutils names with the prefix <x>'#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+
+  'ile, see the ld manual for more infor','mation) (BeOS, Linux)'#010+
+  '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
+  ', Linux, Mac OS, Solaris)'#010+
   '**2Xs_Strip all symbols from executable'#010+
   '**2XS_Try to 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+
+  '**2Xt_Link w','ith static libraries (-static is passed to linker)'#010+
+  '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+
   '**1h_Shows this help without waiting'

compiler/ninl.pas

@@ -86,7 +86,8 @@ implementation
       globtype, cutils,
       symconst,symdef,symsym,symtable,paramgr,defutil,
       pass_1,
-      ncal,ncon,ncnv,nadd,nld,nbas,nflw,nmem,nmat,nutils,nobjc,
+      ncal,ncon,ncnv,nadd,nld,nbas,nflw,nmem,nmat,nutils,
+      nobjc,objcutil,
       cgbase,procinfo
       ;
 
@@ -1898,6 +1899,17 @@ implementation
         end;
 
 
+      function handle_objc_encode: tnode;
+        var
+          encodedtype: ansistring;
+          errordef: tdef;
+        begin
+          encodedtype:='';
+          if not objctryencodetype(left.resultdef,encodedtype,errordef) then
+            Message1(type_e_objc_type_unsupported,errordef.typename);
+          result:=cstringconstnode.createpchar(ansistring2pchar(encodedtype),length(encodedtype));
+        end;
+
 
       var
          hightree,
@@ -2462,6 +2474,10 @@ implementation
                   { reused }
                   left:=nil;
                 end;
+              in_objc_encode_x:
+                begin
+                  result:=handle_objc_encode;
+                end;
               else
                 internalerror(8);
             end;

compiler/objcutil.pas

@@ -27,34 +27,703 @@ unit objcutil;
 
 interface
 
-uses
-  node,
-  symdef;
+    uses
+      node,
+      symtype,symdef;
 
-function objcsuperclassnode(def: tobjectdef): tnode;
+    { Generate a node loading the superclass structure necessary to call
+      an inherited Objective-C method.  }
+    function objcsuperclassnode(def: tobjectdef): tnode;
+
+    { The internals of Objective-C's @encode() functionality: encode a
+      type into the internal format used by the run time. Returns false
+      if a type is not representable by the Objective-C run time, and in
+      that case also the failing definition.  }
+    function objctryencodetype(def: tdef; out encodedtype: ansistring; out founderror: tdef): boolean;
+
+    { Encode a method's parameters and result type into the format used by the
+      run time (for generating protocol and class rtti).  }
+    function objcencodemethod(pd: tprocdef): ansistring;
+
+    { Check whether a type can be used in an Objective-C method
+      signature or field declaration.  }
+    function objcchecktype(def: tdef; out founderror: tdef): boolean;
 
 implementation
 
-uses
-  pass_1,
-  verbose,
-  symtable,symconst,
-  nbas,nmem,ncal,nld;
-
-function objcsuperclassnode(def: tobjectdef): tnode;
-  var
-    block: tblocknode;
-    statements: tstatementnode;
-    para: tcallparanode;
-  begin
-    { only valid for Objective-C classes }
-    if not is_objcclass(def) then
-      internalerror(2009032903);
-    block:=internalstatements(statements);
-    para:=ccallparanode.create(cloadvmtaddrnode.create(ctypenode.create(def)),nil);
-    addstatement(statements,ccallnode.createinternfromunit('OBJC1','CLASS_GETSUPERCLASS',para));
-    typecheckpass(block);
-    result:=block;
-  end;
+    uses
+      globtype,
+      cutils,cclasses,
+      pass_1,
+      verbose,
+      symtable,symconst,symsym,
+      defutil,paramgr,
+      nbas,nmem,ncal,nld;
+
+
+{******************************************************************
+                       objcsuperclassnode
+*******************************************************************}
+
+    function objcsuperclassnode(def: tobjectdef): tnode;
+      var
+        block: tblocknode;
+        statements: tstatementnode;
+        para: tcallparanode;
+      begin
+        { only valid for Objective-C classes }
+        if not is_objcclass(def) then
+          internalerror(2009032903);
+        block:=internalstatements(statements);
+        para:=ccallparanode.create(cloadvmtaddrnode.create(ctypenode.create(def)),nil);
+        addstatement(statements,ccallnode.createinternfromunit('OBJC1','CLASS_GETSUPERCLASS',para));
+        typecheckpass(block);
+        result:=block;
+      end;
+
+
+{******************************************************************
+                          Type encoding
+*******************************************************************}
+
+    type
+      trecordinfostate = (ris_initial, ris_afterpointer, ris_dontprint);
+
+    function objcparasize(def: tdef; varspez: tvarspez): ptrint;
+      begin
+        if paramanager.push_addr_param(varspez,def,pocall_cdecl) then
+          result:=sizeof(pint)
+        else
+          begin
+            result:=def.size;
+            { In Objective-C, all ordinal types are widened to at least
+              the size of the C "int" type. Assume __LP64__/4 byte ints for now. }
+            if is_ordinal(def) and
+               (result<4) then
+              result:=4;
+          end;
+      end;
+
+
+    function addencodedtype(def: tdef; recordinfostate: trecordinfostate; bpacked: boolean; var encodedstr: ansistring; out founderror: tdef): boolean; forward;
+
+    function encoderecst(const recname: ansistring; recst: tabstractrecordsymtable; var encodedstr: ansistring; out founderror: tdef): boolean;
+      var
+        variantstarts: tfplist;
+        i, varindex: longint;
+        field,
+        firstfield: tfieldvarsym;
+        firstfieldvariant,
+        bpacked: boolean;
+      begin
+        result:=false;
+        bpacked:=recst.fieldalignment=bit_alignment;
+        { Is the first field already the start of a variant?  }
+        firstfield:=nil;
+        firstfieldvariant:=false;
+        for i:=0 to recst.symlist.count-1 do
+          begin
+            if (tsym(recst.symlist[i]).typ<>fieldvarsym) then
+              continue;
+            field:=tfieldvarsym(recst.symlist[i]);
+            if not assigned(firstfield) then
+              firstfield:=field
+            else if (vo_is_first_field in field.varoptions) then
+              begin
+                if (field.fieldoffset=firstfield.fieldoffset) then
+                  firstfieldvariant:=true;
+              end;
+          end;
+        variantstarts:=tfplist.create;
+        encodedstr:=encodedstr+'{'+recname+'=';
+        for i:=0 to recst.symlist.count-1 do
+          begin
+            if (tsym(recst.symlist[i]).typ<>fieldvarsym) then
+              continue;
+
+            field:=tfieldvarsym(recst.symlist[i]);
+            { start of a variant part? }
+            if ((field=firstfield) and
+                firstfieldvariant) or
+               ((field<>firstfield) and
+                (vo_is_first_field in field.varoptions)) then
+              begin
+                varindex:=variantstarts.count-1;
+                if (varindex=-1) or
+                   (tfieldvarsym(variantstarts[varindex]).fieldoffset<field.fieldoffset) then
+                  begin
+                    { new, more deeply nested variant }
+                    encodedstr:=encodedstr+'(?={?=';
+                    variantstarts.add(field);
+                  end
+                else
+                  begin
+                    { close existing nested variants if any }
+                    while (varindex>=0) and
+                          (tfieldvarsym(variantstarts[varindex]).fieldoffset>field.fieldoffset) do
+                      begin
+                        { close more deeply nested variants }
+                        encodedstr:=encodedstr+'})';
+                        dec(varindex);
+                      end;
+                    if (varindex<0) then
+                      internalerror(2009081805);
+                    if (tfieldvarsym(variantstarts[varindex]).fieldoffset<>field.fieldoffset) then
+                      internalerror(2009081804);
+
+                    { variant at the same level as a previous one }
+                    variantstarts.count:=varindex+1;
+                    { No need to add this field, it has the same offset as the
+                      previous one at this position.  }
+                    if tfieldvarsym(variantstarts[varindex]).fieldoffset<>field.fieldoffset then
+                      internalerror(2009081601);
+                    { close previous variant sub-part and start new one }
+                    encodedstr:=encodedstr+'}{?=';
+                  end
+              end;
+            if not addencodedtype(field.vardef,ris_afterpointer,bpacked,encodedstr,founderror) then
+              exit;
+          end;
+        for i:=0 to variantstarts.count-1 do
+          encodedstr:=encodedstr+'})';
+        variantstarts.free;
+        encodedstr:=encodedstr+'}';
+        result:=true
+      end;
+
+
+    function addencodedtype(def: tdef; recordinfostate: trecordinfostate; bpacked: boolean; var encodedstr: ansistring; out founderror: tdef): boolean;
+      var
+        recname: ansistring;
+        recdef: trecorddef;
+        objdef: tobjectdef;
+        len: aint;
+        c: char;
+        newstate: trecordinfostate;
+        addrpara: boolean;
+      begin
+        result:=true;
+        case def.typ of
+          stringdef :
+            begin
+              case tstringdef(def).stringtype of
+                st_shortstring:
+                  { include length byte }
+                  encodedstr:=encodedstr+'['+tostr(tstringdef(def).len+1)+'C]';
+                else
+                  { While we could handle refcounted Pascal strings correctly
+                    when such methods are called from Pascal code, things would
+                    completely break down if they were called from Objective-C
+                    code/reflection since the necessary refcount helper calls
+                    would be missing on the caller side (unless we'd
+                    automatically generate wrappers).  }
+                  result:=false;
+              end;
+            end;
+          enumdef,
+          orddef :
+            begin
+              if bpacked and
+                 not is_void(def) then
+                encodedstr:=encodedstr+'b'+tostr(def.packedbitsize)
+              else
+                begin
+                  if is_void(def) then
+                    c:='v'
+                  { in gcc, sizeof(_Bool) = sizeof(char) }
+                  else if is_boolean(def) and
+                          (def.size=1) then
+                    c:='B'
+                  else
+                    begin
+                      case def.size of
+                        1:
+                          c:='c';
+                        2:
+                          c:='s';
+                        4:
+                          c:='i';
+                        8:
+                          c:='q';
+                        else
+                          internalerror(2009081502);
+                      end;
+                      if not is_signed(def) then
+                        c:=upcase(c);
+                    end;
+                  encodedstr:=encodedstr+c;
+                end;
+            end;
+          pointerdef :
+            begin
+              if is_pchar(def) then
+                encodedstr:=encodedstr+'*'
+              else if (def=objc_idtype) then
+                encodedstr:=encodedstr+'@'
+              else if (def=objc_seltype) then
+                encodedstr:=encodedstr+':'
+              else if (def=objc_metaclasstype) then
+                encodedstr:=encodedstr+'#'
+              else
+                begin
+                  encodedstr:=encodedstr+'^';
+                  newstate:=recordinfostate;
+                  if (recordinfostate<ris_dontprint) then
+                    newstate:=succ(newstate);
+                  if not addencodedtype(tpointerdef(def).pointeddef,newstate,false,encodedstr,founderror) then
+                    begin
+                      result:=false;
+                      { report the exact (nested) error defintion }
+                      exit;
+                    end;
+                end;
+            end;
+          floatdef :
+            begin
+              case tfloatdef(def).floattype of
+                s32real:
+                  c:='f';
+                s64real:
+                  c:='d';
+                else
+                  begin
+                    c:='!';
+                    result:=false;
+                  end;
+              end;
+              encodedstr:=encodedstr+c;
+            end;
+          filedef :
+            result:=false;
+          recorddef :
+            begin
+              if assigned(def.typesym) then
+                recname:=def.typename
+              else
+                recname:='?';
+
+              if (recordinfostate<>ris_dontprint) then
+                begin
+                  if not encoderecst(recname,tabstractrecordsymtable(trecorddef(def).symtable),encodedstr,founderror) then
+                    begin
+                      result:=false;
+                      { report the exact (nested) error defintion }
+                      exit;
+                    end
+                end
+              else
+                encodedstr:=encodedstr+'{'+recname+'}'
+            end;
+          variantdef :
+            begin
+              recdef:=trecorddef(search_system_type('TVARDATA').typedef);
+              if (recordinfostate<>ris_dontprint) then
+                begin
+                  if not encoderecst(recdef.typename,tabstractrecordsymtable(recdef.symtable),encodedstr,founderror) then
+                    begin
+                      result:=false;
+                      { report the exact (nested) error defintion }
+                      exit;
+                    end
+                end
+              else
+                encodedstr:=encodedstr+'{'+recdef.typename+'}';
+            end;
+          classrefdef :
+            begin
+              encodedstr:=encodedstr+'^';
+              newstate:=recordinfostate;
+              if (recordinfostate<>ris_dontprint) then
+                newstate:=succ(newstate);
+              if is_objcclassref(def) then
+                begin
+                  objdef:=tobjectdef(tclassrefdef(def).pointeddef);
+                  if (newstate<>ris_dontprint) then
+                    { anonymous (objc)class definitions do not exist }
+                    begin
+                      if not encoderecst(objdef.objextname^,tabstractrecordsymtable(objdef.symtable),encodedstr,founderror) then
+                        { The fields of an Objective-C class should always be
+                          encodeable.  }
+                        internalerror(2009081702);
+                    end
+                  else
+                    encodedstr:=encodedstr+'{'+objdef.objextname^+'}'
+                end
+              { Object Pascal classrefdefs point to a vmt, not really useful
+                to completely write those here.  I'm not even sure what the
+                Objective-C run time uses this information for, since in C you
+                can have forward struct definitions so not all structs passed
+                to functions can be written out here either -> treat
+                classrefdefs the same as such forward-defined structs.  }
+              else
+                begin
+                  if assigned(def.typesym) then
+                    recname:=def.typename
+                  else
+                    recname:='?';
+                  encodedstr:=encodedstr+'{'+recname;
+                  if (newstate<>ris_dontprint) then
+                    encodedstr:=encodedstr+'=';
+                  encodedstr:=encodedstr+'}'
+                end;
+            end;
+          setdef :
+            begin
+              addrpara:=paramanager.push_addr_param(vs_value,def,pocall_cdecl);
+              if not addrpara then
+                { encode as an record, they are always passed by value in C.  }
+                encodedstr:=encodedstr+'{?=';
+              { Encode the set itself as an array. Without an encompassing
+                record, these are always passed by reference in C.  }
+              encodedstr:=encodedstr+'['+tostr(def.size)+'C]';
+              if not addrpara then
+                encodedstr:=encodedstr+'}';
+            end;
+          formaldef :
+            begin
+              encodedstr:=encodedstr+'^v';
+            end;
+          arraydef :
+            begin
+              if is_array_of_const(def) then
+                { do nothing, varargs are ignored in signatures }
+              else if is_special_array(def) then
+                result:=false
+              else
+                begin
+                  len:=tarraydef(def).highrange-tarraydef(def).lowrange+1;
+                  if is_packed_array(def) then
+                    begin
+                      { convert from bits to bytes for bitpacked arrays }
+                      len:=(len+7) div 8;
+                      { and encode as plain array of bytes }
+                      encodedstr:=encodedstr+'['+tostr(len)+'C]';
+                    end
+                  else
+                    begin
+                      encodedstr:=encodedstr+'['+tostr(len);
+                      { Embedded structured types in the array are printed
+                        in full regardless of the current recordinfostate.  }
+                      if not addencodedtype(tarraydef(def).elementdef,ris_initial,false,encodedstr,founderror) then
+                        begin
+                          result:=false;
+                          { report the exact (nested) error defintion }
+                          exit;
+                        end;
+                      encodedstr:=encodedstr+']';
+                    end;
+                end;
+            end;
+          procvardef :
+            encodedstr:=encodedstr+'^?';
+          objectdef :
+            case tobjectdef(def).objecttype of
+              odt_class,
+              odt_object,
+              odt_cppclass:
+                begin
+                  newstate:=recordinfostate;
+                  { implicit pointer for classes }
+                  if (tobjectdef(def).objecttype=odt_class) then
+                    begin
+                      encodedstr:=encodedstr+'^';
+                      if (recordinfostate<ris_dontprint) then
+                        newstate:=succ(newstate);
+                    end;
+                  if newstate<>ris_dontprint then
+                    begin
+                      if not encoderecst(def.typename,tabstractrecordsymtable(tobjectdef(def).symtable),encodedstr,founderror) then
+                        begin
+                          result:=false;
+                          { report the exact (nested) error defintion }
+                          exit;
+                        end
+                    end
+                  else
+                    encodedstr:=encodedstr+'{'+def.typename+'}'
+                end;
+              odt_interfacecom,
+              odt_interfacecom_property,
+              odt_interfacecom_function,
+              odt_dispinterface:
+                result:=false;
+              odt_interfacecorba:
+                encodedstr:=encodedstr+'^{'+def.typename+'=}';
+              { In Objective-C, the actual types of class instances are
+                NSObject* etc, and those are encoded as "@". In FPC, to keep
+                the similarity with Delphi-style Object Pascal, the type is
+                NSObject and the pointer is implicit. Objective-C's "NSObject"
+                has "class of NSObject" as equivalent here.  }
+              odt_objcclass,
+              odt_objcprotocol:
+                encodedstr:=encodedstr+'@';
+              else
+                internalerror(2009081509);
+            end;
+          undefineddef,
+          errordef :
+            result:=false;
+          procdef :
+            { must be done via objcencodemethod() }
+            internalerror(2009081511);
+        else
+          internalerror(2009150812);
+        end;
+        if not result then
+          founderror:=def;
+      end;
+
+
+    function objctryencodetype(def: tdef; out encodedtype: ansistring; out founderror: tdef): boolean;
+      begin
+        result:=addencodedtype(def,ris_initial,false,encodedtype,founderror);
+      end;
+
+
+    function objcencodemethod(pd: tprocdef): ansistring;
+      var
+        parasize,
+        totalsize: aint;
+        vs: tparavarsym;
+        i: longint;
+        temp: ansistring;
+        founderror: tdef;
+      begin
+        result:='';
+        totalsize:=0;
+        for i:=0 to pd.parast.symlist.count-1 do
+          begin
+            vs:=tparavarsym(pd.parast.symlist[i]);
+            { addencodedtype always assumes a value/const parameter, so add
+              a pointer indirection for var/out parameters.  }
+            if not paramanager.push_addr_param(vs_value,vs.vardef,pocall_cdecl) and
+               (vs.varspez in [vs_var,vs_out]) then
+              result:=result+'^';
+            { Add the parameter type.  }
+            if not addencodedtype(vs.vardef,ris_initial,false,result,founderror) then
+              { should be checked earlier on }
+              internalerror(2009081701);
+            { And the total size of the parameters coming before this one
+              (i.e., the "offset" of this parameter).  }
+            result:=result+tostr(totalsize);
+            { Update the total parameter size }
+            parasize:=objcparasize(vs.vardef,vs.varspez);
+            inc(totalsize,parasize);
+          end;
+        { Prepend the total parameter size.  }
+        result:=tostr(totalsize)+result;
+        { And the type of the function result (void in case of a procedure).  }
+        temp:='';
+        if not addencodedtype(pd.returndef,ris_initial,false,temp,founderror) then
+          internalerror(2009081801);
+        result:=temp+result;
+      end;
+
+
+{******************************************************************
+                    ObjC type validity checking
+*******************************************************************}
+
+    function objcdochecktype(def: tdef; recordinfostate: trecordinfostate; out founderror: tdef): boolean; forward;
+
+    function checkrecsttype(recst: tabstractrecordsymtable; recordinfostate: trecordinfostate; out founderror: tdef): boolean;
+      var
+        i: longint;
+        field: tfieldvarsym;
+        newstate: trecordinfostate;
+      begin
+        result:=false;
+        newstate:=recordinfostate;
+        { Although we never have to print the type info for nested
+          records, check them anyway in case we're not after a pointer
+          since if such records contain refcounted types then they
+          can cause just as much trouble as if they were a simple
+          refcounted field.  }
+        if (newstate=ris_afterpointer) then
+          newstate:=ris_dontprint;
+        for i:=0 to recst.symlist.count-1 do
+          begin
+            if (tsym(recst.symlist[i]).typ<>fieldvarsym) then
+              continue;
+
+            field:=tfieldvarsym(recst.symlist[i]);
+            if not objcdochecktype(field.vardef,newstate,founderror) then
+              exit;
+          end;
+        result:=true
+      end;
+
+
+    function objcdochecktype(def: tdef; recordinfostate: trecordinfostate; out founderror: tdef): boolean;
+      var
+        recdef: trecorddef;
+        objdef: tobjectdef;
+        newstate: trecordinfostate;
+      begin
+        result:=true;
+        case def.typ of
+          stringdef :
+            begin
+              case tstringdef(def).stringtype of
+                st_shortstring:
+                  ;
+                else
+                  { While we could handle refcounted Pascal strings correctly
+                    when such methods are called from Pascal code, things would
+                    completely break down if they were called from Objective-C
+                    code/reflection since the necessary refcount helper calls
+                    would be missing on the caller side (unless we'd
+                    automatically generate wrappers).  }
+                  result:=false;
+              end;
+            end;
+          enumdef,
+          orddef :
+            ;
+          pointerdef :
+            begin
+              newstate:=recordinfostate;
+              if (recordinfostate<ris_dontprint) then
+                newstate:=succ(newstate);
+              if not objcdochecktype(tpointerdef(def).pointeddef,newstate,founderror) then
+                begin
+                  result:=false;
+                  { report the exact (nested) error defintion }
+                  exit;
+                end;
+            end;
+          floatdef :
+            begin
+              case tfloatdef(def).floattype of
+                s32real,
+                s64real:
+                  ;
+                else
+                  result:=false;
+              end;
+            end;
+          filedef :
+            result:=false;
+          recorddef :
+            begin
+              if (recordinfostate<>ris_dontprint) then
+                begin
+                  if not checkrecsttype(tabstractrecordsymtable(trecorddef(def).symtable),recordinfostate,founderror) then
+                    begin
+                      result:=false;
+                      { report the exact (nested) error defintion }
+                      exit;
+                    end
+                end
+            end;
+          variantdef :
+            begin
+              recdef:=trecorddef(search_system_type('TVARDATA').typedef);
+              if (recordinfostate<>ris_dontprint) then
+                begin
+                  if not checkrecsttype(tabstractrecordsymtable(recdef.symtable),recordinfostate,founderror) then
+                    begin
+                      result:=false;
+                      { report the exact (nested) error defintion }
+                      exit;
+                    end
+                end;
+            end;
+          classrefdef:
+            begin
+              if is_objcclassref(def) then
+                begin
+                  objdef:=tobjectdef(tclassrefdef(def).pointeddef);
+                  newstate:=recordinfostate;
+                  if (recordinfostate<ris_dontprint) then
+                    newstate:=succ(newstate);
+                  if (newstate<>ris_dontprint) then
+                    begin
+                      if not checkrecsttype(tabstractrecordsymtable(objdef.symtable),recordinfostate,founderror) then
+                        begin
+                          result:=false;
+                          { report the exact (nested) error defintion }
+                          exit;
+                        end
+                    end
+                end
+            end;
+          setdef,
+          formaldef :
+            ;
+          arraydef :
+            begin
+              if is_array_of_const(def) then
+                { ok, varargs are ignored in signatures }
+              else if is_special_array(def) then
+                result:=false
+              else
+                begin
+                  if not is_packed_array(def) then
+                    begin
+                      if not objcdochecktype(tarraydef(def).elementdef,ris_initial,founderror) then
+                        begin
+                          result:=false;
+                          { report the exact (nested) error defintion }
+                          exit;
+                        end;
+                    end;
+                end;
+            end;
+          procvardef :
+            ;
+          objectdef :
+            case tobjectdef(def).objecttype of
+              odt_class,
+              odt_object,
+              odt_cppclass:
+                begin
+                  newstate:=recordinfostate;
+                  { implicit pointer for classes }
+                  if (tobjectdef(def).objecttype=odt_class) then
+                    begin
+                      if (recordinfostate<ris_dontprint) then
+                        newstate:=succ(newstate);
+                    end;
+                  if newstate<>ris_dontprint then
+                    begin
+                      if not checkrecsttype(tabstractrecordsymtable(tobjectdef(def).symtable),newstate,founderror) then
+                        begin
+                          result:=false;
+                          { report the exact (nested) error defintion }
+                          exit;
+                        end
+                    end
+                end;
+              odt_interfacecom,
+              odt_interfacecom_property,
+              odt_interfacecom_function,
+              odt_dispinterface:
+                result:=false;
+              odt_interfacecorba,
+              odt_objcclass,
+              odt_objcprotocol:
+                ;
+              else
+                internalerror(2009081709);
+            end;
+          undefineddef,
+          errordef :
+            result:=false;
+          procdef :
+            result:=false;
+        else
+          internalerror(2009170812);
+        end;
+        if not result then
+          founderror:=def;
+      end;
+
+
+    function objcchecktype(def: tdef; out founderror: tdef): boolean;
+      begin
+        result:=objcdochecktype(def,ris_initial,founderror);
+      end;
+
 
 end.

compiler/pexpr.pas

@@ -428,31 +428,41 @@ implementation
                end;
             end;
 
-          in_typeinfo_x :
+          in_typeinfo_x,
+          in_objc_encode_x :
             begin
-              consume(_LKLAMMER);
-              in_args:=true;
-              p1:=comp_expr(true);
-              { When reading a class type it is parsed as loadvmtaddrn,
-                typeinfo only needs the type so we remove the loadvmtaddrn }
-              if p1.nodetype=loadvmtaddrn then
+              if (l=in_typeinfo_x) or
+                 (m_objectivec1 in current_settings.modeswitches) then
                 begin
-                  p2:=tloadvmtaddrnode(p1).left;
-                  tloadvmtaddrnode(p1).left:=nil;
-                  p1.free;
-                  p1:=p2;
-                end;
-              if p1.nodetype=typen then
-                ttypenode(p1).allowed:=true;
-{              else
+                  consume(_LKLAMMER);
+                  in_args:=true;
+                  p1:=comp_expr(true);
+                  { When reading a class type it is parsed as loadvmtaddrn,
+                    typeinfo only needs the type so we remove the loadvmtaddrn }
+                  if p1.nodetype=loadvmtaddrn then
+                    begin
+                      p2:=tloadvmtaddrnode(p1).left;
+                      tloadvmtaddrnode(p1).left:=nil;
+                      p1.free;
+                      p1:=p2;
+                    end;
+                  if p1.nodetype=typen then
+                    ttypenode(p1).allowed:=true;
+    {              else
+                    begin
+                       p1.destroy;
+                       p1:=cerrornode.create;
+                       Message(parser_e_illegal_parameter_list);
+                    end;}
+                  consume(_RKLAMMER);
+                  p2:=geninlinenode(l,false,p1);
+                  statement_syssym:=p2;
+                end
+              else
                 begin
-                   p1.destroy;
-                   p1:=cerrornode.create;
-                   Message(parser_e_illegal_parameter_list);
-                end;}
-              consume(_RKLAMMER);
-              p2:=geninlinenode(in_typeinfo_x,false,p1);
-              statement_syssym:=p2;
+                  Message1(sym_e_id_not_found, orgpattern);
+                  statement_syssym:=cerrornode.create;
+                end;
             end;
 
 {$ifdef SUPPORT_UNALIGNED}

compiler/psystem.pas

@@ -103,6 +103,7 @@ implementation
         systemunit.insert(tsyssym.create('Unaligned',in_unaligned_x));
 {$endif SUPPORT_UNALIGNED}
         systemunit.insert(tsyssym.create('ObjCSelector',in_objc_selector_x)); { objc only }
+        systemunit.insert(tsyssym.create('ObjCEncode',in_objc_encode_x)); { objc only }
       end;
 
 

rtl/inc/innr.inc

@@ -79,6 +79,7 @@ const
    fpc_in_rol_x_x           = 68;
    fpc_objc_selector_x      = 69;
    fpc_objc_protocol_x      = 70;
+   fpc_objc_encode_x        = 71;
 
 { Internal constant functions }
    fpc_in_const_sqr        = 100;

tests/test/tobjc11.pp

@@ -0,0 +1,138 @@
+{ %target=darwin }
+{ %cpu=powerpc,i386 }
+
+{$mode objfpc}
+{$modeswitch objectivec1}
+{$packenum 1}
+{$packset 1}
+
+procedure check(const name,a,b: string);
+begin
+  if (a<>b) then
+    begin
+      writeln('For ',name,' got: "',a,'", expected: "',b,'"');
+      halt(1);
+    end;
+end;
+
+procedure checksimpletypes;
+type
+  tenum = (ea,eb,ec);
+  tprocedure = procedure;
+var
+  p: pointer;
+begin
+  check('char',objcencode(char),'C');
+  check('widechar',objcencode(widechar),'S');
+  check('void',objcencode(p^),'v');
+
+  check('tenum',objcencode(tenum),'C');
+
+  check('shortint',objcencode(shortint),'c');
+  check('byte',objcencode(byte),'C');
+  check('smallint',objcencode(smallint),'s');
+  check('word',objcencode(word),'S');
+  check('longint',objcencode(longint),'i');
+  check('cardinal',objcencode(cardinal),'I');
+  check('int64',objcencode(int64),'q');
+  check('qword',objcencode(qword),'Q');
+  check('shortstring',objcencode(shortstring),'[256C]');
+
+  check('pointer',objcencode(pointer),'^v');
+  
+  check('single',objcencode(single),'f');
+  check('double',objcencode(double),'d');
+  
+  check('tprocedure',objcencode(tprocedure),'^?');
+  
+  check('id',objcencode(id),'@');
+  check('NSObject',objcencode(NSObject),'@');
+  check('pobjc_class',objcencode(pobjc_class),'#');
+  check('selector',objcencode(objcselector('alloc')),':');
+end;
+
+
+procedure checkarrays;
+type
+  ta = array[5..6] of byte;
+  tb = array[1..10] of pointer;
+  tc = array[0..3] of tb;
+begin
+  check('ta',objcencode(ta),'[2C]');
+  check('tb',objcencode(tb),'[10^v]');
+  check('tc',objcencode(tc),'[4[10^v]]');
+end;
+
+
+procedure checkrecords;
+type
+  tra=record
+    a,b: longint;
+  end;
+  TStrippedVarRec = record
+     case VType : shortint of
+       vtInteger    : (VInteger: Longint);
+       vtBoolean    : (VBoolean: Boolean);
+       vtChar       : (VChar: Char);
+       vtWideChar   : (VWideChar: WideChar);
+       vtString     : (VString: PShortString);
+       vtPointer    : (VPointer: Pointer);
+       vtPChar      : (VPChar: PChar);
+       vtObject     : (VObject: TObject);
+       vtClass      : (VClass: TClass);
+       vtPWideChar  : (VPWideChar: PWideChar);
+       vtAnsiString : (VAnsiString: Pointer);
+       vtInterface  : (VInterface: Pointer);
+       vtWideString : (VWideString: Pointer);
+       vtInt64      : (VInt64: PInt64);
+       vtQWord      : (VQWord: PQWord);
+   end;
+ tnestedvarrechelper1 = record
+   case byte of
+     1: (f: single);
+     2: (d: double);
+ end;
+ tnestedvarrechelper2 = record
+   x: longint;
+   y: shortint;
+ end;
+ tnestedvarrec = record
+   a: longint;
+   p: ^tra;
+   case byte of
+     1: (t: tnestedvarrechelper1);
+     2: (t2: tnestedvarrechelper2);
+     3: (bb: longint);
+ end;
+begin
+  check('tra',objcencode(tra),'{tra=ii}');
+  check('TStrippedVarRec',objcencode(TStrippedVarRec),'{TStrippedVarRec=c(?={?=i}{?=B}{?=C}{?=S}{?=^[256C]}{?=^v}{?=*}{?=^{TObject}}{?=^{TClass}}{?=^S}{?=^v}{?=^v}{?=^v}{?=^q}{?=^Q})}');
+  check('TObject',objcencode(TObject),'^{TObject=^v}');
+  check('tnestedvarrec',objcencode(tnestedvarrec),'{tnestedvarrec=i^{tra}(?={?={tnestedvarrechelper1=(?={?=f}{?=d})}}{?={tnestedvarrechelper2=ic}}{?=i})}');
+end;
+
+procedure checksets;
+type
+  tset1 = set of 0..4;
+  tset2 = set of 0..31;
+  tset3 = set of 0..128;
+begin
+  check('tset1',objcencode(tset1),'{?=[1C]}');
+  check('tset2',objcencode(tset2),'{?=[4C]}');
+{$ifdef cpui386}
+  { for some mysterious reason, sets are always passed by value for cdecl on
+    i386 }
+  check('tset3',objcencode(tset3),'{?=[17C]}');
+{$else cpui386}
+  check('tset3',objcencode(tset3),'[17C]');
+{$endif cpui386}
+end;
+
+
+
+begin
+  checksimpletypes;
+  checkarrays;
+  checkrecords;
+  checksets;
+end.