Browse Source

Merged revisions 7180-7181,7185,7218,7223,7229 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk

r7180 (florian)
* forbid file types as function results


r7181 (florian)
* don't allow logical operators on char, resolves #8780


r7185 (florian)
+ support of dispatch call using <variant>.<id>


r7218 (florian)
* the cygwin1.dll messes with the console mode so store and restore the console mode if necessary


r7223 (florian)
* copyright updated to 2007


r7229 (florian)
* ensure that softfloat and libgcc float never use rfs/wfs

git-svn-id: branches/fixes_2_2@7233 -

florian 18 years ago
parent
commit
2f983bf9b3

+ 4 - 0
.gitattributes

@@ -7197,6 +7197,10 @@ tests/webtbf/tw8588.pp svneol=native#text/plain
 tests/webtbf/tw8777a.pp svneol=native#text/plain
 tests/webtbf/tw8777b.pp svneol=native#text/plain
 tests/webtbf/tw8777c.pp svneol=native#text/plain
+tests/webtbf/tw8780a.pp svneol=native#text/plain
+tests/webtbf/tw8780b.pp svneol=native#text/plain
+tests/webtbf/tw8780c.pp svneol=native#text/plain
+tests/webtbf/tw8781.pp svneol=native#text/plain
 tests/webtbf/uw0744.pp svneol=native#text/plain
 tests/webtbf/uw0840a.pp svneol=native#text/plain
 tests/webtbf/uw0840b.pp svneol=native#text/plain

+ 2 - 0
compiler/msg/errore.msg

@@ -1130,6 +1130,8 @@ parser_f_no_anonymous_specializations=03232_F_Anonymous generic specializations
 % \end{verbatim}
 parser_e_initialized_not_for_external=03233_E_Cannot initialize variables declared as external
 % Variables declared as external can not be initialized with a default value.
+parser_e_illegal_function_result=03234_E_Illegal function result type
+% Some types like file types can not used as function result
 % \end{description}
 #
 # Type Checking

+ 3 - 2
compiler/msgidx.inc

@@ -318,6 +318,7 @@ const
   parser_e_label_outside_proc=03231;
   parser_f_no_anonymous_specializations=03232;
   parser_e_initialized_not_for_external=03233;
+  parser_e_illegal_function_result=03234;
   type_e_mismatch=04000;
   type_e_incompatible_types=04001;
   type_e_not_equal_types=04002;
@@ -721,9 +722,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 42992;
+  MsgTxtSize = 43029;
 
   MsgIdxMax : array[1..20] of longint=(
-    24,82,234,79,63,49,107,22,135,60,
+    24,82,235,79,63,49,107,22,135,60,
     42,1,1,1,1,1,1,1,1,1
   );

+ 218 - 216
compiler/msgtxt.inc

@@ -359,337 +359,338 @@ const msgtxt : array[0..000179,1..240] of char=(
   'pe isn'#039't allowed'#000+
   '03232_F_Anonymous generic specializations are not allowed'#000+
   '03233_E_Cannot initialize variables declared as external'#000+
-  '04000_E_Type mismatch'#000+
-  '04001_E_Incompatible types: got "$','1" expected "$2"'#000+
+  '03234_E_Illegal function result type'#000+
+  '04000_E_Type mismat','ch'#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_O','rdinal expression expected'#000+
+  '04006_E_Boolean expres','sion 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+
-  '0','4014_W_Automatic type conversion from floating type to COMP which i'+
-  's an integer type'#000+
+  '04013_E','_Operation not implemented for sets'#000+
+  '04014_W_Automatic type conversion from floating type to COMP which is '+
+  'an integer type'#000+
   '04015_H_use DIV instead to get an integer 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+
+  '04017_E_succ ','or pred on enums with assignments not possible'#000+
   '04018_E_Can'#039't read or write variables of this type'#000+
   '04019_E_Can'#039't use readln or writeln on typed file'#000+
   '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 th','e upper/lower word/dword'#000+
+  '04021_E_Type conflict between set elements'#000,
+  '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
   '04023_E_Integer or real expression expected'#000+
   '04024_E_Wrong type "$1" in array constructor'#000+
   '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+
-  '04026_E_Method (variable) and Procedure (variable) are not c','ompatibl'+
+  '04026_E_Method (variabl','e) and Procedure (variable) 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 va','lues to an address'#000+
+  '04030_E_Can'#039't assign local procedure/function to proce','dure varia'+
+  'ble'#000+
+  '04031_E_Can'#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 expression','s and cardinals here may cause a ran'+
-  'ge check error'#000+
+  '04035_W_Mixing signed expressions and longwords gives a 64bit re','sult'+
+  #000+
+  '04036_W_Mixing signed expressions and cardinals here may cause a range'+
+  ' check error'#000+
   '04037_E_Typecast has different size ($1 -> $2) in assignment'#000+
   '04038_E_enums with assignments can'#039't be 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 related'#000+
+  '04040_W_Class types "$1" and "$2" are not related'#000+
   '04041_E_Class or interface type expected, but got "$1"'#000+
   '04042_E_Type "$1" is not completely defined'#000+
-  '04043_W_String literal has more characters than short string length'#000+
-  '04044_W_Comparison is always fa','lse due to range of values'#000+
+  '04043_W_String literal has more characters than short string l','ength'#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, possibl','e loss of data / range check erro'+
-  'r'#000+
+  '04047_H_The left operand of the IN operator should be byte size','d'#000+
+  '04048_W_Type size mismatch, possible loss of data / range check error'#000+
   '04049_H_Type size mismatch, possible loss of data / range check error'#000+
   '04050_E_The address of an abstract method can'#039't be taken'#000+
-  '04051_E_Assignments to formal parameters and open arrays are not possi'+
-  'ble'#000+
-  '0405','2_E_Constant Expression expected'#000+
+  '04051_E_Assignments to formal parameters ','and open arrays are not pos'+
+  'sible'#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+
+  '04055_H_Conversion between ordinals and pointers is not portabl','e'#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+
   '04059_W_Converting constant real value to double for C variable argume'+
-  'nt, add explicit typecast to prevent this.'#000+
-  '04060_','E_Class or COM interface type expected, but got "$1"'#000+
+  'nt, add expl','icit typecast to prevent this.'#000+
+  '04060_E_Class or COM interface type expected, but got "$1"'#000+
   '04061_E_Constant packed arrays are not yet supported'#000+
   '04062_E_Incompatible type for arg no. $1: Got "$2" expected "(Bit)Pack'+
   'ed Array"'#000+
-  '04063_E_Incompatible type for arg no. $1: Got "$2" exp','ected "(not pa'+
+  '04063_E_Incompati','ble type for arg no. $1: Got "$2" expected "(not pa'+
   'cked) Array"'#000+
   '04064_E_Elements of packed arrays cannot be of a type which need to be'+
   ' initialised'#000+
   '04065_E_Constant packed records and objects are not yet supported'#000+
-  '04066_W_Arithmetic "$1" on untyped pointer is unportable to {$T+','}, s'+
+  '04066_W_Arithmetic "$1" on ','untyped pointer is unportable to {$T+}, s'+
   'uggest typecast'#000+
   '04076_E_Can'#039't take address of a subroutine marked as local'#000+
   '04077_E_Can'#039't export subroutine marked as local from a unit'#000+
   '04078_E_Type is not automatable: "$1"'#000+
-  '05000_E_Identifier not found "$1"'#000+
-  '05001_F_Internal Error in Sym','TableStack()'#000+
+  '05000_E_Identifier not fou','nd "$1"'#000+
+  '05001_F_Internal Error in SymTableStack()'#000+
   '05002_E_Duplicate identifier "$1"'#000+
   '05003_H_Identifier already defined in $1 at line $2'#000+
   '05004_E_Unknown identifier "$1"'#000+
   '05005_E_Forward declaration not solved "$1"'#000+
-  '05007_E_Error in type definition'#000+
-  '05009_E_Forward type not resolve','d "$1"'#000+
+  '05007_E_Error in type defini','tion'#000+
+  '05009_E_Forward type not resolved "$1"'#000+
   '05010_E_Only static variables can be used in static methods or outside'+
   ' methods'#000+
   '05012_F_record or class type expected'#000+
   '05013_E_Instances of classes or objects with an abstract method are no'+
-  't allowed'#000+
+  't allowed',#000+
   '05014_W_Label not defined "$1"'#000+
-  '05015','_E_Label used but not defined "$1"'#000+
+  '05015_E_Label used but not defined "$1"'#000+
   '05016_E_Illegal label declaration'#000+
   '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
   '05018_E_Label not found'#000+
   '05019_E_identifier isn'#039't a label'#000+
-  '05020_E_label already defined'#000+
-  '05021_E_illegal type decla','ration of set elements'#000+
+  '05020_E_label alrea','dy defined'#000+
+  '05021_E_illegal type declaration of set elements'#000+
   '05022_E_Forward class definition not resolved "$1"'#000+
   '05023_H_Unit "$1" not used in $2'#000+
   '05024_H_Parameter "$1" not used'#000+
   '05025_N_Local variable "$1" not used'#000+
-  '05026_H_Value parameter "$1" is assigned but never used'#000+
-  '05027_N_','Local variable "$1" is assigned but never used'#000+
+  '05026_H_Value parameter "$1','" is assigned but never used'#000+
+  '05027_N_Local variable "$1" is assigned but never used'#000+
   '05028_H_Local $1 "$2" is not used'#000+
   '05029_N_Private field "$1.$2" is never used'#000+
   '05030_N_Private field "$1.$2" is assigned but never used'#000+
-  '05031_N_Private method "$1.$2" never used'#000+
-  '05032_E_Set type',' expected'#000+
+  '05031_N_Private metho','d "$1.$2" never used'#000+
+  '05032_E_Set type expected'#000+
   '05033_W_Function result does not seem to be set'#000+
   '05034_W_Type "$1" is not aligned correctly in current record for C'#000+
   '05035_E_Unknown record field identifier "$1"'#000+
-  '05036_W_Local variable "$1" does not seem to be initialized'#000+
-  '05037_W_Va','riable "$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+
   '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 depr','ecated'#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+
   '05057_H_Local variable "$1" does not seem to be initialized'#000+
-  '05058_H_Variable "$1" does not seem to be initiali','zed'#000+
+  '05058_H_Varia','ble "$1" does not seem to be initialized'#000+
   '05059_W_Function result variable does not seem to initialized'#000+
   '05060_H_Function result variable does not seem to be initialized'#000+
   '05061_W_Variable "$1" read but nowhere assigned'#000+
-  '05062_H_Found abstract method: $1'#000+
-  '06009_E_Parameter list size',' exceeds 65535 bytes'#000+
+  '05062_H_Found abstract m','ethod: $1'#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 constructor or destructor'#000+
-  '06017_N_Ineffic','ient code'#000+
+  '06016_W_Possible illegal call of cons','tructor 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+
   '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,
+  '060','32_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'wi'+
-  'th'#039' clause'#000+
-  '06038_E_Cannot call mess','age handler methods directly'#000+
+  '06037_E_Constructors or destructors can not be called inside a '#039,'w'+
+  'ith'#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+
   '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+
-  '06042_W_Local variable size exceed limit',' for certain cpu'#039's'#000+
+  '060','42_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+
   '06046_F_Unknown compilerproc "$1". Check if you use the correct run ti'+
-  'me library.'#000+
-  '06047_F_Cannot find system type',' "$1". Check if you use the correct r'+
-  'un time library.'#000+
+  'me lib','rary.'#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+
   '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+
+  '07002_E','_Non-label pattern contains @'#000+
+  '07004_E_Error building record offset'#000+
   '07005_E_OFFSET used without identifier'#000+
   '07006_E_TYPE used without identifier'#000+
   '07007_E_Cannot use local variable or parameters here'#000+
   '07008_E_need to use OFFSET here'#000+
-  '07009_E_need to use $ here'#000+
-  '07010_E_Cannot use mul','tiple relocatable symbols'#000+
+  '07009_E_need',' to use $ here'#000+
+  '07010_E_Cannot use multiple relocatable symbols'#000+
   '07011_E_Relocatable symbol can only be added'#000+
   '07012_E_Invalid constant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
   '07014_E_Invalid reference syntax'#000+
-  '07015_E_You can not reach $1 from that code'#000+
-  '07016_E_Local ','symbols/labels aren'#039't allowed as references'#000+
+  '07015_E_You can not r','each $1 from that code'#000+
+  '07016_E_Local symbols/labels aren'#039't allowed as references'#000+
   '07017_E_Invalid base and index register usage'#000+
   '07018_W_Possible error in object field handling'#000+
   '07019_E_Wrong scale factor specified'#000+
-  '07020_E_Multiple index register usage'#000+
-  '07021_E_Invalid operand typ','e'#000+
+  '07020_E_Multiple index regis','ter usage'#000+
+  '07021_E_Invalid operand type'#000+
   '07022_E_Invalid string as opcode operand: $1'#000+
   '07023_W_@CODE and @DATA not supported'#000+
   '07024_E_Null label references are not allowed'#000+
   '07025_E_Divide by zero in asm evaluator'#000+
   '07026_E_Illegal expression'#000+
-  '07027_E_escape sequence ignored: $1'#000+
-  '07028_','E_Invalid symbol reference'#000+
+  '07027','_E_escape sequence ignored: $1'#000+
+  '07028_E_Invalid symbol reference'#000+
   '07029_W_Fwait can cause emulation problems with emu387'#000+
   '07030_W_$1 without operand translated into $1P'#000+
   '07031_W_ENTER instruction is not supported by Linux kernel'#000+
-  '07032_W_Calling an overload function in assembler'#000+
-  '07','033_E_Unsupported symbol type for operand'#000+
+  '07032_W_Calling',' an overload function in assembler'#000+
+  '07033_E_Unsupported symbol type for operand'#000+
   '07034_E_Constant value out of bounds'#000+
   '07035_E_Error converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
   '07037_E_Error converting binary $1'#000+
-  '07038_E_Error converting hexadecimal $1'#000+
-  '07039_H_$1 trans','lated to $2'#000+
+  '07038_E_Error conve','rting hexadecimal $1'#000+
+  '07039_H_$1 translated to $2'#000+
   '07040_W_$1 is associated to an overloaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
-  '07043_W_Procedures can'#039't return any value in asm code'#000+
+  '07043_W_Procedures can'#039't return any value in a','sm code'#000+
   '07044_E_SEG not supported'#000+
-  '070','45_E_Size suffix and destination or source 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+
+  '07048_E_Invalid combination of opcode and opera','nds'#000+
+  '07049_E_Assembler syntax error in operand'#000+
   '07050_E_Assembler syntax error in constant'#000+
   '07051_E_Invalid String expression'#000+
   '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
   '07053_E_Unrecognized opcode $1'#000+
-  '07054_E_Invalid or missing opcode'#000+
-  '07055_E_Invalid com','bination of prefix and opcode: $1'#000+
+  '07054_E_Invalid ','or missing opcode'#000+
+  '07055_E_Invalid combination of prefix and opcode: $1'#000+
   '07056_E_Invalid combination of override and opcode: $1'#000+
   '07057_E_Too many operands on line'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
-  '07061_E_Undefined local symbol $1'#000+
-  '07062_E_','Unknown label identifier $1'#000+
+  '07061','_E_Undefined local symbol $1'#000+
+  '07062_E_Unknown label identifier $1'#000+
   '07063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
   '07066_W_Modulo not supported'#000+
   '07067_E_Invalid floating point constant $1'#000+
-  '07068_E_Invalid floating point expression'#000+
-  '07069_E_Wrong symbol ty','pe'#000+
+  '07068_E_Invalid floating poi','nt expression'#000+
+  '07069_E_Wrong symbol type'#000+
   '07070_E_Cannot index a local var or parameter with a register'#000+
   '07071_E_Invalid segment override expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
-  '07074_No type of variable specified'#000+
-  '07075_E_assemb','ler code not returned to text section'#000+
+  '07074_No type',' of variable specified'#000+
+  '07075_E_assembler code not returned to text section'#000+
   '07076_E_Not a directive or local symbol $1'#000+
   '07077_E_Using a defined name as a local label'#000+
   '07078_E_Dollar token is used without an identifier'#000+
-  '07079_W_32bit constant created for address'#000+
-  '07080_N_.align is t','arget specific, use .balign or .p2align'#000+
+  '07079_W_32bit constant cr','eated for address'#000+
+  '07080_N_.align is target specific, use .balign or .p2align'#000+
   '07081_E_Can'#039't access fields directly for parameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
-  '07083_E_No size specified and unable to determine the size of the oper'+
-  'ands'#000+
-  '07084_E_Cannot us','e RESULT in this function'#000+
+  '07083_E_No size specified and unable to determine the s','ize of the op'+
+  'erands'#000+
+  '07084_E_Cannot use RESULT in this function'#000+
   '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
   '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
   '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
-  '07089_E_Char < not allowed here'#000+
-  '07090_E_Char > no','t allowed here'#000+
+  '07089_E_Char',' < not allowed here'#000+
+  '07090_E_Char > not allowed here'#000+
   '07093_W_ALIGN not supported'#000+
   '07094_E_Inc and Dec cannot be together'#000+
   '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 t','he size of the op'+
+  '07098_W_No siz','e 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+
   '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 ope',
-  'rands, using BYTE as default'#000+
+  '07101_W_No size specified and un','able to determine the size of the op'+
+  'erands, using BYTE as default'#000+
   '07102_W_Use of +offset(%ebp) for parameters invalid here'#000+
   '07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+
   #000+
-  '07104_W_Use of -offset(%ebp) is not recommended for local variable acc'+
-  'ess'#000+
-  '07105_W_U','se of -offset(%esp), access may cause a crash or value may '+
-  'be lost'#000+
+  '07104_W_Use of -offset(%ebp) is not recommende','d for local variable a'+
+  'ccess'#000+
+  '07105_W_Use of -offset(%esp), access may cause a crash or value may be'+
+  ' lost'#000+
   '07106_E_VMTOffset must be used in combination with a virtual method, a'+
   'nd "$1" is not virtual'#000+
   '08000_F_Too many assembler files'#000+
-  '08001_F_Selected assembler output not supported',#000+
+  '08001_F_Se','lected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
   '08003_F_Direct not support for binary writers'#000+
   '08004_E_Allocating of data is only allowed in bss section'#000+
   '08005_F_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
-  '08007_E_Asm: $1 invalid combination of',' opcode and operands'#000+
+  '0','8007_E_Asm: $1 invalid combination of opcode and operands'#000+
   '08008_E_Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
-  '08012_E_Asm: Short jump is out of range $1'#000+
-  '08013_E','_Asm: Undefined label $1'#000+
+  '08012_E_Asm: ','Short jump is out of range $1'#000+
+  '08013_E_Asm: Undefined label $1'#000+
   '08014_E_Asm: Comp type not supported for this target'#000+
   '08015_E_Asm: Extended type not supported for this target'#000+
   '08016_E_Asm: Duplicate label $1'#000+
   '08017_E_Asm: Redefined label $1'#000+
-  '08018_E_Asm: First defined here'#000+
-  '08019_E_A','sm: Invalid register $1'#000+
+  '0801','8_E_Asm: First defined here'#000+
+  '08019_E_Asm: Invalid register $1'#000+
   '08020_E_Asm: 16 or 32 Bit references not supported'#000+
   '08021_E_Asm: 64 Bit operands not supported'#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
-  '09002_E_Can'#039't create assembler file: $1'#000+
-  '09003_E_Can',#039't create object file: $1'#000+
+  '09002_E_Can'#039't ','create assembler file: $1'#000+
+  '09003_E_Can'#039't create object file: $1'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
   '09005_E_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_E_Error while assembling exitcode $1'#000+
-  '09008_E_Can'#039't call the assembler, error ','$1 switching to external'+
+  '090','08_E_Can'#039't call the assembler, error $1 switching to external'+
   ' assembling'#000+
   '09009_I_Assembling $1'#000+
   '09010_I_Assembling with smartlinking $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
   '09012_W_Library $1 not found, Linking may fail !'#000+
-  '09013_E_Error while linking'#000+
-  '09014_E_Can'#039't cal','l the linker, switching to external linking'#000+
+  '09013_E_','Error while linking'#000+
+  '09014_E_Can'#039't call the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
   '09016_E_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
-  '09019_E_Creation of Dynamic/Shared Libraries not sup','ported'#000+
+  '09019_E_Creatio','n 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 smart lin'+
   'king'#000+
-  '09024_T_unit $1 can'#039't be smart linked, swi','tching to static linki'+
+  '09024','_T_unit $1 can'#039't be smart linked, switching to static linki'+
   'ng'#000+
   '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
   'g'#000+
   '09026_E_unit $1 can'#039't be smart or static linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
-  '09028_D_Calling resource compiler "$1" with "$2" a','s command line'#000+
+  '09028_D_Calli','ng resource compiler "$1" with "$2" as command line'#000+
   '09128_F_Can'#039't post process executable $1'#000+
   '09129_F_Can'#039't open executable $1'#000+
   '09130_X_Size of Code: $1 bytes'#000+
   '09131_X_Size of initialized data: $1 bytes'#000+
-  '09132_X_Size of uninitialized data: $1 bytes'#000+
-  '09133_X_Stack space reserved: $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+
   '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
@@ -697,110 +698,110 @@ const msgtxt : array[0..000179,1..240] of char=(
   '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
-  '10006_U_PPU File too short'#000+
-  '10007_U_PPU Invalid Header (no PPU a','t the begin)'#000+
+  '10006_U_PPU File too short',#000+
+  '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
   '10009_U_PPU is compiled for another processor'#000+
   '10010_U_PPU is compiled 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+
+  '10013_F_Can'#039't Write PPU-Fil','e'#000+
   '10014_F_Error reading PPU-File'#000+
-  '1001','5_F_unexpected end of 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+
+  '1002','1_F_Can'#039't compile 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 err','ors compiling module, stopping'#000+
+  '10027_U_Load from $1 ($2) unit $3'#000+
   '10028_U_Recompiling $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
-  '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '1003','2_U_Recompiling unit, obj and asm are 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+
   '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,
+  '10036_U_Second load for unit ','$1'#000+
+  '10037_U_PPU Check file $1 time $2'#000+
   '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
   '10041_U_File $1 is newer than 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 implementat','ion units from $1'#000+
+  '10043_U_Loading interface unit','s from $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 ','second compile: $1'#000+
+  '10049_U_No reload, is call','er: $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 u','nit $1'#000+
+  '10056_U_Finished load','ing 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_O_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported'#000+
-  '11002_W_DEF file can be created only for OS/2'#000+
-  '11003_E_nest','ed response files are not supported'#000+
+  '11002_W_DEF file can ','be created only for OS/2'#000+
+  '11003_E_nested response files are not supported'#000+
   '11004_F_No source file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
-  '11008_F_Too many config files nested'#000+
-  '11009_F_Unable to open f','ile $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 en','d of the file'#000+
+  '11014_F_too many ENDI','Fs'#000+
+  '11015_F_open conditional at the end of the file'#000+
   '11016_W_Debug information generation is not supported by this executab'+
   'le'#000+
   '11017_H_Try recompiling with -dGDB'#000+
   '11018_W_You are using the obsolete switch $1'#000+
-  '11019_W_You are using the obsolete switch $1, please use $2'#000+
-  '11020_N_Switc','hing assembler to default source writing assembler'#000+
+  '11019_W_You are using the obsolete s','witch $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','_Handling option "$1"'#000+
+  '11027_T_Readin','g options from environment $1'#000+
+  '11028_D_Handling option "$1"'#000+
   '11029__*** press enter ***'#000+
   '11030_H_Start of reading config file $1'#000+
   '11031_H_End of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
-  '11036_D_interpreting firstpass option "$1"'#000+
-  '11033_D_interpreting file option "$1"',#000+
+  '11036_D_interpreting firstpass option "$1"'#000,
+  '11033_D_interpreting file option "$1"'#000+
   '11034_D_Reading config file "$1"'#000+
   '11035_D_found source file name "$1"'#000+
   '11039_E_Unknown code page'#000+
   '11040_F_Config file $1 is a directory'#000+
-  '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
-  'ugging disabled'#000+
-  '11023_Free Pascal Co','mpiler version $FPCFULLVERSION [$FPCDATE] for $F'+
-  'PCCPU'#010+
+  '11041_W_Assembler output selected "$1" cannot generate debug info, de',
+  'bugging disabled'#000+
+  '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
+  'CPU'#010+
   'Copyright (c) 1993-2007 by Florian Klaempfl'#000+
   '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
-  'Compiler CPU Target: $FPCCPU'#010+
+  'Compiler CPU Target: $FPCCP','U'#010+
   #010+
   'Supported targets:'#010+
   '  $OSTARGETS'#010+
   #010+
-  'S','upported CPU instruction sets:'#010+
+  'Supported CPU instruction sets:'#010+
   '  $INSTRUCTIONSETS'#010+
   #010+
   'Supported FPU instruction sets:'#010+
@@ -809,100 +810,100 @@ const msgtxt : array[0..000179,1..240] of char=(
   'Supported Optimizations:'#010+
   '  $OPTIMIZATIONS'#010+
   #010+
-  'This program comes under the GNU General Public Licence'#010+
-  'For more information read COPYING.F','PC'#010+
+  'This program comes under the GNU General Public Licenc','e'#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+
-  '**2al_list sourcecode lines ','in assembler file'#010+
+  '**1a_the compiler doesn'#039't delete the generated assemb','ler file'#010+
+  '**2al_list sourcecode lines in assembler file'#010+
   '**2an_list node info in assembler file'#010+
   '*L2ap_use pipes instead of creating temporary assembler files'#010+
   '**2ar_list register allocation/release info in assembler file'#010+
-  '**2at_list temp allocation/release info in assembler file'#010+
-  '*','*1A<x>_output format:'#010+
+  '**2at_list temp alloca','tion/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*2Anasmwin32_Win32 object file using Nasm'#010+
-  '3*2Anasmwdosx_Win32/WDOSX o','bject file using Nasm'#010+
+  '3*2Anasmwin32_Win32 object file u','sing 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*2Aelf_elf32 (Linux) using internal writer'#010+
-  '3*2Acoff_coff (Go32v2) u','sing internal writer'#010+
+  '3*2Aelf_elf32 (Linux) using int','ernal 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 Syntax (old GAS)'#010+
-  '6*2Amot_Standard Motorola assembler'#010+
-  'A*2Aas_assembl','e using GNU AS'#010+
+  '6*2Amot_Stand','ard 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 generation options:'#010+
-  '**2Cc<x>_set default calling convention to <x>'#010+
-  '**2C','D_create also dynamic library (not supported)'#010+
+  '**2Cc<x>_set d','efault 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+
   '**2Cg_Generate PIC code'#010+
-  '**2Ch<n>_<n> bytes heap (between 1023 an','d 67107840)'#010+
+  '**2','Ch<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+
   '**2CP<x>=<y>_ packing settings'#010+
-  '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or D','EFAULT or NORMAL, 2, '+
+  '**3CPPACKS','ET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, '+
   '4 and 8'#010+
   '**2Cr_range checking'#010+
   '**2CR_verify object method call validity'#010+
   '**2Cs<n>_set stack size to <n>'#010+
   '**2Ct_stack checking'#010+
   '**2CX_create also smartlinked library'#010+
-  '**1d<x>_defines the symbol <x>'#010+
+  '**1d<x>_defines the sy','mbol <x>'#010+
   '**1D_generate a DEF file'#010+
-  '**2','Dd<x>_set description 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+
   '**1fPIC_same as -Cg'#010+
   '**1F<x>_set file names and paths:'#010+
-  '**2Fa<x>[,y]_for a program load first units <x> and [y] ','before uses '+
+  '**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+
   '**2Fe<x>_redirect error output to <x>'#010+
-  '**2FE<x>_set exe/unit output path 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>_adds <x> to library 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 debug','ger information:'#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 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+
-  '*g2gp_preserve case in stabs symbol names'#010+
-  '*g2gt','_trash local variables (to detect uninitialized uses)'#010+
+  '*g2gp_pres','erve case in stabs symbol names'#010+
+  '*g2gt_trash local variables (to detect uninitialized uses)'#010+
   '*g2gv_generates programs traceable with valgrind'#010+
   '*g2gw_generate dwarf debugging info'#010+
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
-  '**2iV_return compiler version'#010+
-  '**2iW_return full compiler ','version'#010+
+  '**2iV_return compile','r version'#010+
+  '**2iW_return full compiler version'#010+
   '**2iSO_return compiler OS'#010+
   '**2iSP_return compiler processor'#010+
   '**2iTO_return target OS'#010+
@@ -910,71 +911,71 @@ const msgtxt : array[0..000179,1..240] of char=(
   '**1I<x>_adds <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#010+
-  '**1M<x>_set language mode to <x>'#010+
-  '**2Mf','pc_free pascal dialect (default)'#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+
-  '**2Mmacpas_tries to be compatible to the maci','ntosh pascal dialects'#010+
+  '**2Mmacp','as_tries to be compatible to the macintosh pascal dialects'#010+
   '**1n_don'#039't read the default config file'#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 opti','mizations (quick and debugger friendly)'#010+
+  '**2O-_dis','able optimizations'#010+
+  '**2O1_level 1 optimizations (quick and debugger friendly)'#010+
   '**2O2_level 2 optimizations (-O1 + quick optimizations)'#010+
   '**2O3_level 3 optimizations (-O2 + slow optimizations)'#010+
   '**2Oa<x>=<y>_set alignment'#010+
-  '**2Oo[NO]<x>_enable or disable optimizations, see fpc -i for p','ossibl'+
+  '**2Oo[NO]<x>_enable or di','sable optimizations, see fpc -i for possibl'+
   'e values'#010+
   '**2Op<x>_set target cpu for optimizing, see fpc -i for possible values'+
   #010+
   '**2Os_generate smaller code'#010+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
-  '**1R<x>_assembler reading style:'#010+
-  '**2Rdefault_use default assembler',#010+
+  '**1R<x>_assembler reading sty','le:'#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 (*=,+=,/= and -=)'#010+
+  '**2Sc_supports operators like C (*=,+=,/= and ','-=)'#010+
   '**2Sa_include assertion code.'#010+
-  '**2','Sd_same as -Mdelphi'#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 : compiler stops also after notes'#010+
-  '**3*_h : c','ompiler stops also after hints'#010+
+  '**3*_n : compi','ler 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+
   '**2Sk_load fpcylix unit'#010+
   '**2SI<x>_set interface style to <x>'#010+
-  '**3SIcom_COM compatible interface (default)'#010+
-  '**3SIcorba_CORBA compati','ble interface'#010+
+  '**3SIcom_COM compatible interfa','ce (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+
-  '**2Sx_enable exception keywords (default in Delphi','/ObjFPC modes)'#010+
+  '**2Sx_enable ','exception keywords (default in Delphi/ObjFPC modes)'#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 (in','cluding EMX/RSX extender)'#010+
+  '**1T<x>_Target opera','ting system:'#010+
+  '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
   '3*2Tfreebsd_FreeBSD'#010+
   '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
   '3*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_O','S/2 / eComStation'#010+
+  '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
   '3*2Twatcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
@@ -982,8 +983,8 @@ const msgtxt : array[0..000179,1..240] of char=(
   '3*2Twince_Windows CE'#010+
   '4*2Tlinux_Linux'#010+
   '6*2Tamiga_Commodore Amiga'#010+
-  '6*2Tatari_Atari ST/STe/TT'#010+
-  '6*2Tlinux_Lin','ux/m68k'#010+
+  '6*','2Tatari_Atari ST/STe/TT'#010+
+  '6*2Tlinux_Linux/m68k'#010+
   '6*2Tmacos_Macintosh m68k (not supported)'#010+
   '6*2Tpalmos_PalmOS'#010+
   'A*2Tlinux_Linux'#010+
@@ -991,7 +992,7 @@ const msgtxt : array[0..000179,1..240] of char=(
   'P*2Tamiga_AmigaOS 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','*2Tmacos_Mac OS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
   'S*2Tlinux_Linux'#010+
   '**1u<x>_undefines the symbol <x>'#010+
@@ -999,47 +1000,48 @@ const msgtxt : array[0..000179,1..240] of char=(
   '**2Un_don'#039't check the unit name'#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+
+  '**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*_h : Show hints                  c : S','how conditionals'#010+
+  '**2*_','h : Show hints                  c : Show conditionals'#010+
   '**2*_i : Show general info           d : Show debug info'#010+
   '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
-  '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
-  '**2*_b : Write file names ','messages with full path'#010+
+  '**2*_a : Show everything             x : Executable info (W','in32 only'+
+  ')'#010+
+  '**2*_b : Write file names messages with full path'#010+
   '**2*_v : write fpcdebug.txt with     p : Write tree.log with parse tre'+
   'e'#010+
   '**2*_    lots of debugging info'#010+
   '3*1W<x>_Win32-like target options'#010+
   '3*2WB_Create a relocatable image'#010+
-  '3*2WB<x>_Set Image base to Hexadecimal <x> va','lue'#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 type application'#010+
-  '3*2WN_Do not generate relocation code (necessary fo','r debugging)'#010+
+  '3*2WN_Do not g','enerate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   'P*2WC_Specify console type application (Mac OS only)'#010+
   'P*2WG_Specify graphic type application (Mac OS only)'#010+
-  'P*2WT_Specify tool type application (MPW tool, Mac OS only)'#010+
+  'P*2WT_Specify tool type application (MPW tool, Mac OS',' only)'#010+
   '**1X_executable options:'#010+
-  '**2Xc','_pass --shared to the linker (Unix only)'#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+
   '**2Xe_use external linker'#010+
-  '**2XD_try to link units dynamic          (defines FPC_LINK_DYNAMIC)'#010+
+  '**2XD_try to link units dynamic          (defines FPC_LINK_DYNAM','IC)'#010+
   '**2Xi_use internal linker'#010+
-  '**2Xm_g','enerate 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+
   '**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+
+  '**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+
-  '**2XX_try to link units smart            (defines FPC_LINK_SMART)'#010+
+  '**2XX_try to link units smart            (defines FPC_LINK_SM','ART)'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+
-  '**1h_','shows this help without waiting'#000
+  '**1h_shows this help without waiting'#000
 );

+ 7 - 1
compiler/nadd.pas

@@ -962,7 +962,13 @@ implementation
                        result := hp;
                        exit;
 {$endif addstringopt}
-                     end;
+                     end
+                  end
+                else if not(nodetype in [ltn,lten,gtn,gten,unequaln,equaln]) then
+                  begin
+                    CGMessage3(type_e_operator_not_supported_for_types,node2opstr(nodetype),ld.typename,rd.typename);
+                    result:=cnothingnode.create;
+                    exit;
                   end;
                end
              { There is a widechar? }

+ 2 - 0
compiler/pdecsub.pas

@@ -1088,6 +1088,8 @@ implementation
                 end;
             end;
         end;
+        if pd.returndef.typ=filedef then
+          message(parser_e_illegal_function_result);
         { support procedure proc stdcall export; }
         if not(check_proc_directive(false)) then
           consume(_SEMICOLON);

+ 1 - 1
compiler/pexpr.pas

@@ -2088,10 +2088,10 @@ implementation
                                  begin
                                    p2:=parse_paras(false,true,_RKLAMMER);
                                    consume(_RKLAMMER);
-                                   p1:=translate_disp_call(p1,p2,dispatchstring);
                                  end
                                else
                                  p2:=nil;
+                               p1:=translate_disp_call(p1,p2,dispatchstring);
                              end
                            else { Error }
                              Consume(_ID);

+ 9 - 2
ide/fp.pas

@@ -30,6 +30,9 @@ program FP;
 (**********************************************************************)
 
 uses
+{$ifdef Windows}
+  windows,
+{$endif Windows}
 {$ifndef NODEBUG}
 {$ifdef Windows}
   fpcygwin,
@@ -523,9 +526,13 @@ BEGIN
 {$ifdef VESA}
   DoneVESAScreenModes;
 {$endif}
-{$ifdef unix}
+{$if defined(unix)}
   Keyboard.RestoreStartMode;
-{$endif unix}
+{$endif defined(unix)}
+{$if defined(windows)}
+  writeln(hexstr(StartupConsoleMode,8));
+  SetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)),StartupConsoleMode);
+{$endif defined(windows)}
   StreamError:=nil;
 {$ifdef DEBUG}
   if CloseImmediately then

+ 1 - 1
ide/fpviews.pas

@@ -4232,7 +4232,7 @@ begin
   else
 {$endif NODEBUG}
     R2.Move(0,2);
-  Insert(New(PStaticText, Init(R2, ^C'Copyright (C) 1998-2006 by')));
+  Insert(New(PStaticText, Init(R2, ^C'Copyright (C) 1998-2007 by')));
   R2.Move(0,2);
   Insert(New(PStaticText, Init(R2, ^C'B‚rczi G bor')));
   R2.Move(0,1);

+ 1 - 1
rtl/arm/arm.inc

@@ -23,7 +23,7 @@ const
 
 procedure fpc_cpuinit;
 begin
-{$if not(defined(wince)) and not(defined(gba)) and not(defined(nds))}
+{$if not(defined(wince)) and not(defined(gba)) and not(defined(nds)) and not(defined(FPUSOFT)) and not(defined(FPULIBGCC))}
   asm
     rfs r0
     and r0,r0,#0xffe0ffff

+ 3 - 3
rtl/arm/mathu.inc

@@ -212,7 +212,7 @@ end;
 }
 
 
-{$if not(defined(gba)) and not(defined(nds))}
+{$if not(defined(gba)) and not(defined(nds)) and not(defined(FPUSOFT)) and not(defined(FPULIBGCC))}
 const
   _FPU_MASK_IM  =  $00010000;      { invalid operation      }
   _FPU_MASK_ZM  =  $00020000;      { divide by zero         }
@@ -263,7 +263,7 @@ function GetExceptionMask: TFPUExceptionMask;
   var
     cw : dword;
   begin
-{$if not(defined(gba)) and not(defined(nds))}
+{$if not(defined(gba)) and not(defined(nds)) and not(defined(FPUSOFT)) and not(defined(FPULIBGCC))}
     Result:=[];
     cw:=FPU_GetCW;
 
@@ -294,7 +294,7 @@ function SetExceptionMask(const Mask: TFPUExceptionMask): TFPUExceptionMask;
   var
     cw : dword;
   begin
-{$if not(defined(gba)) and not(defined(nds))}
+{$if not(defined(gba)) and not(defined(nds)) and not(defined(FPUSOFT)) and not(defined(FPULIBGCC))}
     cw:=FPU_GetCW or _FPU_MASK_ALL;
 
     if exInvalidOp in Mask then

+ 10 - 0
rtl/win32/sysinitcyg.pp

@@ -28,6 +28,12 @@ unit sysinitcyg;
     procedure Cygwin_crt0(p : pointer);cdecl;external name 'cygwin_crt0';
     procedure __main;cdecl;external name '__main';
 
+    const
+      STD_INPUT_HANDLE = dword(-10);
+
+    function GetStdHandle(nStdHandle:DWORD) : THandle; stdcall; external 'kernel32' name 'GetStdHandle';
+    function GetConsoleMode(hConsoleHandle: THandle; var lpMode: DWORD): Boolean; stdcall; external 'kernel32' name 'GetConsoleMode';
+
     procedure CMainEXE;cdecl;
       begin
         asm
@@ -57,6 +63,10 @@ unit sysinitcyg;
           subl   $0x8,%esp
           andl   $0xfffffff0,%esp
         end;
+        { it seems cygwin messed around with the console mode so we've to
+          store the startup console mode before cygwin can do anything (FK)
+        }
+        GetConsoleMode(GetStdHandle((Std_Input_Handle)),StartupConsoleMode);
         Cygwin_crt0(@CMainEXE);
       end;
 

+ 2 - 0
rtl/win32/system.pp

@@ -95,6 +95,8 @@ var
   MainInstance,
   cmdshow     : longint;
   DLLreason,DLLparam:longint;
+  StartupConsoleMode : DWORD;
+
 type
   TDLL_Process_Entry_Hook = function (dllparam : longint) : longbool;
   TDLL_Entry_Hook = procedure (dllparam : longint);

+ 5 - 0
tests/webtbf/tw8780a.pp

@@ -0,0 +1,5 @@
+{ %fail }
+var c,c1,c2 : char;
+begin
+  c:=c1 or c2; // no error
+end.

+ 5 - 0
tests/webtbf/tw8780b.pp

@@ -0,0 +1,5 @@
+{ %fail }
+var c,c1,c2 : char;
+begin
+  c:='a' or 'b'; // Error: Operation "or" not supported for types "Char" and "Char"
+end.

+ 5 - 0
tests/webtbf/tw8780c.pp

@@ -0,0 +1,5 @@
+{ %fail }
+var c,c1,c2 : char;
+begin
+  c:=#1 or #2; // Error: Operation "or" not supported for types "Char" and "Char"
+end.

+ 25 - 0
tests/webtbf/tw8781.pp

@@ -0,0 +1,25 @@
+{ %fail }
+program packer;
+type
+    HeaderStr=record
+    Name:Array[1..20] of char;
+    Objects:byte;
+    FirstObject:longint;
+    end;
+
+    ObjStr=record
+    Name:array[1..8] of char;
+    Size:longint;
+    Width:integer;
+    Height:integer;
+    ObjType:byte;
+    NextObject:longint
+    end;
+
+function openfile(filepath:string):file;
+begin
+end;
+
+begin
+
+end.