Merged revisions 11475,11487-11488,11490,11504-11505,11518-11521,11523,11528,11535,11551,11553,11555,11557,11562,11564,11571,11588,11619,11621-11622,11628,11664-11667,11670,11683,11685,11689-11692,11694-11696,11698,11701-11702,11705-11707,11712-11718,11723-11726,11728-11729,11733-11737,11778,11780-11781,11785,11810,11822,11831,11836,11838,11848,11872,11876-11878,11881-11883,11889,11891-11895,11898-11902,11916 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r11475 | florian | 2008-07-28 17:56:23 +0200 (Mon, 28 Jul 2008) | 2 lines
  
  * properties properly set
........
  r11504 | florian | 2008-08-03 11:31:50 +0200 (Sun, 03 Aug 2008) | 3 lines
  
  + defined FPC_FULLVERSION as integer constant containing the version, 
    release and patch level are always two digits so the version can 
    be compared numerically: so 2.2.2 results in 20202, resolves #11568
........
  r11505 | florian | 2008-08-03 12:34:41 +0200 (Sun, 03 Aug 2008) | 1 line
  
  * fixes compiler crash with out of memory on illegal array declarations
........
  r11838 | florian | 2008-09-28 22:16:13 +0200 (Sun, 28 Sep 2008) | 2 lines
  
  * forbid access to properties in class methods
  * readability fix
........
  r11898 | florian | 2008-10-14 19:06:55 +0200 (Tue, 14 Oct 2008) | 2 lines
  
  * fix range check error in options handling, resolves #12365
  + better error output (print filename and line number) for config file directive errors
........
  r11916 | florian | 2008-10-18 16:07:42 +0200 (Sat, 18 Oct 2008) | 1 line
  
  + missing includes of fpcdefs.inc added
........

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

.gitattributes

@@ -460,7 +460,7 @@ compiler/systems/i_go32v2.pas svneol=native#text/plain
 compiler/systems/i_linux.pas svneol=native#text/plain
 compiler/systems/i_macos.pas svneol=native#text/plain
 compiler/systems/i_morph.pas svneol=native#text/plain
-compiler/systems/i_nds.pas -text
+compiler/systems/i_nds.pas svneol=native#text/plain
 compiler/systems/i_nwl.pas svneol=native#text/plain
 compiler/systems/i_nwm.pas svneol=native#text/plain
 compiler/systems/i_os2.pas svneol=native#text/plain
@@ -482,7 +482,7 @@ compiler/systems/t_go32v2.pas svneol=native#text/plain
 compiler/systems/t_linux.pas svneol=native#text/plain
 compiler/systems/t_macos.pas svneol=native#text/plain
 compiler/systems/t_morph.pas svneol=native#text/plain
-compiler/systems/t_nds.pas svneol=native#text/x-pascal
+compiler/systems/t_nds.pas svneol=native#text/plain
 compiler/systems/t_nwl.pas svneol=native#text/plain
 compiler/systems/t_nwm.pas svneol=native#text/plain
 compiler/systems/t_os2.pas svneol=native#text/plain
@@ -496,14 +496,14 @@ compiler/tgobj.pas svneol=native#text/plain
 compiler/tokens.pas svneol=native#text/plain
 compiler/utils/Makefile svneol=native#text/plain
 compiler/utils/Makefile.fpc svneol=native#text/plain
-compiler/utils/README -text
-compiler/utils/dummyas.pp -text
+compiler/utils/README svneol=native#text/plain
+compiler/utils/dummyas.pp svneol=native#text/plain
 compiler/utils/fixlog.pp svneol=native#text/plain
 compiler/utils/fixmsg.pp svneol=native#text/plain
 compiler/utils/fixnasm.pp svneol=native#text/plain
 compiler/utils/fixtab.pp svneol=native#text/plain
 compiler/utils/fpc.cft svneol=native#text/plain
-compiler/utils/fpc.mpw -text
+compiler/utils/fpc.mpw svneol=native#text/plain
 compiler/utils/fpc.pp svneol=native#text/plain
 compiler/utils/fpccfg.inc svneol=native#text/plain
 compiler/utils/fpcfg.inc svneol=native#text/plain
@@ -525,11 +525,11 @@ compiler/utils/mkx86ins.pp svneol=native#text/plain
 compiler/utils/mkx86reg.pp svneol=native#text/plain
 compiler/utils/msg2inc.pp svneol=native#text/plain
 compiler/utils/msgdif.pp svneol=native#text/plain
-compiler/utils/msgused.pl -text
+compiler/utils/msgused.pl svneol=native#text/plain
 compiler/utils/ppudump.pp svneol=native#text/plain
 compiler/utils/ppufiles.pp svneol=native#text/plain
 compiler/utils/ppumove.pp svneol=native#text/plain
-compiler/utils/samplecfg -text
+compiler/utils/samplecfg svneol=native#text/plain
 compiler/utils/usubst.pp svneol=native#text/plain
 compiler/verbose.pas svneol=native#text/plain
 compiler/version.pas svneol=native#text/plain
@@ -6246,6 +6246,8 @@ tests/tbf/tb0204a.pp svneol=native#text/plain
 tests/tbf/tb0205.pp svneol=native#text/plain
 tests/tbf/tb0208.pp svneol=native#text/plain
 tests/tbf/tb0209.pp svneol=native#text/plain
+tests/tbf/tb0212.pp svneol=native#text/plain
+tests/tbf/tb0213.pp svneol=native#text/plain
 tests/tbf/ub0115.pp svneol=native#text/plain
 tests/tbf/ub0149.pp svneol=native#text/plain
 tests/tbf/ub0158a.pp svneol=native#text/plain
@@ -7673,6 +7675,10 @@ tests/webtbf/tw10998a.pp svneol=native#text/plain
 tests/webtbf/tw11254a.pp svneol=native#text/plain
 tests/webtbf/tw1157a.pp svneol=native#text/plain
 tests/webtbf/tw11970.pp svneol=native#text/plain
+tests/webtbf/tw12365a.cfg svneol=native#text/plain
+tests/webtbf/tw12365a.pp svneol=native#text/plain
+tests/webtbf/tw12365b.cfg svneol=native#text/plain
+tests/webtbf/tw12365b.pp svneol=native#text/plain
 tests/webtbf/tw1238.pp svneol=native#text/plain
 tests/webtbf/tw1251a.pp svneol=native#text/plain
 tests/webtbf/tw1270.pp svneol=native#text/plain
@@ -8066,6 +8072,7 @@ tests/webtbs/tw11435c.pp svneol=native#text/plain
 tests/webtbs/tw11436.pp svneol=native#text/plain
 tests/webtbs/tw1152.pp svneol=native#text/plain
 tests/webtbs/tw11543.pp svneol=native#text/plain
+tests/webtbs/tw11568.pp svneol=native#text/plain
 tests/webtbs/tw1157.pp svneol=native#text/plain
 tests/webtbs/tw1157b.pp svneol=native#text/plain
 tests/webtbs/tw11619.pp svneol=native#text/plain

compiler/msg/errore.msg

@@ -2369,13 +2369,13 @@ option_target_is_already_set=11011_W_Target is already set to: $1
 option_no_shared_lib_under_dos=11012_W_Shared libs not supported on DOS platform, reverting to static
 % If you specify \var{-CD} for the \dos platform, this message is displayed.
 % The compiler supports only static libraries under \dos.
-option_too_many_ifdef=11013_F_too many IF(N)DEFs
+option_too_many_ifdef=11013_F_In options file $1 at line $2 too many #IF(N)DEFs encountered
 % The \var{\#IF(N)DEF} statements in the options file are not balanced with
 % the \var{\#ENDIF} statements.
-option_too_many_endif=11014_F_too many ENDIFs
+option_too_many_endif=11014_F_In options file $1 at line $2 unexpected #ENDIFs encountered
 % The \var{\#IF(N)DEF} statements in the options file are not balanced with
 % the \var{\#ENDIF} statements.
-option_too_less_endif=11015_F_open conditional at the end of the file
+option_too_less_endif=11015_F_Open conditional at the end of the options file
 % The \var{\#IF(N)DEF} statements in the options file are not balanced with
 % the \var{\#ENDIF} statements.
 option_no_debug_support=11016_W_Debug information generation is not supported by this executable
@@ -2442,6 +2442,8 @@ option_ppc386_deprecated=11042_W_Use of ppc386.cfg is deprecated, please use fpc
 % Using ppc386.cfg is still supported for historical reasons, however, for a multiplatform
 % system the naming makes no sense anymore. Please continue to use fpc.cfg instead.
 %\end{description}
+option_else_without_if=11043_F_In options file $1 at line $2 #ELSE directive without #IF(N)DEF found
+% An \var{\#ELSE} statement was found in the options file without a matching \var{\#IF(N)DEF} statement.
 # EndOfTeX
 
 #

compiler/msgidx.inc

@@ -735,13 +735,14 @@ const
   option_config_is_dir=11040;
   option_confict_asm_debug=11041;
   option_ppc386_deprecated=11042;
+  option_else_without_if=11043;
   option_logo=11023;
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 45997;
+  MsgTxtSize = 46171;
 
   MsgIdxMax : array[1..20] of longint=(
     24,87,250,84,63,50,108,22,135,61,
-    43,1,1,1,1,1,1,1,1,1
+    44,1,1,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000191] of string[240]=(
+const msgtxt : array[0..000192] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000191,1..240] of char=(
+const msgtxt : array[0..000192,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -791,309 +791,311 @@ const msgtxt : array[0..000191,1..240] of char=(
   '11011_W_Tar','get 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 the file'#000+
-  '11016_W_Debug information generation is not ','supported by this execut'+
-  'able'#000+
+  '11013_F_In options file $1 at line $2 too many #IF(N)DEFs encountered'#000+
+  '11014_F_In options file $1 at line $2 unexpected #ENDIFs encountered'#000+
+  '1101','5_F_Open conditional at the end of the options file'#000+
+  '11016_W_Debug information generation is not supported by this executab'+
+  'le'#000+
   '11017_H_Try recompiling with -dGDB'#000+
   '11018_W_You are using the obsolete switch $1'#000+
-  '11019_W_You are using the obsolete switch $1, please use $2'#000+
+  '11019_W_You are using the obsolete ','switch $1, please use $2'#000+
   '11020_N_Switching assembler to default source writing assembler'#000+
-  '11021_W','_Assembler output selected "$1" is not compatible with "$2"'#000+
+  '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
-  '11027_T_Reading options from environment $1'#000+
+  '11027_T_Readi','ng options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
   '11029__*** press enter ***'#000+
-  '11030_H_S','tart of reading config file $1'#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+
+  '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 fil','e name "$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+
+  '11041_W_Assembler output selected "$1" cannot generate debug info, d','e'+
+  'bugging disabled'#000+
   '11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+
-  '11023_Free',' Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $F'+
-  'PCCPU'#010+
-  'Copyright (c) 1993-2008 by Florian Klaempfl'#000+
+  '11043_F_In options file $1 at line $2 #ELSE directive without #IF(N)DE'+
+  'F found'#000+
+  '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
+  'CPU'#010+
+  'Co','pyright (c) 1993-2008 by Florian Klaempfl'#000+
   '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
   'Compiler CPU Target: $FPCCPU'#010+
   #010+
   'Supported targets:'#010+
-  '  $OS','TARGETS'#010+
+  '  $OSTARGETS'#010+
   #010+
   'Supported CPU instruction sets:'#010+
   '  $INSTRUCTIONSETS'#010+
   #010+
-  'Supported FPU instruction sets:'#010+
+  'Suppo','rted FPU instruction sets:'#010+
   '  $FPUINSTRUCTIONSETS'#010+
   #010+
   'Supported Optimizations:'#010+
   '  $OPTIMIZATIONS'#010+
   #010+
   'This program comes under the GNU General Public Licence'#010+
-  'For more information read',' COPYING.FPC'#010+
+  'For more information read COPYING.FPC'#010+
   #010+
   'Report bugs,suggestions etc to:'#010+
-  '                 [email protected]'#000+
+  '                 bug','[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 sourcec','ode lines in assembler file'#010+
-  '**2an_List node info in assembler file'#010+
+  '**2al_List sourcecode lines in assembler file'#010+
+  '**2an_List node info in assembler file',#010+
   '*L2ap_Use pipes instead of creating temporary assembler files'#010+
   '**2ar_List register allocation/release info in assembler file'#010+
-  '**2at_List temp allocation/release info in assemb','ler file'#010+
+  '**2at_List temp allocation/release info in assembler file'#010+
   '**1A<x>_Output format:'#010+
-  '**2Adefault_Use default assembler'#010+
+  '**2Adefault_Use default assembler'#010,
   '3*2Aas_Assemble using GNU AS'#010+
   '3*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_Win','32/WDOSX object file using Nasm'#010+
-  '3*2Awasm_Obj file using Wasm (Watcom)'#010+
+  '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
+  '3*2Awasm_Obj file using Wasm (Watc','om)'#010+
   '3*2Anasmobj_Obj file using Nasm'#010+
   '3*2Amasm_Obj file using Masm (Microsoft)'#010+
   '3*2Atasm_Obj file using Tasm (Borland)'#010+
   '3*2Aelf_ELF (Linux) using internal writer'#010+
-  '3*2Acoff_COFF (G','o32v2) using internal writer'#010+
-  '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
+  '3*2Acoff_COFF (Go32v2) using internal writer'#010+
+  '3*2Apecoff_PE-COFF (Win32) using inte','rnal 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*2Aa','s_Assemble using GNU AS'#010+
+  'A*2Aas_Assemble using GNU AS'#010+
   'P*2Aas_Assemble using GNU AS'#010+
-  'S*2Aas_Assemble using GNU AS'#010+
+  'S*2Aas_Assemb','le 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+
+  '**2Cc<x>_Set default calling convention to <x>'#010+
   '**2CD_Create also dynamic library (not supported)'#010+
-  '**2Ce_Compilation with emulated floating point opcodes'#010+
+  '**2Ce_Compi','lation with emulated floating point opcodes'#010+
   '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
   'lues'#010+
-  '**2CF<x>_Minimal floating point constant precision (def','ault, 32, 64)'+
-  #010+
+  '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
   '**2Cg_Generate PIC code'#010+
-  '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
+  '**2Ch<n>_<n> bytes heap (bet','ween 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_Omit linking stage'#010+
   '**2Co_Check overflow of integer operations'#010+
   '**2CO_Check for possible overflow of integer operations'#010+
-  '**2Cp<x>','_Select instruction set, see fpc -i for possible values'#010+
-  '**2CP<x>=<y>_ packing settings'#010+
+  '**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+
+  '**2CP<x>=<','y>_ packing settings'#010+
   '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
   'and 8'#010+
   '**2Cr_Range checking'#010+
   '**2CR_Verify object method call validity'#010+
-  '**2Cs<n>_Set st','ack size to <n>'#010+
+  '**2Cs<n>_Set stack size to <n>'#010+
   '**2Ct_Stack checking'#010+
-  '**2CX_Create also smartlinked library'#010+
+  '**2CX_Create also smartlinked',' library'#010+
   '**1d<x>_Defines the symbol <x>'#010+
   '**1D_Generate a DEF file'#010+
   '**2Dd<x>_Set description to <x>'#010+
   '**2Dv<x>_Set DLL version to <x>'#010+
   '*O2Dw_PM application'#010+
-  '**1e<x>_Set path to exec','utable'#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+
+  '**1F<x>_Set file names',' and paths:'#010+
   '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
   'sed'#010+
   '**2Fc<x>_Set input codepage to <x>'#010+
   '**2FC<x>_Set RC compiler binary name to <x>'#010+
-  '**2FD<x>_','Set the directory where to search for compiler utilities'#010+
-  '**2Fe<x>_Redirect error output to <x>'#010+
+  '**2FD<x>_Set the directory where to search for compiler utilities'#010+
+  '**2Fe<x>_','Redirect error output to <x>'#010+
   '**2Ff<x>_Add <x> to framework path (Darwin only)'#010+
   '**2FE<x>_Set exe/unit output path to <x>'#010+
   '**2Fi<x>_Add <x> to include path'#010+
-  '**2Fl<x>_Add <x> to li','brary path'#010+
+  '**2Fl<x>_Add <x> to library path'#010+
   '**2FL<x>_Use <x> as dynamic linker'#010+
-  '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+
-  'r'#010+
+  '**2Fm<x>_Load unicod','e conversion table from <x>.txt in the compiler '+
+  'dir'#010+
   '**2Fo<x>_Add <x> to object path'#010+
   '**2Fr<x>_Load error message file <x>'#010+
   '**2FR<x>_Set resource (.res) linker to <x>'#010+
-  '**2Fu<x>_A','dd <x> to unit path'#010+
-  '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
+  '**2Fu<x>_Add <x> to unit path'#010+
+  '**2FU<x>_Set unit output path to <x>, override','s -FE'#010+
   '*g1g_Generate debug information (default format for target)'#010+
   '*g2gc_Generate checks for pointers'#010+
   '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
-  '*g2gl_Use',' line info unit (show more info with backtraces)'#010+
-  '*g2go<x>_Set debug information options'#010+
+  '*g2gl_Use line info unit (show more info with backtraces)'#010+
+  '*g2go<x>_Set debu','g information options'#010+
   '*g3godwarfsets_ Enable Dwarf set debug information (breaks gdb < 6.5)'#010+
   '*g2gp_Preserve case in stabs symbol names'#010+
   '*g2gs_Generate stabs debug information'#010+
-  '*','g2gt_Trash local variables (to detect uninitialized uses)'#010+
-  '*g2gv_Generates programs traceable with valgrind'#010+
+  '*g2gt_Trash local variables (to detect uninitialized uses)'#010+
+  '*g2gv_Ge','nerates programs traceable with valgrind'#010+
   '*g2gw_Generate dwarf-2 debug information (same as -gw2)'#010+
   '*g2gw2_Generate dwarf-2 debug information'#010+
-  '*g2gw3_Generate dwarf-3 debug infor','mation'#010+
+  '*g2gw3_Generate dwarf-3 debug information'#010+
   '**1i_Information'#010+
   '**2iD_Return compiler date'#010+
-  '**2iV_Return short compiler version'#010+
+  '**2iV_Return sh','ort compiler version'#010+
   '**2iW_Return full compiler version'#010+
   '**2iSO_Return compiler OS'#010+
   '**2iSP_Return compiler host processor'#010+
   '**2iTO_Return target OS'#010+
-  '**2iTP_Return target processor',#010+
+  '**2iTP_Return target processor'#010+
   '**1I<x>_Add <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
-  '**1l_Write logo'#010+
+  '**','1l_Write logo'#010+
   '**1M<x>_Set language mode to <x>'#010+
   '**2Mfpc_Free Pascal dialect (default)'#010+
   '**2Mobjfpc_FPC mode with Object Pascal support'#010+
   '**2Mdelphi_Delphi 7 compatibility mode'#010+
-  '**2','Mtp_TP/BP 7.0 compatibility mode'#010+
-  '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
+  '**2Mtp_TP/BP 7.0 compatibility mode'#010+
+  '**2Mmacpas_Macintosh Pascal diale','cts compatibility mode'#010+
   '**1n_Do not read the default config files'#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>_Change the name of the executable produced to <x>'#010+
   '**1O<x>_Optimizations:'#010+
   '**2O-_Disable optimizations'#010+
-  '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
+  '**2O1_Level 1 o','ptimizations (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 ali','gnment'#010+
-  '**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i for possible '+
-  'values'#010+
+  '**2Oa<x>=<y>_Set alignment'#010+
+  '**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i fo','r possibl'+
+  'e values'#010+
   '**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+
   #010+
   '**2Os_Optimize for size rather than speed'#010+
-  '**1pg_Generate profile code for gprof (defi','nes FPC_PROFILE)'#010+
+  '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
   '**1R<x>_Assembler reading style:'#010+
-  '**2Rdefault_Use default assembler for target'#010+
+  '**2Rdefault_Use ','default assembler for target'#010+
   '3*2Ratt_Read AT&T style assembler'#010+
   '3*2Rintel_Read Intel style assembler'#010+
   '6*2RMOT_Read motorola style assembler'#010+
   '**1S<x>_Syntax options:'#010+
-  '**2S2_Same a','s -Mobjfpc'#010+
+  '**2S2_Same as -Mobjfpc'#010+
   '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
-  '**2Sa_Turn on assertions'#010+
+  '**2Sa_','Turn on assertions'#010+
   '**2Sd_Same as -Mdelphi'#010+
   '**2Se<x>_Error options. <x> is a combination of the following:'#010+
   '**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
-  '**3*_w ',': Compiler also halts after warnings'#010+
-  '**3*_n : Compiler also halts after notes'#010+
+  '**3*_w : Compiler also halts after warnings'#010+
+  '**3*_n : Compiler also halts ','after notes'#010+
   '**3*_h : Compiler also halts after hints'#010+
   '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
   '**2Sh_Use ansistrings by default instead of shortstrings'#010+
-  '**2Si','_Turn on inlining of procedures/functions declared as "inline"'#010+
-  '**2Sk_Load fpcylix unit'#010+
+  '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
+  '**2','Sk_Load fpcylix unit'#010+
   '**2SI<x>_Set interface style to <x>'#010+
   '**3SIcom_COM compatible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
-  '**2Sm_Support macros like C (global',')'#010+
+  '**2Sm_Support macros like C (global)'#010+
   '**2So_Same as -Mtp'#010+
-  '**2Ss_Constructor name must be init (destructor must be done)'#010+
+  '**2Ss_Constructor name must be init (destruct','or must be done)'#010+
   '**2St_Allow static keyword in objects'#010+
   '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
   '**1s_Do not call assembler and linker'#010+
-  '**2sh_Generate s','cript to link on host'#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+
+  '**2s','r_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*2Tfreebsd_FreeBSD'#010+
-  '3*2Tgo32v2_Version 2 o','f 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*2Tne','tware_Novell Netware Module (clib)'#010+
   '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
   '3*2Tsymbian_Symbian OS'#010+
-  '3*2','Twatcom_Watcom compatible DOS extender'#010+
-  '3*2Twdosx_WDOSX DOS extender'#010+
+  '3*2Twatcom_Watcom compatible DOS extender'#010+
+  '3*2Twdosx_WDOSX DOS extende','r'#010+
   '3*2Twin32_Windows 32 Bit'#010+
   '3*2Twince_Windows CE'#010+
   '4*2Tlinux_Linux'#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux/m68k'#010+
-  '6*2Tmacos_Macintosh m68k (not support','ed)'#010+
+  '6*2Tmacos_Macintosh m68k (not supported)'#010+
   '6*2Tpalmos_PalmOS'#010+
   'A*2Tlinux_Linux'#010+
   'A*2Twince_Windows CE'#010+
-  'P*2Tamiga_AmigaOS on PowerPC'#010+
+  'P*2Tami','ga_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*2Tmorphos_MorphOS'#010+
   'S*2Tlinux_Linux'#010+
-  '**1u<x>_U','ndefines the symbol <x>'#010+
+  '**1u<x>_Undefines the symbol <x>'#010+
   '**1U_Unit options:'#010+
-  '**2Un_Do not check where the unit name matches the file name'#010+
+  '**2Un_Do not check wher','e the unit name matches the file name'#010+
   '**2Ur_Generate release unit files (never automatically recompiled)'#010+
   '**2Us_Compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combination ','of the following letters:'#010+
-  '**2*_e : Show errors (default)       0 : Show nothing (except errors)'#010+
+  '**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 : Show conditionals'#010+
-  '**2*_i : Show general info           d : Show debug info'#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*_v : Write fpcdebug.txt with     p : Write tree.log with parse tre'+
-  'e'#010+
+  '**2*_b : Write file names messages with full path'#010+
+  '**2*_v : Write fpcdebug.t','xt with     p : Write tree.log with parse t'+
+  'ree'#010+
   '**2*_    lots of debugging info'#010+
   '3*1W<x>_Target-specific options (targets)'#010+
   'A*1W<x>_Target-specific options (targets)'#010+
-  'P*1W<x>_Tar','get-specific options (targets)'#010+
-  '3*2Wb_Create a bundle instead of a library (Darwin)'#010+
+  'P*1W<x>_Target-specific options (targets)'#010+
+  '3*2Wb_Create a bundle instead of a ','library (Darwin)'#010+
   'P*2Wb_Create a bundle instead of a library (Darwin)'#010+
   'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
   '3*2WB_Create a relocatable image (Windows)'#010+
-  'A*2WB_Crea','te a relocatable image (Windows, Symbian)'#010+
-  '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
+  'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
+  '3*2WC_Specify console ty','pe application (EMX, OS/2, Windows)'#010+
   'A*2WC_Specify console type application (Windows)'#010+
   'P*2WC_Specify console type application (Classic Mac OS)'#010+
-  '3*2WD_Use DEFFILE to export funct','ions of DLL or EXE (Windows)'#010+
-  'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
+  '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
+  'A*2WD_Use DEFFILE to export functions',' of DLL or EXE (Windows)'#010+
   '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
   '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
-  'A*2WG_Specify graphic type applica','tion (Windows)'#010+
-  'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
+  'A*2WG_Specify graphic type application (Windows)'#010+
+  'P*2WG_Specify graphic type application (Classic Mac',' OS)'#010+
   '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  '3*2WR_Generate relocation cod','e (Windows)'#010+
+  '3*2WR_Generate relocation code (Windows)'#010+
   'A*2WR_Generate relocation code (Windows)'#010+
-  'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
+  'P*2WT_Specify',' MPW tool type application (Classic Mac OS)'#010+
   '**1X_Executable options:'#010+
   '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
   'ux)'#010+
-  '**2Xd_Do not use standard libra','ry search path (needed for cross comp'+
-  'ile)'#010+
-  '**2Xe_Use external linker'#010+
+  '**2Xd_Do not use standard library search path (needed for cross compil'+
+  'e)'#010+
+  '**2Xe_Use external linke','r'#010+
   '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
   'to executable'#010+
   '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
-  '**2Xi_Use internal l','inker'#010+
+  '**2Xi_Use internal linker'#010+
   '**2Xm_Generate link map'#010+
-  '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
-  's '#039'main'#039')'#010+
+  '**2XM<x>_Set the name of the '#039'main'#039' ','program routine (default'+
+  ' is '#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) (Be'+
   'OS, Linux)'#010+
-  '*','*2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeB'+
+  '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, Free','B'+
   'SD, Linux, Mac OS, Solaris)'#010+
   '**2Xs_Strip all symbols from executable'#010+
   '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
-  '**2Xt_Link with static libraries (-','static is passed to linker)'#010+
-  '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
+  '**2Xt_Link with static libraries (-static is passed to linker)'#010+
+  '**2XX_Try to smartlink units          ','   (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+
   '**1h_Shows this help without waiting'#000

compiler/options.pas

@@ -1557,12 +1557,13 @@ procedure Toption.Interpret_file(const filename : string);
   end;
 
 const
-  maxlevel=16;
+  maxlevel = 15;
 var
   f     : text;
   s, tmp,
   opts  : string;
-  skip  : array[0..maxlevel-1] of boolean;
+  skip  : array[0..maxlevel] of boolean;
+  line,
   level : longint;
   option_read : boolean;
 begin
@@ -1591,9 +1592,11 @@ begin
   Message1(option_start_reading_configfile,filename);
   fillchar(skip,sizeof(skip),0);
   level:=0;
+  line:=0;
   while not eof(f) do
    begin
      readln(f,opts);
+     inc(line);
      RemoveSep(opts);
      if (opts<>'') and (opts[1]<>';') then
       begin
@@ -1615,7 +1618,7 @@ begin
                RemoveSep(opts);
                if Level>=maxlevel then
                 begin
-                  Message(option_too_many_ifdef);
+                  Message2(option_too_many_ifdef,filename,tostr(line));
                   stopOptions(1);
                 end;
                inc(Level);
@@ -1627,7 +1630,7 @@ begin
                RemoveSep(opts);
                if Level>=maxlevel then
                 begin
-                  Message(option_too_many_ifdef);
+                  Message2(option_too_many_ifdef,filename,tostr(line));
                   stopOptions(1);
                 end;
                inc(Level);
@@ -1635,14 +1638,22 @@ begin
              end
            else
             if (s='ELSE') then
-             skip[level]:=skip[level-1] or (not skip[level])
+              begin
+                if Level=0 then
+                  begin
+                    Message2(option_else_without_if,filename,tostr(line));
+                    stopOptions(1);
+                  end
+                else
+                  skip[level]:=skip[level-1] or (not skip[level])
+              end
            else
             if (s='ENDIF') then
              begin
                skip[level]:=false;
                if Level=0 then
                 begin
-                  Message(option_too_many_endif);
+                  Message2(option_too_many_endif,filename,tostr(line));
                   stopOptions(1);
                 end;
                dec(level);
@@ -2526,6 +2537,7 @@ begin
   set_system_macro('FPC_VERSION',version_nr);
   set_system_macro('FPC_RELEASE',release_nr);
   set_system_macro('FPC_PATCH',patch_nr);
+  set_system_macro('FPC_FULLVERSION',Format('%d%.02d%.02d',[StrToInt(version_nr),StrToInt(release_nr),StrToInt(patch_nr)]));
 
   for i:=low(tfeature) to high(tfeature) do
     if i in features then

compiler/pexpr.pas

@@ -1670,6 +1670,8 @@ implementation
                     { property of a class/object? }
                     if is_member_read(srsym,srsymtable,p1,hdef) then
                       begin
+                        if (srsymtable.symtabletype=ObjectSymtable) then
+                          p1:=load_self_node;
                         { not srsymtable.symtabletype since that can be }
                         { withsymtable as well                          }
                         if (srsym.owner.symtabletype=ObjectSymtable) then
@@ -2337,22 +2339,23 @@ implementation
                      check_hints(srsym,srsym.symoptions);
                      { load the procdef from the inherited class and
                        not from self }
-                     if srsym.typ in [procsym,propertysym] then
-                      begin
-                        if (srsym.typ = procsym) then
-                          begin
-                            hdef:=hclassdef;
-                            if (po_classmethod in current_procinfo.procdef.procoptions) or
-                               (po_staticmethod in current_procinfo.procdef.procoptions) then
-                              hdef:=tclassrefdef.create(hdef);
-                            p1:=ctypenode.create(hdef);
-                          end;
-                      end
-                     else
-                      begin
-                        Message(parser_e_methode_id_expected);
-                        p1:=cerrornode.create;
-                      end;
+                     case srsym.typ of
+                       procsym:
+                         begin
+                           hdef:=hclassdef;
+                           if (po_classmethod in current_procinfo.procdef.procoptions) or
+                              (po_staticmethod in current_procinfo.procdef.procoptions) then
+                             hdef:=tclassrefdef.create(hdef);
+                           p1:=ctypenode.create(hdef);
+                         end;
+                       propertysym:
+                         ;
+                       else
+                         begin
+                           Message(parser_e_methode_id_expected);
+                           p1:=cerrornode.create;
+                         end;
+                     end;
                      do_member_read(hclassdef,getaddr,srsym,p1,again,[cnf_inherited,cnf_anon_inherited]);
                    end
                   else

compiler/ptype.pas

@@ -619,7 +619,7 @@ implementation
           hdef      : tdef;
           arrdef    : tarraydef;
 
-          procedure setdefdecl(def:tdef);
+        procedure setdefdecl(def:tdef);
           begin
             case def.typ of
               enumdef :
@@ -662,8 +662,9 @@ implementation
              begin
                 { defaults }
                 indexdef:=generrordef;
-                lowval:=low(aint);
-                highval:=high(aint);
+                { use defaults which don't overflow the compiler }
+                lowval:=0;
+                highval:=0;
                 repeat
                   { read the expression and check it, check apart if the
                     declaration is an enum declaration because that needs to
@@ -677,43 +678,43 @@ implementation
                    begin
                      pt:=expr;
                      if pt.nodetype=typen then
-                      setdefdecl(pt.resultdef)
+                       setdefdecl(pt.resultdef)
                      else
                        begin
-                          if (pt.nodetype=rangen) then
+                         if (pt.nodetype=rangen) then
                            begin
                              if (trangenode(pt).left.nodetype=ordconstn) and
                                 (trangenode(pt).right.nodetype=ordconstn) then
-                              begin
-                                { make both the same type or give an error. This is not
-                                  done when both are integer values, because typecasting
-                                  between -3200..3200 will result in a signed-unsigned
-                                  conflict and give a range check error (PFV) }
-                                if not(is_integer(trangenode(pt).left.resultdef) and is_integer(trangenode(pt).left.resultdef)) then
-                                  inserttypeconv(trangenode(pt).left,trangenode(pt).right.resultdef);
-                                lowval:=tordconstnode(trangenode(pt).left).value;
-                                highval:=tordconstnode(trangenode(pt).right).value;
-                                if highval<lowval then
-                                 begin
-                                   Message(parser_e_array_lower_less_than_upper_bound);
-                                   highval:=lowval;
-                                 end
-                                else if (lowval < low(aint)) or
-                                        (highval > high(aint)) then
+                               begin
+                                 { make both the same type or give an error. This is not
+                                   done when both are integer values, because typecasting
+                                   between -3200..3200 will result in a signed-unsigned
+                                   conflict and give a range check error (PFV) }
+                                 if not(is_integer(trangenode(pt).left.resultdef) and is_integer(trangenode(pt).left.resultdef)) then
+                                   inserttypeconv(trangenode(pt).left,trangenode(pt).right.resultdef);
+                                 lowval:=tordconstnode(trangenode(pt).left).value;
+                                 highval:=tordconstnode(trangenode(pt).right).value;
+                                 if highval<lowval then
                                   begin
-                                    Message(parser_e_array_range_out_of_bounds);
-                                    lowval :=0;
-                                    highval:=0;
-                                  end;
-                                if is_integer(trangenode(pt).left.resultdef) then
-                                  range_to_type(lowval,highval,indexdef)
-                                else
-                                  indexdef:=trangenode(pt).left.resultdef;
-                              end
+                                    Message(parser_e_array_lower_less_than_upper_bound);
+                                    highval:=lowval;
+                                  end
+                                 else if (lowval<int64(low(aint))) or
+                                         (highval > high(aint)) then
+                                   begin
+                                     Message(parser_e_array_range_out_of_bounds);
+                                     lowval :=0;
+                                     highval:=0;
+                                   end;
+                                 if is_integer(trangenode(pt).left.resultdef) then
+                                   range_to_type(lowval,highval,indexdef)
+                                 else
+                                   indexdef:=trangenode(pt).left.resultdef;
+                               end
                              else
-                              Message(type_e_cant_eval_constant_expr);
+                               Message(type_e_cant_eval_constant_expr);
                            end
-                          else
+                         else
                            Message(sym_e_error_in_type_def)
                        end;
                      pt.free;

compiler/symdef.pas

@@ -4324,6 +4324,8 @@ implementation
     constructor terrordef.create;
       begin
         inherited create(errordef);
+        { prevent consecutive faults }
+        savesize:=1;
       end;
 
 

compiler/systems/i_amiga.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for the AmigaOS. }
 unit i_amiga;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_atari.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for atari. }
 unit i_atari;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_beos.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for BeOS. }
 unit i_beos;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_bsd.pas

@@ -24,6 +24,8 @@
 
 unit i_bsd;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_emx.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for OS/2 via EMX. }
 unit i_emx;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_gba.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for gba. }
 unit i_gba;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_go32v2.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for go32v2. }
 unit i_go32v2;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_linux.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for linux. }
 unit i_linux;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses
@@ -701,3 +703,4 @@ initialization
   {$endif linux}
 {$endif CPUARM}
 end.
+

compiler/systems/i_macos.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for MacOS. }
 unit i_macos;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_morph.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for the MorphOS. }
 unit i_morph;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_nds.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for nds. }
 unit i_nds;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_nwl.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for Netware libc modules. }
 unit i_nwl;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_nwm.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for Netware modules. }
 unit i_nwm;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_os2.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for OS/2. }
 unit i_os2;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_palmos.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for PalmOS. }
 unit i_palmos;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_sunos.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for solaris. }
 unit i_sunos;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_symbian.pas

@@ -22,6 +22,8 @@
 { This unit implements support information structures for win32. }
 unit i_symbian;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_wdosx.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for wdosx. }
 unit i_wdosx;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/systems/i_win.pas

@@ -21,6 +21,8 @@
 { This unit implements support information structures for win32. }
 unit i_win;
 
+{$i fpcdefs.inc}
+
   interface
 
     uses

compiler/utils/dummyas.pp

@@ -1,111 +1,111 @@
-{
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 2007 by Pierre Muller
-    member of the Free Pascal development team.
-
-    Dummy assembler program to be able to easily test
-    all FPC targets even without cross tools.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-program dummyas;
-
-var
-  assembler_name : string;
-  object_name : string;
-  ofile : text;
-
-function RemoveSuffix(const st : string) : string;
-var
-  i,last : longint;
-begin
-  last:=length(st);
-  for i:=length(st) downto 1 do
-    begin
-      if st[i]='.' then
-        begin
-          last:=i-1;
-          break;
-        end;
-    end;
-  RemoveSuffix:=Copy(st,1,last);
-end;
-
-var
-  i : longint;
-  param : string;
-  skipnext : boolean;
-begin
-  object_name:='';
-  skipnext:=false;
-  for i:=1 to ParamCount do
-    begin
-      param:=Paramstr(i);
-      if skipnext or (length(Param)=0) then
-        begin
-          skipnext:=false;
-          continue;
-        end;
-      if Param='-o' then
-        begin
-          skipnext:=true;
-          object_name:=ParamStr(i+1);
-        end
-      else if (Param[1]='-') then
-        begin
-          { option Param not handled }
-          { Shouldn't be a real problem }
-        end
-      else
-        begin
-          if assembler_name='' then
-            assembler_name:=ParamStr(i)
-          else
-            begin
-              Writeln(stderr,'two non option param found!');
-              Writeln(stderr,'first non option param =',assembler_name);
-              Writeln(stderr,'second non option param =',Param);
-              Writeln(stderr,'Don''t know how to handle this!');
-              halt(1);
-            end;
-        end;
-    end;
-
-  if assembler_name='' then
-    begin
-      Writeln(stderr,'Dummyas, no source file specified');
-      halt(1);
-    end;
-  Assign(ofile,assembler_name);
-{$I-}
-  Reset(ofile);
-  if IOResult<>0 then
-    begin
-      Writeln(stderr,'Dummyas, source file not found ',assembler_name);
-      halt(1);
-    end;
-  Close(ofile);
-  if object_name='' then
-    object_name:=RemoveSuffix(assembler_name)+'.o';
-  Assign(ofile,object_name);
-  Rewrite(ofile);
-  if IOResult<>0 then
-    begin
-      Writeln(stderr,'Dummyas, object file not writable ',object_name);
-      halt(1);
-    end;
-  Writeln(ofile,'Dummy as called');
-  for i:=0 to Paramcount do
-    Write(ofile,ParamStr(i),' ');
-  Writeln(ofile);
-  Writeln(ofile,'assembler file=',assembler_name);
-  Writeln(ofile,'object file=',object_name);
-  Close(ofile);
-end.
+{
+    This file is part of the Free Pascal run time library.
+    Copyright (c) 2007 by Pierre Muller
+    member of the Free Pascal development team.
+
+    Dummy assembler program to be able to easily test
+    all FPC targets even without cross tools.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+program dummyas;
+
+var
+  assembler_name : string;
+  object_name : string;
+  ofile : text;
+
+function RemoveSuffix(const st : string) : string;
+var
+  i,last : longint;
+begin
+  last:=length(st);
+  for i:=length(st) downto 1 do
+    begin
+      if st[i]='.' then
+        begin
+          last:=i-1;
+          break;
+        end;
+    end;
+  RemoveSuffix:=Copy(st,1,last);
+end;
+
+var
+  i : longint;
+  param : string;
+  skipnext : boolean;
+begin
+  object_name:='';
+  skipnext:=false;
+  for i:=1 to ParamCount do
+    begin
+      param:=Paramstr(i);
+      if skipnext or (length(Param)=0) then
+        begin
+          skipnext:=false;
+          continue;
+        end;
+      if Param='-o' then
+        begin
+          skipnext:=true;
+          object_name:=ParamStr(i+1);
+        end
+      else if (Param[1]='-') then
+        begin
+          { option Param not handled }
+          { Shouldn't be a real problem }
+        end
+      else
+        begin
+          if assembler_name='' then
+            assembler_name:=ParamStr(i)
+          else
+            begin
+              Writeln(stderr,'two non option param found!');
+              Writeln(stderr,'first non option param =',assembler_name);
+              Writeln(stderr,'second non option param =',Param);
+              Writeln(stderr,'Don''t know how to handle this!');
+              halt(1);
+            end;
+        end;
+    end;
+
+  if assembler_name='' then
+    begin
+      Writeln(stderr,'Dummyas, no source file specified');
+      halt(1);
+    end;
+  Assign(ofile,assembler_name);
+{$I-}
+  Reset(ofile);
+  if IOResult<>0 then
+    begin
+      Writeln(stderr,'Dummyas, source file not found ',assembler_name);
+      halt(1);
+    end;
+  Close(ofile);
+  if object_name='' then
+    object_name:=RemoveSuffix(assembler_name)+'.o';
+  Assign(ofile,object_name);
+  Rewrite(ofile);
+  if IOResult<>0 then
+    begin
+      Writeln(stderr,'Dummyas, object file not writable ',object_name);
+      halt(1);
+    end;
+  Writeln(ofile,'Dummy as called');
+  for i:=0 to Paramcount do
+    Write(ofile,ParamStr(i),' ');
+  Writeln(ofile);
+  Writeln(ofile,'assembler file=',assembler_name);
+  Writeln(ofile,'object file=',object_name);
+  Close(ofile);
+end.

tests/tbf/tb0212.pp

@@ -0,0 +1,6 @@
+{ %fail }
+const
+  st : Array [False, True] of Char = ('F', 'U');
+
+begin
+end.

tests/tbf/tb0213.pp

@@ -0,0 +1,16 @@
+{ %fail }
+{$mode objfpc}
+type
+  tc1 = class
+    fp : longint;
+    class procedure p;
+    property prop : longint read fp;
+  end;
+
+  class procedure tc1.p;
+    begin
+      writeln(prop);
+    end;
+
+begin
+end.

tests/webtbf/tw12365a.cfg

@@ -0,0 +1,2 @@
+#else
+#endif

tests/webtbf/tw12365a.pp

@@ -0,0 +1,4 @@
+{ %fail }
+{ %[email protected]}
+begin
+end.

tests/webtbf/tw12365b.cfg

@@ -0,0 +1,45 @@
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf
+#ifdef asdf

tests/webtbf/tw12365b.pp

@@ -0,0 +1,4 @@
+{ %fail }
+{ %[email protected]}
+begin
+end.

tests/webtbs/tw11568.pp

@@ -0,0 +1,9 @@
+{$if not(fpc_fullversion>20202)}
+  {$error Problem with fpc_fullversion}
+{$endif}
+
+{ force compiler error if it's defined wrong }
+{$if fpc_fullversion>20202)}
+begin
+end.
+{$endif}