Merged revisions 512,531 via svnmerge from

/trunk

git-svn-id: branches/fixes_2_0@717 -

.gitattributes

@@ -4271,6 +4271,10 @@ tests/tbf/tb0170.pp svneol=native#text/plain
 tests/tbf/tb0171.pp svneol=native#text/plain
 tests/tbf/tb0172.pp svneol=native#text/plain
 tests/tbf/tb0173.pp svneol=native#text/plain
+tests/tbf/tb0174a.pp svneol=native#text/plain
+tests/tbf/tb0174b.pp svneol=native#text/plain
+tests/tbf/tb0174c.pp svneol=native#text/plain
+tests/tbf/tb0174d.pp svneol=native#text/plain
 tests/tbf/tb0175.pp svneol=native#text/plain
 tests/tbf/ub0115.pp svneol=native#text/plain
 tests/tbf/ub0149.pp svneol=native#text/plain
@@ -4758,6 +4762,7 @@ tests/tbs/tb0489.pp svneol=native#text/plain
 tests/tbs/tb0490.pp svneol=native#text/plain
 tests/tbs/tb0491.pp svneol=native#text/plain
 tests/tbs/tb0492.pp svneol=native#text/plain
+tests/tbs/tb0493.pp svneol=native#text/plain
 tests/tbs/ub0060.pp svneol=native#text/plain
 tests/tbs/ub0069.pp svneol=native#text/plain
 tests/tbs/ub0119.pp svneol=native#text/plain

compiler/msg/errore.msg

@@ -1010,6 +1010,8 @@ parser_e_no_static_method_in_interfaces=03212_E_Class and static methods can't b
 % because all methods of an interfaces must be public.
 parser_e_arithmetic_operation_overflow=03213_E_Overflow in arithmetic operation
 % An operation on two integers values produced an overflow
+parser_e_protected_or_private_expected=03214_E_Protected or private expected
+% \var{strict} can be only used together with \var{protected} or \var{private}.
 % \end{description}
 #
 # Type Checking

compiler/msgidx.inc

@@ -283,6 +283,7 @@ const
   parser_w_implicit_uses_of_variants_unit=03211;
   parser_e_no_static_method_in_interfaces=03212;
   parser_e_arithmetic_operation_overflow=03213;
+  parser_e_protected_or_private_expected=03214;
   type_e_mismatch=04000;
   type_e_incompatible_types=04001;
   type_e_not_equal_types=04002;
@@ -656,9 +657,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 38588;
+  MsgTxtSize = 38626;
 
   MsgIdxMax : array[1..20] of longint=(
-    19,72,214,59,59,46,100,20,35,60,
+    19,72,215,59,59,46,100,20,35,60,
     40,1,1,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -316,296 +316,298 @@ const msgtxt : array[0..000160,1..240] of char=(
   '03211_W_Implicit uses of Variants unit'#000+
   '03212_E_Class and static methods can'#039't be used in INTERFACES'#000+
   '03213_E_Overflow in arithmetic operation'#000+
+  '03214_E_Protected or private expected'#000+
   '04000_E_Type mismatch'#000+
-  '04001_E_Incompatible types: got "$1" expected "$2"'#000+
-  '04002_E_','Type mismatch between "$1" and "$2"'#000+
+  '04001_E_Incompatible ','types: got "$1" expected "$2"'#000+
+  '04002_E_Type mismatch between "$1" and "$2"'#000+
   '04003_E_Type identifier expected'#000+
   '04004_E_Variable identifier expected'#000+
   '04005_E_Integer expression expected, but got "$1"'#000+
-  '04006_E_Boolean expression expected, but got "$1"'#000+
-  '04007_E_Ordinal expression expecte','d'#000+
+  '04006_E_Boolean expression expected, but got "','$1"'#000+
+  '04007_E_Ordinal expression expected'#000+
   '04008_E_pointer type expected, but got "$1"'#000+
   '04009_E_class type expected, but got "$1"'#000+
   '04011_E_Can'#039't evaluate constant expression'#000+
   '04012_E_Set elements are not compatible'#000+
-  '04013_E_Operation not implemented for sets'#000+
-  '04014_W_Automatic type con','version from floating type to COMP which i'+
-  's an integer type'#000+
+  '04013_E_Operation not implement','ed for sets'#000+
+  '04014_W_Automatic type conversion from floating type to COMP which is '+
+  'an integer type'#000+
   '04015_H_use DIV instead to get an integer result'#000+
   '04016_E_string types doesn'#039't match, because of $V+ mode'#000+
-  '04017_E_succ or pred on enums with assignments not possible'#000+
-  '04018_E_Can'#039't r','ead or write variables of this type'#000+
+  '04017_E_succ or pred on enums with as','signments not possible'#000+
+  '04018_E_Can'#039't read or write variables of this type'#000+
   '04019_E_Can'#039't use readln or writeln on typed file'#000+
   '04020_E_Can'#039't use read or write on untyped file.'#000+
   '04021_E_Type conflict between set elements'#000+
-  '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000,
+  '04022_W_lo/hi(dword/qwor','d) returns the upper/lower word/dword'#000+
   '04023_E_Integer or real expression expected'#000+
   '04024_E_Wrong type "$1" in array constructor'#000+
   '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+
-  '04026_E_Method (variable) and Procedure (variable) are not compatible'#000+
-  '04027_E_Illegal',' constant passed to internal math function'#000+
+  '04026_E_Method (variable) and Procedure (variab','le) are not compatibl'+
+  'e'#000+
+  '04027_E_Illegal constant passed to internal math function'#000+
   '04028_E_Can'#039't get the address of constants'#000+
   '04029_E_Argument can'#039't be assigned to'#000+
   '04030_E_Can'#039't assign local procedure/function to procedure variabl'+
   'e'#000+
-  '04031_E_Can'#039't assign values to an address'#000+
-  '04032_','E_Can'#039't assign values to const variable'#000+
+  '04031_E_Ca','n'#039't assign values to an address'#000+
+  '04032_E_Can'#039't assign values to const variable'#000+
   '04033_E_Array type required'#000+
   '04034_E_interface type expected, but got "$1"'#000+
   '04035_W_Mixing signed expressions and longwords gives a 64bit result'#000+
-  '04036_W_Mixing signed expressions and cardinals here may ','cause a ran'+
+  '04036_W_Mixing sign','ed expressions and cardinals here may cause a ran'+
   'ge check error'#000+
   '04037_E_Typecast has different size ($1 -> $2) in assignment'#000+
   '04038_E_enums with assignments can'#039't be used as array index'#000+
-  '04039_E_Class or Object types "$1" and "$2" are not related'#000+
-  '04040_W_Class types "$1" and "$2"',' are not related'#000+
+  '04039_E_Class or Object types "$1" and "$2" are not rel','ated'#000+
+  '04040_W_Class types "$1" and "$2" are not related'#000+
   '04041_E_Class or interface type expected, but got "$1"'#000+
   '04042_E_Type "$1" is not completely defined'#000+
   '04043_W_String literal has more characters than short string length'#000+
-  '04044_W_Comparison is always false due to range of value','s'#000+
+  '04044_W_Comparison',' is always false due to range of values'#000+
   '04045_W_Comparison is always true due to range of values'#000+
   '04046_W_Constructing a class "$1" with abstract methods'#000+
   '04047_H_The left operand of the IN operator should be byte sized'#000+
-  '04048_W_Type size mismatch, possible loss of data / range ch','eck erro'+
+  '04048_W_Type size mism','atch, possible loss of data / range check erro'+
   'r'#000+
   '04049_H_Type size mismatch, possible loss of data / range check error'#000+
   '04050_E_The address of an abstract method can'#039't be taken'#000+
   '04051_E_The operator is not applicable for the operand type'#000+
-  '04052_E_Constant Expression expected'#000+
-  '04053_','E_Operation "$1" not supported for types "$2" and "$3"'#000+
+  '04052','_E_Constant Expression expected'#000+
+  '04053_E_Operation "$1" not supported for types "$2" and "$3"'#000+
   '04054_E_Illegal type conversion: "$1" to "$2"'#000+
   '04055_H_Conversion between ordinals and pointers is not portable'#000+
-  '04056_W_Conversion between ordinals and pointers is not portable'#000+
-  '04057_E_C','an'#039't determine which overloaded function to call'#000+
+  '04056_W_Conversion between ordinals ','and pointers is not portable'#000+
+  '04057_E_Can'#039't determine which overloaded function to call'#000+
   '04058_E_Illegal counter variable'#000+
   '05000_E_Identifier not found "$1"'#000+
   '05001_F_Internal Error in SymTableStack()'#000+
   '05002_E_Duplicate identifier "$1"'#000+
-  '05003_H_Identifier already defined in $1 at line',' $2'#000+
+  '05003_H_Id','entifier 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 methods or outside'+
-  ' methods'#000+
-  '05012_F_r','ecord or class type expected'#000+
+  '05010_E_Only static variables can be used in stati','c methods or outsi'+
+  'de 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+
   '05015_E_Label used but not defined "$1"'#000+
-  '05016_E_Illegal label declaration'#000+
-  '05017_E_GOTO and LABEL are',' not supported (use switch -Sg)'#000+
+  '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 resolved "$1"'#000+
-  '05023_H_Unit "$1" not',' used in $2'#000+
+  '05022_E_Forward class definition n','ot 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+
   '05027_N_Local variable "$1" is assigned but never used'#000+
-  '05028_H_Local $1 "$2" is not used'#000+
-  '05029_N_Privat','e field "$1.$2" is never used'#000+
+  '05028_H_Lo','cal $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+
   '05032_E_Set type expected'#000+
-  '05033_W_Function result does not seem to be set'#000+
-  '05034_W_Type "$1" is not aligned corr','ectly in current record for C'#000+
+  '05033_W_Function result does not seem to be set',#000+
+  '05034_W_Type "$1" is not aligned correctly in current record for C'#000+
   '05035_E_Unknown record field identifier "$1"'#000+
   '05036_W_Local variable "$1" does not seem to be initialized'#000+
   '05037_W_Variable "$1" does not seem to be initialized'#000+
-  '05038_E_identifier idents no member "$1"'#000+
-  '05039_H_Fo','und declaration: $1'#000+
+  '05038_E_ident','ifier 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+
   '05044_W_Symbol "$1" is not portable'#000+
-  '05055_W_Symbol "$1" is not implemented'#000+
-  '05056_E_Can'#039't',' create unique type from this type'#000+
+  '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+
   '06009_E_Parameter list size exceeds 65535 bytes'#000+
-  '06012_E_File types must be var parameters'#000+
-  '0','6013_E_The use of a far pointer isn'#039't allowed there'#000+
+  '06012','_E_File types must be var parameters'#000+
+  '06013_E_The use of a far pointer isn'#039't allowed there'#000+
   '06015_E_EXPORT declared functions can'#039't be called'#000+
   '06016_W_Possible illegal call of constructor or destructor'#000+
   '06017_N_Inefficient code'#000+
-  '06018_W_unreachable code'#000+
-  '06020_E_Abstract methods can'#039,'t be called directly'#000+
+  '06018_W_unreacha','ble code'#000+
+  '06020_E_Abstract methods can'#039't be called directly'#000+
   '06027_DL_Register $1 weight $2 $3'#000+
   '06029_DL_Stack frame is omitted'#000+
   '06031_E_Object or class methods can'#039't be inline.'#000+
   '06032_E_Procvar calls cannot be inline.'#000+
-  '06033_E_No code for inline procedure stored'#000+
-  '06035_E_Element zero',' of an ansi/wide- or longstring can'#039't be acc'+
-  'essed, use (set)length instead'#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'wi'+
   'th'#039' clause'#000+
-  '06038_E_Cannot call message handler methods directly'#000+
-  '06039_E_Jump in or outside of an ex','ception block'#000+
+  '06038_E_Cannot call message handler methods direct','ly'#000+
+  '06039_E_Jump in or outside of an exception block'#000+
   '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
   '06041_W_Parameters size exceeds 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 supporte','d limit'#000+
+  '06043_E','_Local variables size exceeds supported limit'#000+
   '06044_E_BREAK not allowed'#000+
   '06045_E_CONTINUE not allowed'#000+
   '07000_DL_Starting $1 styled assembler parsing'#000+
   '07001_DL_Finished $1 styled assembler parsing'#000+
   '07002_E_Non-label pattern contains @'#000+
-  '07004_E_Error building record offset'#000+
-  '07005_E_OFF','SET used without identifier'#000+
+  '07004_E_Er','ror building record offset'#000+
+  '07005_E_OFFSET used without identifier'#000+
   '07006_E_TYPE used without identifier'#000+
   '07007_E_Cannot use local variable or parameters here'#000+
   '07008_E_need to use OFFSET here'#000+
   '07009_E_need to use $ here'#000+
-  '07010_E_Cannot use multiple relocatable symbols'#000+
-  '07011_E_Relocat','able symbol can only be added'#000+
+  '07010_E_Cannot use multip','le relocatable symbols'#000+
+  '07011_E_Relocatable symbol can only be added'#000+
   '07012_E_Invalid constant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
   '07014_E_Invalid reference syntax'#000+
   '07015_E_You can not reach $1 from that code'#000+
-  '07016_E_Local symbols/labels aren'#039't allowed as referenc','es'#000+
+  '07016_E_Local sym','bols/labels aren'#039't allowed as references'#000+
   '07017_E_Invalid base and index register usage'#000+
   '07018_W_Possible error in object field handling'#000+
   '07019_E_Wrong scale factor specified'#000+
   '07020_E_Multiple index register usage'#000+
   '07021_E_Invalid operand type'#000+
-  '07022_E_Invalid string as opcode operan','d: $1'#000+
+  '0','7022_E_Invalid string as opcode operand: $1'#000+
   '07023_W_@CODE and @DATA not supported'#000+
   '07024_E_Null label references are not allowed'#000+
   '07025_E_Divide by zero in asm evaluator'#000+
   '07026_E_Illegal expression'#000+
   '07027_E_escape sequence ignored: $1'#000+
-  '07028_E_Invalid symbol reference'#000+
-  '07029_W_Fwait ','can cause emulation problems with emu387'#000+
+  '07028_E_I','nvalid symbol reference'#000+
+  '07029_W_Fwait can cause emulation problems with emu387'#000+
   '07030_W_$1 without operand translated into $1P'#000+
   '07031_W_ENTER instruction is not supported by Linux kernel'#000+
   '07032_W_Calling an overload function in assembler'#000+
-  '07033_E_Unsupported symbol type for operand',#000+
+  '07033','_E_Unsupported symbol type for operand'#000+
   '07034_E_Constant value out of bounds'#000+
   '07035_E_Error converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
   '07037_E_Error converting binary $1'#000+
   '07038_E_Error converting hexadecimal $1'#000+
-  '07039_H_$1 translated to $2'#000+
-  '07040_W_$1 is associated to a','n overloaded function'#000+
+  '07039_H_$1 translat','ed to $2'#000+
+  '07040_W_$1 is associated to an overloaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
   '07043_W_Procedures can'#039't return any value in asm code'#000+
   '07044_E_SEG not supported'#000+
-  '07045_E_Size suffix and destination or sourc','e size do not match'#000+
+  '07045_','E_Size suffix and destination or source size do not match'#000+
   '07046_W_Size suffix and destination or source size do not match'#000+
   '07047_E_Assembler syntax error'#000+
   '07048_E_Invalid combination of opcode and operands'#000+
-  '07049_E_Assembler syntax error in operand'#000+
-  '07050_E_Assembler syntax error i','n constant'#000+
+  '07049_E_Assembler syntax error in op','erand'#000+
+  '07050_E_Assembler syntax error in constant'#000+
   '07051_E_Invalid String expression'#000+
   '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
   '07053_E_Unrecognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#000+
-  '07055_E_Invalid combination of prefix and opcode: $1'#000+
-  '07056_E','_Invalid combination of override and opcode: $1'#000+
+  '07055_E_Invalid combin','ation of prefix and opcode: $1'#000+
+  '07056_E_Invalid combination of override and opcode: $1'#000+
   '07057_E_Too many operands on line'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
   '07061_E_Undefined local symbol $1'#000+
-  '07062_E_Unknown label identifier $1'#000+
-  '07063_E_Inval','id register name'#000+
+  '07062_E_Unk','nown label identifier $1'#000+
+  '07063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
   '07066_W_Modulo not supported'#000+
   '07067_E_Invalid floating point constant $1'#000+
   '07068_E_Invalid floating point expression'#000+
-  '07069_E_Wrong symbol type'#000+
-  '07070_E_Cannot index a local var or pa','rameter with a register'#000+
+  '07069_E_Wrong symbol type'#000,
+  '07070_E_Cannot index a local var or parameter with a register'#000+
   '07071_E_Invalid segment override expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
   '07074_No type of variable specified'#000+
-  '07075_E_assembler code not returned to text section'#000+
-  '070','76_E_Not a directive or local symbol $1'#000+
+  '07075_E_assembler',' code not returned to text section'#000+
+  '07076_E_Not a directive or local symbol $1'#000+
   '07077_E_Using a defined name as a local label'#000+
   '07078_E_Dollar token is used without an identifier'#000+
   '07079_W_32bit constant created for address'#000+
-  '07080_N_.align is target specific, use .balign or .p2align'#000+
-  '0','7081_E_Can'#039't access fields directly for parameters'#000+
+  '07080_N_.align is targ','et specific, use .balign or .p2align'#000+
+  '07081_E_Can'#039't access fields directly for parameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
   '07083_E_No size specified and unable to determine the size of the oper'+
   'ands'#000+
-  '07084_E_Cannot use RESULT in this function'#000+
-  '07086_W_"$1" wi','thout operand translated into "$1 %st,%st(1)"'#000+
+  '07084_E_Cannot use R','ESULT in this function'#000+
+  '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
   '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
   '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
   '07089_E_Char < not allowed here'#000+
-  '07090_E_Char > not allowed here'#000+
-  '07093_W_ALIGN not supporte','d'#000+
+  '07090_E_Char > not a','llowed here'#000+
+  '07093_W_ALIGN not supported'#000+
   '07094_E_Inc and Dec cannot be together'#000+
   '07095_E_Invalid reglist for movem'#000+
   '07096_E_Reglist invalid for opcode'#000+
   '07097_E_Higher cpu mode required ($1)'#000+
-  '07098_W_No size specified and unable to determine the size of the oper'+
-  'ands, using DWORD as d','efault'#000+
+  '07098_W_No size specified 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+
   '08000_F_Too many assembler files'#000+
   '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
-  '08003_F_Direct not support for binary writers'#000+
-  '08004_E_Allocating',' of data is only allowed in bss section'#000+
+  '08003_F_Direct not support',' for binary writers'#000+
+  '08004_E_Allocating of data is only allowed in bss section'#000+
   '08005_F_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
   '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
-  '08008_E_Asm: 16 Bit references not supported'#000+
-  '08009_E_Asm: Invalid effec','tive address'#000+
+  '08008_E_Asm: 16 Bit references no','t supported'#000+
+  '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
   '08012_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
-  '08014_E_Asm: Comp type not supported for this target'#000+
-  '08015_E_Asm: E','xtended type not supported for this target'#000+
+  '08014_E_Asm: Comp type not su','pported for this target'#000+
+  '08015_E_Asm: Extended type not supported for this target'#000+
   '08016_E_Asm: Duplicate label $1'#000+
   '08017_E_Asm: Redefined label $1'#000+
   '08018_E_Asm: First defined here'#000+
   '08019_E_Asm: Invalid register $1'#000+
-  '09000_W_Source operating system redefined'#000+
-  '09001_I_Assembling (pipe) ','$1'#000+
+  '09000_W_Source operating syste','m redefined'#000+
+  '09001_I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assember 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+
+  '09006_T_Using assemb','ler: $1'#000+
+  '09007_E_Error while assembling exitcode $1'#000+
   '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
   'ssembling'#000+
   '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+
+  '090','12_W_Library $1 not found, Linking may fail !'#000+
   '09013_E_Error while linking'#000+
   '09014_E_Can'#039't call the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
   '09016_E_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
-  '09018_E_Creation of Executables not supported',#000+
+  '09018_E','_Creation of Executables not supported'#000+
   '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
   '09021_E_resource compiler not found, switching to external mode'#000+
   '09022_I_Compiling resource $1'#000+
-  '09023_T_unit $1 can'#039't be statically linked, switching to sma','rt l'+
+  '09023_T_unit $1 can'#039't ','be statically 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 link','ed'#000+
+  '09027_E_','unit $1 can'#039't be shared or static linked'#000+
   '09028_F_Can'#039't post process executable $1'#000+
   '09029_F_Can'#039't open executable $1'#000+
   '09030_X_Size of Code: $1 bytes'#000+
   '09031_X_Size of initialized data: $1 bytes'#000+
   '09032_X_Size of uninitialized data: $1 bytes'#000+
-  '09033_X_Stack space reserved: $1 bytes'#000+
-  '09034','_X_Stack space commited: $1 bytes'#000+
+  '09033_','X_Stack space reserved: $1 bytes'#000+
+  '09034_X_Stack space commited: $1 bytes'#000+
   '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
@@ -613,98 +615,97 @@ const msgtxt : array[0..000160,1..240] of char=(
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
   '10006_U_PPU File too short'#000+
-  '10007_U_PPU Invalid Header (no PPU at the begin)'#000,
+  '10007_U_PPU',' Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
   '10009_U_PPU is compiled for another processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
-  '10014_F_Error reading PPU-File'#000+
-  '10015_F_unexpecte','d end of PPU-File'#000+
+  '10014_F_Er','ror reading PPU-File'#000+
+  '10015_F_unexpected end of PPU-File'#000+
   '10016_F_Invalid PPU-File entry: $1'#000+
   '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
   '10020_F_Circular unit reference between $1 and $2'#000+
-  '10021_F_Can'#039't compile unit $1, no sources available'#000+
-  '10','022_F_Can'#039't find unit $1'#000+
+  '10021_F_Can'#039't co','mpile unit $1, no sources available'#000+
+  '10022_F_Can'#039't find unit $1'#000+
   '10023_W_Unit $1 was not found but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
   '10025_W_Compiling the system unit requires the -Us switch'#000+
-  '10026_F_There were $1 errors compiling module, stopping'#000+
-  '10027_U_Load from $','1 ($2) unit $3'#000+
+  '10026_F_There were $1 errors compilin','g module, stopping'#000+
+  '10027_U_Load from $1 ($2) unit $3'#000+
   '10028_U_Recompiling $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
-  '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '10032_U_Recompili','ng unit, obj and asm are older than ppufile'#000+
+  '10031_U_Recompiling unit, shared lib i','s 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+
   '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
-  '10037_U_PPU Check file $1 time $2'#000+
-  '10040_W_Can'#039't',' recompile unit $1, but found modifed include files'+
-  #000+
+  '10037_U_P','PU Check file $1 time $2'#000+
+  '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
   '10041_H_File $1 is newer than Release PPU file $2'#000+
   '10042_U_Using a unit which was not compiled with correct FPU mode'#000+
-  '10043_U_Loading interface units from $1'#000+
-  '10044_U_Loading implementation u','nits from $1'#000+
+  '10043_U_Loading interface units fr','om $1'#000+
+  '10044_U_Loading implementation units from $1'#000+
   '10045_U_Interface CRC changed for unit $1'#000+
   '10046_U_Implementation CRC changed for unit $1'#000+
   '10047_U_Finished compiling 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 secon','d compile: $1'#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+
   '10053_U_Previous state of $1: $2'#000+
   '10054_U_Already compiling $1, setting second compile'#000+
   '10055_U_Loading unit $1'#000+
-  '10056_U_Finished loading unit $1'#000+
-  '10057_U_Registering new unit $','1'#000+
+  '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+
   '11000_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported'#000+
-  '11002_W_DEF file can be created only for OS/2'#000+
-  '11003_E_nested resp','onse files are not supported'#000+
+  '11002_W_DEF file can be cre','ated only for OS/2'#000+
+  '11003_E_nested response files are not supported'#000+
   '11004_F_No source file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
-  '11008_F_Too many config files nested'#000+
-  '11009_F_Unable to open file $1'#000,
+  '11008_F_Too many config files ','nested'#000+
+  '11009_F_Unable to open file $1'#000+
   '11010_D_Reading further options from $1'#000+
   '11011_W_Target is already set to: $1'#000+
   '11012_W_Shared libs not supported on DOS platform, reverting to static'+
   #000+
   '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
-  '11015_F_open conditional at the end of th','e file'#000+
+  '110','15_F_open conditional at the end of the file'#000+
   '11016_W_Debug information generation is not supported by this executab'+
   'le'#000+
   '11017_H_Try recompiling with -dGDB'#000+
   '11018_E_You are using the obsolete switch $1'#000+
-  '11019_E_You are using the obsolete switch $1, please use $2'#000+
-  '11020_N_Switching as','sembler to default source writing assembler'#000+
+  '11019_E_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+
   '11026_T_Reading options from file $1'#000+
-  '11027_T_Reading options from environment $1'#000+
-  '11028_D_Handli','ng option "$1"'#000+
+  '11027_T_Reading opti','ons from environment $1'#000+
+  '11028_D_Handling option "$1"'#000+
   '11029__*** press enter ***'#000+
   '11030_H_Start of reading config file $1'#000+
   '11031_H_End of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
   '11036_D_interpreting firstpass option "$1"'#000+
-  '11033_D_interpreting file option "$1"'#000+
-  '11034_','D_Reading config file "$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+
   '11023_Free Pascal Compiler version $FPCVERSION [$FPCDATE] for $FPCCPU'#010+
-  'Copyright (c) 1993-2005 by Florian Klaempfl'#000+
-  '11024_Free Pascal Compiler version $F','PCVERSION'#010+
+  'Copyright (c) 1993-2005 by Florian Klaempfl',#000+
+  '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
   'Compiler CPU Target: $FPCCPU'#010+
@@ -716,224 +717,224 @@ const msgtxt : array[0..000160,1..240] of char=(
   '  $INSTRUCTIONSETS'#010+
   #010+
   'Supported FPU instruction sets:'#010+
-  '  $FPUINSTRUCTIONSETS'#010+
+  '  $FPUINSTRUCT','IONSETS'#010+
   #010+
-  'This program comes under the ','GNU General Public Licence'#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+
   '                 [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+
+  '11025_**0*_put + after a boolean switch option to enable it, - to',' di'+
+  'sable it'#010+
+  '**1a_the compiler doesn'#039't delete the generated assembler file'#010+
   '**2al_list sourcecode lines in assembler file'#010+
   '**2an_list node info in assembler file'#010+
   '*L2ap_use pipes instead of creating temporary assembler files'#010+
-  '**2ar_list register allocation/release info in assembler ','file'#010+
+  '**2ar_list register',' allocation/release info in assembler file'#010+
   '**2at_list temp allocation/release info in assembler file'#010+
   '**1A<x>_output format:'#010+
   '**2Adefault_use default assembler'#010+
   '3*2Aas_assemble using GNU AS'#010+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
-  '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
-  '3*2Ana','smwin32_Win32 object file using Nasm'#010+
+  '3*2Anasmel','f_elf32 (Linux) file using Nasm'#010+
+  '3*2Anasmwin32_Win32 object file using Nasm'#010+
   '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
   '3*2Awasm_obj file using Wasm (Watcom)'#010+
   '3*2Anasmobj_obj file using Nasm'#010+
   '3*2Amasm_obj file using Masm (Microsoft)'#010+
-  '3*2Atasm_obj file using Tasm (Borland)'#010+
-  '3*2A','elf_elf32 (Linux) using internal writer'#010+
+  '3*2At','asm_obj file using Tasm (Borland)'#010+
+  '3*2Aelf_elf32 (Linux) using internal writer'#010+
   '3*2Acoff_coff (Go32v2) using internal writer'#010+
   '3*2Apecoff_pecoff (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 Syn','tax (old GAS)'#010+
+  '6*2Agas_','GNU Motorola assembler'#010+
+  '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   'A*2Aas_assemble using GNU AS'#010+
   'P*2Aas_assemble using GNU AS'#010+
   'S*2Aas_assemble using GNU AS'#010+
   '**1b_generate browser info'#010+
   '**2bl_generate local symbol info'#010+
-  '**1B_build all modules'#010+
-  '**1C<x>_code generat','ion options:'#010+
+  '**1B_','build all modules'#010+
+  '**1C<x>_code generation options:'#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>_Select fpu instruction set t','o use, see fpc -i for possible '+
+  'values'#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+
-  '**2Cp<x>_select instruction set, see fpc -i for possible values'#010+
-  '**2Cr_range ch','ecking'#010+
+  '**2Cp<x>_select instruction set, see fpc',' -i for possible values'#010+
+  '**2Cr_range checking'#010+
   '**2CR_verify object method call validity'#010+
   '**2Cs<n>_set stack size to <n>'#010+
   '**2Ct_stack checking'#010+
   '**2CX_create also smartlinked library'#010+
   '**1d<x>_defines the symbol <x>'#010+
   '**1D_generate a DEF file'#010+
-  '**2Dd<x>_set description to <x>'#010+
-  '**2Dv<x>_set D','LL version to <x>'#010+
+  '**2Dd<x>','_set description to <x>'#010+
+  '**2Dv<x>_set DLL version to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_set path to executable'#010+
   '**1E_same as -Cn'#010+
   '**1F<x>_set file names and paths:'#010+
   '**2Fa<x>[,y]_for a program load first units <x> and [y] before uses is'+
   ' parsed'#010+
-  '**2Fc<x>_sets input codepage to <x>'#010+
-  '**2FD','<x>_sets the directory where to search for compiler utilities'#010+
+  '**2','Fc<x>_sets input codepage to <x>'#010+
+  '**2FD<x>_sets the directory where to search for compiler utilities'#010+
   '**2Fe<x>_redirect error output to <x>'#010+
   '**2FE<x>_set exe/unit output path to <x>'#010+
   '**2Fi<x>_adds <x> to include path'#010+
-  '**2Fl<x>_adds <x> to library path'#010+
-  '**2FL<x>_uses <x> as dynamic li','nker'#010+
+  '**2Fl<x>_adds <x> to librar','y path'#010+
+  '**2FL<x>_uses <x> as dynamic linker'#010+
   '**2Fo<x>_adds <x> to object path'#010+
   '**2Fr<x>_load error message file <x>'#010+
   '**2Fu<x>_adds <x> to unit path'#010+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
   '*g1g_generate debugger information:'#010+
-  '*g2gc_generate checks for pointers'#010+
-  '*g2gd_use d','bx'#010+
+  '*g2gc_ge','nerate checks for pointers'#010+
+  '*g2gd_use dbx'#010+
   '*g2gg_use gsym'#010+
   '*g2gh_use heap trace unit (for memory leak debugging)'#010+
   '*g2gl_use line info unit to show more info for backtraces'#010+
   '*g2gv_generates programs tracable with valgrind'#010+
-  '*g2gw_generate dwarf debugging info'#010+
+  '*g2gw_generate dwarf deb','ugging info'#010+
   '**1i_information'#010+
-  '**2iD_ret','urn compiler date'#010+
+  '**2iD_return compiler date'#010+
   '**2iV_return compiler version'#010+
   '**2iSO_return compiler OS'#010+
   '**2iSP_return compiler processor'#010+
   '**2iTO_return target OS'#010+
   '**2iTP_return target processor'#010+
   '**1I<x>_adds <x> to include path'#010+
-  '**1k<x>_Pass <x> to the linker'#010+
-  '**1l_write log','o'#010+
+  '**1k<x>','_Pass <x> to the linker'#010+
+  '**1l_write logo'#010+
   '**1M<x>_set language mode to <x>'#010+
   '**2Mfpc_free pascal dialect (default)'#010+
   '**2Mobjfpc_switch some Delphi 2 extensions on'#010+
   '**2Mdelphi_tries to be Delphi compatible'#010+
   '**2Mtp_tries to be TP/BP 7.0 compatible'#010+
-  '**2Mgpc_tries to be gpc compatible'#010+
-  '**2Mm','acpas_tries to be compatible to the macintosh pascal dialects'#010+
+  '**','2Mgpc_tries to be gpc compatible'#010+
+  '**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010+
   '**1n_don'#039't read the default config file'#010+
   '**1o<x>_change the name of the executable produced to <x>'#010+
   '**1O<x>_optimizations:'#010+
-  '3*2Og_generate smaller code'#010+
-  '3*2OG_generate faster code (d','efault)'#010+
+  '3*2Og_generate smal','ler code'#010+
+  '3*2OG_generate faster code (default)'#010+
   '**2Or_keep certain variables in registers'#010+
   '3*2Ou_enable uncertain optimizations (see docs)'#010+
   '3*2O1_level 1 optimizations (quick optimizations)'#010+
-  '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
-  '3*2O3_level 3 optimizations (-O2 re','peatedly, max 5 times)'#010+
+  '3*2O2_level 2 optimizations (-O1 + slower optimization','s)'#010+
+  '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+
   '3*2Op<x>_target processor:'#010+
   '3*3Op1_set target processor to 386/486'#010+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
-  '6*2Og_generate smaller code'#010+
-  '6*2OG_generate',' faster code (default)'#010+
+  '6*2O','g_generate smaller code'#010+
+  '6*2OG_generate faster code (default)'#010+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
   '6*2O0_set target processor to a MC68000'#010+
   '6*2O2_set target processor to a MC68020+ (default)'#010+
-  '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
-  '**1R<x>_assembler reading ','style:'#010+
+  '**1pg_generate profile code for gprof (defines F','PC_PROFILE)'#010+
+  '**1R<x>_assembler reading style:'#010+
   '**2Rdefault_use default 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>_syntax options:'#010+
   '**2S2_same as -Mobjfpc'#010+
-  '**2Sc_supports operators like C (*=,+=,/= a','nd -=)'#010+
+  '**2Sc','_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
   '**2Sd_same as -Mdelphi'#010+
   '**2Se<x>_error options. <x> is a combination of the following:'#010+
   '**3*_<n> : compiler stops after the <n> errors (default is 1)'#010+
-  '**3*_w : compiler stops also after warnings'#010+
-  '**3*_n : co','mpiler stops also after notes'#010+
+  '**3*_w : compiler',' stops also after warnings'#010+
+  '**3*_n : compiler stops also after notes'#010+
   '**3*_h : compiler stops also after hints'#010+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
   '**2Si_support C++ styled INLINE'#010+
   '**2SI<x>_set interface style to <x>'#010+
-  '**3SIcom_COM compatible interface (default)'#010+
-  '**3SIcor','ba_CORBA compatible interface'#010+
+  '**3SIcom_COM c','ompatible interface (default)'#010+
+  '**3SIcorba_CORBA compatible interface'#010+
   '**2Sm_support macros like C (global)'#010+
   '**2So_same as -Mtp'#010+
   '**2Sp_same as -Mgpc'#010+
   '**2Ss_constructor name must be init (destructor must be done)'#010+
-  '**2St_allow static keyword in objects'#010+
-  '**1s_don'#039't call assembler and link','er'#010+
+  '**2St_allow static keyword in obje','cts'#010+
+  '**1s_don'#039't 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+
-  '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
+  '3*2Temx_OS/2 via EMX (including EMX','/RSX extender)'#010+
   '3*2Tfreebsd_FreeBSD'#010+
-  '3*2','Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
+  '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
   '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
-  '3*2Tos2_OS/2 / eComStation'#010+
+  '3*2Tos2_OS/2 / eComS','tation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
-  '3*2Twat','com_Watcom compatible DOS extender'#010+
+  '3*2Twatcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
   '4*2Tlinux_Linux'#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux-68k'#010+
-  '6*2Tmacos_Macintosh m68k (not supported)'#010+
+  '6*2Tmacos_Macintosh m68k ','(not supported)'#010+
   '6*2Tpalmos_PalmOS'#010+
-  'A*2T','linux_Linux'#010+
+  'A*2Tlinux_Linux'#010+
   'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+
   'P*2Tlinux_Linux on PowerPC'#010+
   'P*2Tmacos_MacOS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
   'S*2Tlinux_Linux'#010+
   '**1u<x>_undefines the symbol <x>'#010+
-  '**1U_unit options:'#010+
+  '**1U_unit option','s:'#010+
   '**2Un_don'#039't check the unit name'#010+
-  '**2','Ur_generate release unit files'#010+
+  '**2Ur_generate release unit files'#010+
   '**2Us_compile a system unit'#010+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
   '**2*_e : Show errors (default)       0 : Show nothing (except errors)'#010+
-  '**2*_w : Show warnings               u : Sho','w unit info'#010+
+  '**2*_w',' : Show warnings               u : Show unit info'#010+
   '**2*_n : Show notes                  t : Show tried/used files'#010+
   '**2*_h : Show hints                  c : Show conditionals'#010+
   '**2*_i : Show general info           d : Show debug info'#010+
-  '**2*_l : Show linenumbers            r : Rhide/GC','C compatibility mod'+
+  '**2*_l : Sh','ow linenumbers            r : Rhide/GCC compatibility mod'+
   'e'#010+
   '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
   '**2*_v : write fpcdebug.txt with     p : Write tree.log with parse tre'+
   'e'#010+
   '**2*_    lots of debugging info'#010+
-  '3*1W<x>_Win32-like target options'#010+
-  '3*2WB_Creat','e a relocatable image'#010+
+  '3*1W<x>','_Win32-like target options'#010+
+  '3*2WB_Create a relocatable image'#010+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
-  '3*2WF_Specify full-screen type application (OS/2 only)'#010+
-  '3*2WG_Specify graphic t','ype application'#010+
+  '3*2WF_Specify full-screen type applicati','on (OS/2 only)'#010+
+  '3*2WG_Specify graphic type application'#010+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   'P*2WC_Specify console type application (MacOS only)'#010+
-  'P*2WG_Specify graphic type application (MacOS only)'#010+
-  'P*2WT_Specify tool type a','pplication (MPW tool, MacOS only)'#010+
+  'P*2WG_Specify graphic type application ','(MacOS only)'#010+
+  'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+
   '**1X_executable options:'#010+
   '**2Xc_pass --shared to the linker (Unix only)'#010+
   '**2Xd_don'#039't use standard library search path (needed for cross com'+
   'pile)'#010+
-  '**2XD_try to link units dynamic          (defines FPC_LINK_DYNA','MIC)'#010+
+  '**2XD_try to link units d','ynamic          (defines FPC_LINK_DYNAMIC)'#010+
   '**2XP<x>_prepend the binutils names with the prefix <x>'#010+
   '**2Xr<x>_set library search path to <x> (needed for cross compile)'#010+
   '**2Xs_strip all symbols from executable'#010+
-  '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+
-  '**2Xt','_link with static libraries (-static is passed to linker)'#010+
+  '**2XS_try to link units static (de','fault) (defines FPC_LINK_STATIC)'#010+
+  '**2Xt_link with static libraries (-static is passed to linker)'#010+
   '**2XX_try to link units smart            (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+

compiler/pdecobj.pas

@@ -561,17 +561,44 @@ implementation
                            consume(_PUBLISHED);
                            current_object_option:=[sp_published];
                          end;
-                       else
+                       _STRICT :
                          begin
                            if is_interface(aktclass) then
-                             Message(parser_e_no_vars_in_interfaces);
+                              Message(parser_e_no_access_specifier_in_interfaces);
+                            consume(_STRICT);
+                            if token=_ID then
+                              begin
+                                case idtoken of
+                                  _PRIVATE:
+                                    begin
+                                      consume(_PRIVATE);
+                                      current_object_option:=[sp_strictprivate];
+                                      include(aktclass.objectoptions,oo_has_strictprivate);
+                                    end;
+                                  _PROTECTED:
+                                    begin
+                                      consume(_PROTECTED);
+                                      current_object_option:=[sp_strictprotected];
+                                      include(aktclass.objectoptions,oo_has_strictprotected);
+                                    end;
+                                  else
+                                    message(parser_e_protected_or_private_expected);
+                                end;
+                              end
+                            else
+                              message(parser_e_protected_or_private_expected);
+                          end;
+                        else
+                          begin
+                            if is_interface(aktclass) then
+                              Message(parser_e_no_vars_in_interfaces);
 
-                           if (sp_published in current_object_option) and
-                             not(oo_can_have_published in aktclass.objectoptions) then
-                             Message(parser_e_cant_have_published);
+                            if (sp_published in current_object_option) and
+                              not(oo_can_have_published in aktclass.objectoptions) then
+                              Message(parser_e_cant_have_published);
 
-                           read_var_decs(false,true,false);
-                         end;
+                            read_var_decs(false,true,false);
+                          end;
                     end;
                   end;
                 _PROPERTY :

compiler/pdecvar.pas

@@ -721,7 +721,7 @@ implementation
          { read vars }
          sc:=tsinglelist.create;
          while (token=_ID) and
-               not(is_object and (idtoken in [_PUBLIC,_PRIVATE,_PUBLISHED,_PROTECTED])) do
+               not(is_object and (idtoken in [_PUBLIC,_PRIVATE,_PUBLISHED,_PROTECTED,_STRICT])) do
            begin
              sorg:=orgpattern;
              semicoloneaten:=false;

compiler/ptype.pas

@@ -550,6 +550,7 @@ implementation
                      { don't forget that min can be negativ  PM }
                      enumdef :
                        if tenumdef(tt2.def).min>=0 then
+                        // !! tt.setdef(tsetdef.create(tt2,tenumdef(tt2.def).min,tenumdef(tt2.def).max))
                         tt.setdef(tsetdef.create(tt2,tenumdef(tt2.def).max))
                        else
                         Message(sym_e_ill_type_decl_set);
@@ -557,12 +558,14 @@ implementation
                        begin
                          case torddef(tt2.def).typ of
                            uchar :
+                             //!!! tt.setdef(tsetdef.create(tt2,0,255));
                              tt.setdef(tsetdef.create(tt2,255));
                            u8bit,u16bit,u32bit,
                            s8bit,s16bit,s32bit :
                              begin
                                if (torddef(tt2.def).low>=0) then
-                                tt.setdef(tsetdef.create(tt2,torddef(tt2.def).high))
+                                 // !! tt.setdef(tsetdef.create(tt2,torddef(tt2.def).low,torddef(tt2.def).high))
+                                 tt.setdef(tsetdef.create(tt2,torddef(tt2.def).high))
                                else
                                 Message(sym_e_ill_type_decl_set);
                              end;

compiler/symconst.pas

@@ -145,7 +145,9 @@ type
     sp_hint_library,
     sp_hint_unimplemented,
     sp_has_overloaded,
-    sp_internal  { internal symbol, not reported as unused }
+    sp_internal,  { internal symbol, not reported as unused }
+    sp_strictprivate,
+    sp_strictprotected
   );
   tsymoptions=set of tsymoption;
 
@@ -289,6 +291,8 @@ type
     oo_has_virtual,        { the object/class has virtual methods }
     oo_has_private,
     oo_has_protected,
+    oo_has_strictprivate,
+    oo_has_strictprotected,
     oo_has_constructor,    { the object/class has a constructor }
     oo_has_destructor,     { the object/class has a destructor }
     oo_has_vmt,            { the object/class has a vmt }
@@ -416,6 +420,8 @@ const
 
 
 const
+   inherited_objectoptions : tobjectoptions = [oo_has_virtual,oo_has_private,oo_has_protected,
+                oo_has_strictprotected,oo_has_strictprivate,oo_has_constructor,oo_has_destructor];
    clearstack_pocalls = [
      pocall_cdecl,pocall_cppdecl,pocall_syscall
    ];

compiler/symdef.pas

@@ -708,7 +708,9 @@ interface
        tsetdef = class(tstoreddef)
           elementtype : ttype;
           settype : tsettype;
-          constructor create(const t:ttype;high : longint);
+          setbase,
+          setmax : aint;
+          constructor create(const t:ttype;high : aint);
           constructor ppuload(ppufile:tcompilerppufile);
           destructor  destroy;override;
           function getcopy : tstoreddef;override;
@@ -2789,6 +2791,8 @@ implementation
          inherited create;
          deftype:=setdef;
          elementtype:=t;
+         // setbase:=low;
+         setmax:=high;
          if high<32 then
            begin
             settype:=smallset;
@@ -2828,9 +2832,9 @@ implementation
          ppufile.gettype(elementtype);
          settype:=tsettype(ppufile.getbyte);
          case settype of
-            normset : savesize:=32;
-            varset : savesize:=ppufile.getlongint;
-            smallset : savesize:=Sizeof(longint);
+           normset : savesize:=32;
+           varset : savesize:=ppufile.getlongint;
+           smallset : savesize:=Sizeof(longint);
          end;
       end;
 
@@ -2861,6 +2865,8 @@ implementation
          ppufile.putbyte(byte(settype));
          if settype=varset then
            ppufile.putlongint(savesize);
+         if settype=normset then
+           ppufile.putaint(savesize);
          ppufile.writeentry(ibsetdef);
       end;
 
@@ -3277,9 +3283,9 @@ implementation
         { static variables from objects are like global objects }
         if (Tsym(p).typ=fieldvarsym) and not (sp_static in Tsym(p).symoptions) then
           begin
-            if (sp_protected in tsym(p).symoptions) then
+            if ([sp_protected,sp_strictprotected]*tsym(p).symoptions)<>[] then
               spec:='/1'
-            else if (sp_private in tsym(p).symoptions) then
+            else if ([sp_private,sp_strictprivate]*tsym(p).symoptions)<>[] then
               spec:='/0'
             else
               spec:='';
@@ -4144,7 +4150,20 @@ implementation
            not(owner.defowner.owner.iscurrentunit) then
           exit;
 
-        { protected symbols are vissible in the module that defines them and
+        if (sp_strictprivate in symoptions) then
+          begin
+            result:=currobjdef=tobjectdef(owner.defowner);
+            exit;
+          end;
+
+        if (sp_strictprotected in symoptions) then
+          begin
+             result:=assigned(currobjdef) and
+               currobjdef.is_related(tobjectdef(owner.defowner));
+             exit;
+          end;
+
+        { protected symbols are visible in the module that defines them and
           also visible to related objects. The related object must be defined
           in the current module }
         if (sp_protected in symoptions) and
@@ -5214,8 +5233,7 @@ implementation
              { only important for classes }
              lastvtableindex:=c.lastvtableindex;
              objectoptions:=objectoptions+(c.objectoptions*
-               [oo_has_virtual,oo_has_private,oo_has_protected,
-                oo_has_constructor,oo_has_destructor]);
+               inherited_objectoptions);
              if not (objecttype in [odt_interfacecom,odt_interfacecorba]) then
                begin
                   { add the data of the anchestor class }
@@ -5462,9 +5480,9 @@ implementation
               end;
            { here 2A must be changed for private and protected }
            { 0 is private 1 protected and 2 public }
-           if (sp_private in tsym(p).symoptions) then
+           if ([sp_private,sp_strictprivate]*tsym(p).symoptions)<>[] then
              sp:='0'
-           else if (sp_protected in tsym(p).symoptions) then
+           else if ([sp_protected,sp_strictprotected]*tsym(p).symoptions)<>[] then
              sp:='1'
            else
              sp:='2';

compiler/symsym.pas

@@ -120,7 +120,11 @@ interface
           function search_procdef_byprocvardef(d:Tprocvardef):Tprocdef;
           function search_procdef_assignment_operator(fromdef,todef:tdef;var besteq:tequaltype):Tprocdef;
           function  write_references(ppufile:tcompilerppufile;locals:boolean):boolean;override;
-          function is_visible_for_object(currobjdef:tdef):boolean;override;
+          { currobjdef is the object def to assume, this is necessary for protected and
+            private,
+            context is the object def we're really in, this is for the strict stuff
+          }
+          function is_visible_for_object(currobjdef:tdef;context:tdef):boolean;override;
 {$ifdef GDB}
           function stabstring : pchar;override;
 {$endif GDB}
@@ -1119,7 +1123,7 @@ implementation
       end;
 
 
-    function tprocsym.is_visible_for_object(currobjdef:tdef):boolean;
+    function tprocsym.is_visible_for_object(currobjdef:tdef;context:tdef):boolean;
       var
         p : pprocdeflist;
       begin

compiler/symtable.pas

@@ -1196,7 +1196,7 @@ implementation
               { but private ids can be reused }
               hsym:=search_class_member(tobjectdef(defowner),sym.name);
               if assigned(hsym) and
-                 Tsym(hsym).is_visible_for_object(tobjectdef(defowner)) then
+                 tsym(hsym).is_visible_for_object(tobjectdef(defowner),tobjectdef(defowner)) then
                 DuplicateSym(sym,hsym);
            end;
          inherited insert(sym);
@@ -1282,7 +1282,7 @@ implementation
                hsym:=search_class_member(tobjectdef(next.next.defowner),sym.name);
                if assigned(hsym) and
                  { private ids can be reused }
-                  (hsym.is_visible_for_object(tobjectdef(next.next.defowner)) or
+                  (hsym.is_visible_for_object(tobjectdef(next.next.defowner),tobjectdef(next.next.defowner)) or
                    (hsym.owner.defowner.owner.symtabletype<>globalsymtable)) then
                 begin
                   { delphi allows to reuse the names in a class, but not
@@ -1323,7 +1323,7 @@ implementation
               hsym:=search_class_member(tobjectdef(next.defowner),sym.name);
               { private ids can be reused }
               if assigned(hsym) and
-                 Tsym(hsym).is_visible_for_object(tobjectdef(next.defowner)) then
+                 Tsym(hsym).is_visible_for_object(tobjectdef(next.defowner),tobjectdef(next.defowner)) then
                begin
                  { delphi allows to reuse the names in a class, but not
                    in object (tp7 compatible) }
@@ -1809,6 +1809,7 @@ implementation
       var
         speedvalue : cardinal;
         topclass   : tobjectdef;
+        context : tobjectdef;
       begin
          speedvalue:=getspeedvalue(s);
          srsymtable:=symtablestack;
@@ -1831,7 +1832,11 @@ implementation
                      if assigned(current_procinfo) then
                        topclass:=current_procinfo.procdef._class;
                    end;
-                 if Tsym(srsym).is_visible_for_object(topclass) then
+                 if assigned(current_procinfo) then
+                   context:=current_procinfo.procdef._class
+                 else
+                   context:=nil;
+                 if tsym(srsym).is_visible_for_object(topclass,context) then
                    begin
                      { we need to know if a procedure references symbols
                        in the static symtable, because then it can't be
@@ -1868,7 +1873,7 @@ implementation
                   srsym:=tsym(srsymtable.speedsearch(s,speedvalue));
                   if assigned(srsym) and
                      (not assigned(current_procinfo) or
-                      Tsym(srsym).is_visible_for_object(current_procinfo.procdef._class)) then
+                      tsym(srsym).is_visible_for_object(current_procinfo.procdef._class,current_procinfo.procdef._class)) then
                     begin
                       result:=true;
                       exit;
@@ -1909,7 +1914,7 @@ implementation
        end;
 
 
-    function  searchsym_in_class(classh:tobjectdef;const s : stringid):tsym;
+    function searchsym_in_class(classh:tobjectdef;const s : stringid):tsym;
       var
         speedvalue : cardinal;
         topclassh  : tobjectdef;
@@ -1936,7 +1941,7 @@ implementation
           begin
             sym:=tsym(classh.symtable.speedsearch(s,speedvalue));
             if assigned(sym) and
-               tsym(sym).is_visible_for_object(topclassh) then
+               tsym(sym).is_visible_for_object(topclassh,current_procinfo.procdef._class) then
               break
             else
               sym:=nil;
@@ -1946,7 +1951,7 @@ implementation
       end;
 
 
-    function  searchsym_in_class_by_msgint(classh:tobjectdef;i:longint):tsym;
+    function searchsym_in_class_by_msgint(classh:tobjectdef;i:longint):tsym;
       var
         topclassh  : tobjectdef;
         def        : tdef;
@@ -1997,7 +2002,7 @@ implementation
       end;
 
 
-    function  searchsym_in_class_by_msgstr(classh:tobjectdef;const s:string):tsym;
+    function searchsym_in_class_by_msgstr(classh:tobjectdef;const s:string):tsym;
       var
         topclassh  : tobjectdef;
         def        : tdef;
@@ -2220,7 +2225,7 @@ implementation
             begin
               if (srsym.typ<>procsym) then
                internalerror(200111022);
-              if srsym.is_visible_for_object(tobjectdef(aprocsym.owner.defowner)) then
+              if srsym.is_visible_for_object(tobjectdef(aprocsym.owner.defowner),tobjectdef(aprocsym.owner.defowner)) then
                begin
                  srsym.add_para_match_to(Aprocsym,[cpo_ignorehidden,cpo_allowdefaults]);
                  { we can stop if the overloads were already added

compiler/symtype.pas

@@ -119,7 +119,11 @@ interface
          function  gettypedef:tdef;virtual;
          procedure load_references(ppufile:tcompilerppufile;locals:boolean);virtual;
          function  write_references(ppufile:tcompilerppufile;locals:boolean):boolean;virtual;
-         function is_visible_for_object(currobjdef:Tdef):boolean;virtual;
+         { currobjdef is the object def to assume, this is necessary for protected and
+           private,
+           context is the object def we're really in, this is for the strict stuff
+         }
+         function is_visible_for_object(currobjdef:tdef;context : tdef):boolean;virtual;
       end;
 
       tsymarr = array[0..maxlongint div sizeof(pointer)-1] of tsym;
@@ -476,7 +480,7 @@ implementation
       end;
 
 
-    function tsym.is_visible_for_object(currobjdef:Tdef):boolean;
+    function Tsym.is_visible_for_object(currobjdef:Tdef;context : tdef):boolean;
       begin
         is_visible_for_object:=false;
 
@@ -488,7 +492,21 @@ implementation
            (not owner.defowner.owner.iscurrentunit) then
           exit;
 
-        { protected symbols are vissible in the module that defines them and
+        if (sp_strictprivate in symoptions) then
+          begin
+            result:=assigned(currobjdef) and
+              (context=tdef(owner.defowner));
+            exit;
+          end;
+
+        if (sp_strictprotected in symoptions) then
+          begin
+            result:=assigned(context) and
+              context.is_related(tdef(owner.defowner));
+            exit;
+          end;
+
+        { protected symbols are visible in the module that defines them and
           also visible to related objects }
         if (sp_protected in symoptions) and
            (

compiler/tokens.pas

@@ -167,6 +167,7 @@ type
     _RESULT,
     _STATIC,
     _STORED,
+    _STRICT,
     _STRING,
     _SYSTEM,
     _ASMNAME,
@@ -403,6 +404,7 @@ const
       (str:'RESULT'        ;special:false;keyword:m_none;op:NOTOKEN),
       (str:'STATIC'        ;special:false;keyword:m_none;op:NOTOKEN),
       (str:'STORED'        ;special:false;keyword:m_none;op:NOTOKEN),
+      (str:'STRICT'        ;special:false;keyword:m_none;op:NOTOKEN),
       (str:'STRING'        ;special:false;keyword:m_all;op:NOTOKEN),
       (str:'SYSTEM'        ;special:false;keyword:m_none;op:NOTOKEN),
       (str:'ASMNAME'       ;special:false;keyword:m_none;op:NOTOKEN),

tests/tbf/tb0174a.pp

@@ -0,0 +1,42 @@
+{ %fail }
+{$mode objfpc}
+
+type
+  tobject1 = class
+  strict protected
+    spro : integer;
+  strict private
+    spriv : integer;
+  public
+    procedure p1;
+  end;
+
+
+  tobject2 = class(tobject1)
+    procedure p2;
+  end;
+
+procedure tobject1.p1;
+  begin
+    spro:=1;
+    spriv:=2;
+  end;
+
+procedure tobject2.p2;
+  begin
+    spro:=3;
+    spriv:=1;
+  end;
+
+var
+  o1 : tobject1;
+  o2 : tobject2;
+
+begin
+  o1:=tobject1.create;
+  o2:=tobject2.create;
+  o1.free;
+  o2.free;
+end.
+
+

tests/tbf/tb0174b.pp

@@ -0,0 +1,42 @@
+{ %fail }
+{$mode objfpc}
+
+type
+  tobject1 = class
+  strict protected
+    spro : integer;
+  strict private
+    spriv : integer;
+  public
+    procedure p1;
+  end;
+
+
+  tobject2 = class(tobject1)
+    procedure p2;
+  end;
+
+procedure tobject1.p1;
+  begin
+    spro:=1;
+    spriv:=2;
+  end;
+
+procedure tobject2.p2;
+  begin
+    spro:=3;
+  end;
+
+var
+  o1 : tobject1;
+  o2 : tobject2;
+
+begin
+  o1:=tobject1.create;
+  o2:=tobject2.create;
+  o1.spro:=1;
+  o1.free;
+  o2.free;
+end.
+
+

tests/tbf/tb0174c.pp

@@ -0,0 +1,42 @@
+{ %fail }
+{$mode objfpc}
+
+type
+  tobject1 = class
+  strict protected
+    spro : integer;
+  strict private
+    spriv : integer;
+  public
+    procedure p1;
+  end;
+
+
+  tobject2 = class(tobject1)
+    procedure p2;
+  end;
+
+procedure tobject1.p1;
+  begin
+    spro:=1;
+    spriv:=2;
+  end;
+
+procedure tobject2.p2;
+  begin
+    spro:=3;
+  end;
+
+var
+  o1 : tobject1;
+  o2 : tobject2;
+
+begin
+  o1:=tobject1.create;
+  o2:=tobject2.create;
+  o1.spriv:=1;
+  o1.free;
+  o2.free;
+end.
+
+

tests/tbf/tb0174d.pp

@@ -0,0 +1,39 @@
+{ %fail }
+{$mode objfpc}
+
+type
+  tobject1 = class
+  strict protected
+    spro : integer;
+  strict private
+    spriv : integer;
+  public
+    procedure p1;
+  end;
+
+
+  tobject2 = class(tobject1)
+    procedure p2;
+  end;
+
+procedure tobject1.p1;
+  begin
+  end;
+
+procedure tobject2.p2;
+  begin
+  end;
+
+var
+  o1 : tobject1;
+  o2 : tobject2;
+
+begin
+  o1:=tobject1.create;
+  o2:=tobject2.create;
+  o2.spro:=1;
+  o1.free;
+  o2.free;
+end.
+
+

tests/tbs/tb0493.pp

@@ -0,0 +1,40 @@
+{$mode objfpc}
+
+type
+  tobject1 = class
+  strict protected
+    spro : integer;
+  strict private
+    spriv : integer;
+  public
+    procedure p1;
+  end;
+
+
+  tobject2 = class(tobject1)
+    procedure p2;
+  end;
+
+procedure tobject1.p1;
+  begin
+    spro:=1;
+    spriv:=2;
+  end;
+
+procedure tobject2.p2;
+  begin
+    spro:=3;
+  end;
+
+var
+  o1 : tobject1;
+  o2 : tobject2;
+
+begin
+  o1:=tobject1.create;
+  o2:=tobject2.create;
+  o1.free;
+  o2.free;
+end.
+
+