paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-07 05:08:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix range check error in options handling, resolves #12365

Browse Source 
+ better error output (print filename and line number) for config file directive errors

git-svn-id: trunk@11898 -
This commit is contained in:
florian 2008-10-14 17:06:55 +00:00
parent 422c45ce3e
commit cb9e52826f
9 changed files with 200 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -8115,6 +8115,10 @@ tests/webtbf/tw11848a.pp svneol=native#text/plain
tests/webtbf/tw11849a.pp svneol=native#text/plain
tests/webtbf/tw11862a.pp svneol=native#text/plain
tests/webtbf/tw12329.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

8
compiler/msg/errore.msg
View File

@ -2420,13 +2420,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
@ -2493,6 +2493,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
#

5
compiler/msgidx.inc
View File

@ -750,13 +750,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 = 47307;
MsgTxtSize = 47481;
MsgIdxMax : array[1..20] of longint=(
24,87,248,84,65,50,108,22,201,61,
43,1,1,1,1,1,1,1,1,1
44,1,1,1,1,1,1,1,1,1
);

230
compiler/msgtxt.inc
View File

@ -809,37 +809,39 @@ const msgtxt : array[0..000197,1..240] of char=(
'11011_W_Target is already set to: $1'#000+
'11012_W_Shared libs not supported on DOS platform, reverting ','to stat'+
'ic'#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 executab'+
'le'#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+
'11015_F_Open conditional at the end of the options file'#000+
'11016_W_Debug information generatio','n is not supported by this execut'+
'able'#000+
'11017_H_Try recompiling with -dGDB'#000+
'11018_W_You are using t','he obsolete switch $1'#000+
'11018_W_You are using the obsolete switch $1'#000+
'11019_W_You are using the obsolete switch $1, please use $2'#000+
'11020_N_Switching assembler to default source writing assembler'#000+
'11020_N_Switching assembler to default source writing assemble','r'#000+
'11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
'11022_W_"$1" assembler use ','forced'#000+
'11022_W_"$1" assembler use forced'#000+
'11026_T_Reading options from file $1'#000+
'11027_T_Reading options from environment $1'#000+
'11028_D_Handling option "$1"'#000+
'11029_O_*** press enter ***'#000+
'11029_O_*** press enter ***',#000+
'11030_H_Start of reading config file $1'#000+
'11031_H_End of reading config file $1'#000+
'11032_D_interpret','ing option "$1"'#000+
'11032_D_interpreting option "$1"'#000+
'11036_D_interpreting firstpass option "$1"'#000+
'11033_D_interpreting file option "$1"'#000+
'11034_D_Reading config file "$1"'#000+
'11035_D_found source file 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_As','sembler output selected "$1" cannot generate debug info, d'+
'ebugging disabled'#000+
'11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+
'11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
'ugging disabled'#000+
'11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000,
'11043_F_In options file $1 at line $2 #ELSE directive without #IF(N)DE'+
'F found'#000+
'11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
'CPU'#010+
'Copyright (c) 1993-200','8 by Florian Klaempfl'#000+
'11024_Free Pascal Compiler version $FPCVERSION'#010+
'Copyright (c) 1993-2008 by Florian Klaempfl'#000+
'11024_Free Pascal Compiler version $FPCVERSI','ON'#010+
#010+
'Compiler Date : $FPCDATE'#010+
'Compiler CPU Target: $FPCCPU'#010+
@ -850,11 +852,11 @@ const msgtxt : array[0..000197,1..240] of char=(
'Supported CPU instruction sets:'#010+
' $INSTRUCTIONSETS'#010+
#010+
'Supported FPU instruction',' sets:'#010+
'Supported FPU instruction sets:'#010+
' $FPUINSTRUCTIONSETS'#010+
#010+
'Supported ABI targets:'#010+
' $ABITARGETS'#010+
' $ABITARGETS',#010+
#010+
'Supported Optimizations:'#010+
' $OPTIMIZATIONS'#010+
@ -863,182 +865,181 @@ const msgtxt : array[0..000197,1..240] of char=(
'For more information read COPYING.FPC'#010+
#010+
'Report bugs,suggestions etc to:'#010+
' ',' bugs@freepascal.org'#000+
'11025_**0*_Put + after a boolean switch option to enable it, - to disa'+
'ble it'#010+
' bugs@freepascal.org'#000+
'11025_**0*_Put + after a boolea','n switch option to enable it, - to di'+
'sable it'#010+
'**1a_The compiler doesn'#039't delete the generated assembler file'#010+
'**2al_List sourcecode lines in assembler file'#010+
'**2an_List node info',' in assembler file'#010+
'*L2ap_Use pipes instead of creating temporary assembler files'#010+
'**2an_List node info in assembler file'#010+
'*L2ap_Use pipes instead of creating temporary a','ssembler 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+
'**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*2Anasmcoff_COFF (','Go32v2) file using Nasm'#010+
'3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+
'3*2Anasmwin32_Win32 object file using Nasm'#010+
'3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
'3*2Awasm_Obj fil','e using Wasm (Watcom)'#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*2Amasm_Obj',' file using Masm (Microsoft)'#010+
'3*2Atasm_Obj file using Tasm (Borland)'#010+
'3*2Aelf_ELF (Linux) using internal writer'#010+
'3*2Acoff_COFF (Go32v2) using internal writer'#010+
'3*2Apecoff_PE-COFF ','(Win32) using internal writer'#010+
'3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
'4*2Aas_Assemble using GNU AS'#010+
'6*2Aas_Unix o-file using GNU AS'#010+
'6*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_Assemble using GNU AS'#010+
'P*2Aas_Assemble using GN','U 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+
'**2bl','_Generate local symbol info'#010+
'**1B_Build all modules'#010+
'**1C<x>_Code generation options:'#010+
'**2Ca<x>_Select ABI, see fpc -i for possible values'#010+
'**2Cb_Generate big-endian code'#010+
'**2Cc<x','>_Set default calling convention to <x>'#010+
'**2CD_Create also dynamic library (not supported)'#010+
'**2Cc<x>_Set default calling convention to <x>'#010+
'**2CD_Create also dynamic ','library (not supported)'#010+
'**2Ce_Compilation with emulated floating point opcodes'#010+
'**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
'lues'#010+
'**2CF<x>_Minimal flo','ating point constant precision (default, 32, 64)'+
#010+
'**2Cg_Generate PIC code'#010+
'**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
'**2Cg_Generate PI','C code'#010+
'**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
'**2Ci_IO-checking'#010+
'**2Cn_Omit linking stage'#010+
'**2Co_Check overflow of integer operations'#010+
'**2CO_Check for possible over','flow of integer operations'#010+
'**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+
'**2CO_Check for possible overflow of integer operations'#010+
'**2Cp<x>_Select instruction set, see fp','c -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 m','ethod call validity'#010+
'**2CR_Verify object method call validity'#010+
'**2Cs<n>_Set stack size to <n>'#010+
'**2Ct_Stack checking'#010+
'**2Ct_Stack che','cking'#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 a','pplication'#010+
'*O2Dw_PM application'#010+
'**1e<x>_Set path to executable'#010+
'**1E_Same as -Cn'#010+
'**1fPIC_Same as -Cg'#010+
'**1fPIC','_Same as -Cg'#010+
'**1F<x>_Set file names and paths:'#010+
'**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
'sed'#010+
'**2Fc<x>_Set input codepage to <x>'#010+
'**2FC<x>_Set RC co','mpiler binary name to <x>'#010+
'**2FD<x>_Set the directory where to search for compiler utilities'#010+
'**2FC<x>_Set RC compiler binary name to <x>'#010+
'**2FD<x>_Set the directory where to sear','ch 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+
'**2Fi<x>_Add <x> to include path'#010+
'**2Fl<x>_Add <x> to library path'#010+
'**2FL<x>_Use <x> as dynamic linker'#010+
'**2FL<x>_Use <x> as ','dynamic linker'#010+
'**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+
'r'#010+
'**2Fo<x>_Add <x> to object path'#010+
'**2Fr<x>_Load error message file <x>'#010+
'**2FR<x>_Set resou','rce (.res) linker to <x>'#010+
'**2FR<x>_Set resource (.res) linker to <x>'#010+
'**2Fu<x>_Add <x> to unit path'#010+
'**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
'**2FU<x>_Se','t unit output path to <x>, overrides -FE'#010+
'*g1g_Generate debug information (default format for target)'#010+
'*g2gc_Generate checks for pointers'#010+
'*g2gh_Use heaptrace unit (for memory l','eak/corruption debugging)'#010+
'*g2gl_Use line info unit (show more info with backtraces)'#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+
'*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+
'*g2gs_Generate stabs debug information'#010+
'*g2gt_Trash local variables (to ','detect uninitialized uses)'#010+
'*g2gv_Generates programs traceable with valgrind'#010+
'*g2gw_Generate dwarf-2 debug information (same as -gw2)'#010+
'*g2gw2_Generate dwarf-2 debug information'#010,
'*g2gw2_Generate dwarf-2 debug information'#010+
'*g2gw3_Generate dwarf-3 debug information'#010+
'**1i_Information'#010+
'**2iD_Return compiler date'#010+
'**2iD_R','eturn compiler date'#010+
'**2iV_Return short compiler version'#010+
'**2iW_Return full compiler version'#010+
'**2iSO_Return compiler OS'#010+
'**2iSP_Return compiler host processor'#010+
'**2iTO_Return targe','t OS'#010+
'**2iTO_Return target OS'#010+
'**2iTP_Return target processor'#010+
'**1I<x>_Add <x> to include path'#010+
'**1I<x>_Add <x> to include pat','h'#010+
'**1k<x>_Pass <x> to the linker'#010+
'**1l_Write logo'#010+
'**1M<x>_Set language mode to <x>'#010+
'**2Mfpc_Free Pascal dialect (default)'#010+
'**2Mobjfpc_FPC mode with Object Pascal support'#010+
'**2Mdel','phi_Delphi 7 compatibility mode'#010+
'**2Mtp_TP/BP 7.0 compatibility mode'#010+
'**2Mdelphi_Delphi 7 compatibility mode'#010+
'**2Mtp_TP/BP 7.0 compatibility mod','e'#010+
'**2Mmacpas_Macintosh Pascal dialects 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+
'**2O-_Di','sable 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+
'**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
'**2Oa<x>=<y>_Set alignment'#010+
'**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i for possible '+
'values'#010+
'**2Oo[NO]<x>_Enable or d','isable optimizations, see fpc -i for 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_Ge','nerate profile code for gprof (defines FPC_PROFILE)'#010+
'**1R<x>_Assembler reading style:'#010+
'**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
'**1R<x>_Assemb','ler reading style:'#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+
'**1S<x>_Syntax options:'#010+
'**2S2_Same as -Mobjfpc'#010+
'**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
'**2Sc_Support operat','ors like C (*=,+=,/= and -=)'#010+
'**2Sa_Turn on assertions'#010+
'**2Sd_Same as -Mdelphi'#010+
'**2Se<x>_Error options. <x> is a combination of the following:'#010+
'**3*_<n> : Compiler halts after th','e <n> errors (default is 1)'#010+
'**3*_w : Compiler also halts after warnings'#010+
'**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
'**3*_w : Compiler also halts after war','nings'#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 de','fault instead of shortstrings'#010+
'**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
'**2Sh_Use ansistrings by default instead of shortstrings'#010+
'**2Si_Turn on inlining of procedures','/functions declared as "inline"'#010+
'**2Sk_Load fpcylix unit'#010+
'**2SI<x>_Set interface style to <x>'#010+
'**3SIcom_COM compatible interface (default)'#010+
'**3SIcorba_CORBA compatible interface'#010,
'**3SIcorba_CORBA compatible interface'#010+
'**2Sm_Support macros like C (global)'#010+
'**2So_Same as -Mtp'#010+
'**2Ss_Constructor name must be init (destructor must be done)'#010+
'**2Ss_Cons','tructor name must be init (destructor must be done)'#010+
'**2St_Allow static keyword in objects'#010+
'**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
'**1s_Do not call as','sembler and linker'#010+
'**1s_Do not call assembler and linker'#010+
'**2sh_Generate script to link on host'#010+
'**2st_Generate script to link on target'#010+
'**2st_Gen','erate script to link on target'#010+
'**2sr_Skip register allocation phase (use with -alr)'#010+
'**1T<x>_Target operating system:'#010+
'3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
'3*2Tfre','ebsd_FreeBSD'#010+
'3*2Tfreebsd_FreeBSD'#010+
'3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
'3*2Tlinux_Linux'#010+
'3*2Tl','inux_Linux'#010+
'3*2Tnetbsd_NetBSD'#010+
'3*2Tnetware_Novell Netware Module (clib)'#010+
'3*2Tnetwlibc_Novell Netware Module (libc)'#010+
'3*2Topenbsd_OpenBSD'#010+
'3*2Tos2_OS/2 / eComStation'#010+
'3*2Tsunos_SunOS','/Solaris'#010+
'3*2Tsunos_SunOS/Solaris'#010+
'3*2Tsymbian_Symbian OS'#010+
'3*2Twatcom_Watcom compatible DOS extender'#010+
'3*2Twatcom_Watcom compatible DOS e','xtender'#010+
'3*2Twdosx_WDOSX DOS extender'#010+
'3*2Twin32_Windows 32 Bit'#010+
'3*2Twince_Windows CE'#010+
@ -1046,87 +1047,88 @@ const msgtxt : array[0..000197,1..240] of char=(
'6*2Tamiga_Commodore Amiga'#010+
'6*2Tatari_Atari ST/STe/TT'#010+
'6*2Tlinux_Linux/m68k'#010+
'6*','2Tmacos_Macintosh m68k (not supported)'#010+
'6*2Tmacos_Macintosh m68k (not supported)'#010+
'6*2Tpalmos_PalmOS'#010+
'A*2Tlinux_Linux'#010+
'A*2Tlinux','_Linux'#010+
'A*2Twince_Windows CE'#010+
'P*2Tamiga_AmigaOS on PowerPC'#010+
'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+
'P*2Tlinux_Linux on PowerPC'#010+
'P*2Tmacos_Mac OS (classic) on PowerPC'#010+
'P*2Tmorpho','s_MorphOS'#010+
'P*2Tmorphos_MorphOS'#010+
'S*2Tlinux_Linux'#010+
'**1u<x>_Undefines the symbol <x>'#010+
'**1U_Unit options:'#010+
'**1U_Un','it options:'#010+
'**2Un_Do not check where 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/u','sed files'#010+
'**2*_h : Show hints c : Show conditionals'#010+
'**2*_n : Show notes t : Show tried/used files'#010+
'**2*_h : Show hints c : Show conditiona','ls'#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 : Exe','cutable info (Win32 only'+
')'#010+
'**2*_b : Write file names messages with full path'#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*_ lots of debugging info q : Show message numbers'#010+
'**2*_m<x>,<y> : Don'#039't show mes','sages numbered <x> and <y>'#010+
'3*1W<x>_Target-specific options (targets)'#010+
'**2*_m<x>,<y> : Don'#039't show messages numbered <x> and <y>'#010+
'3*1W<x>_Target-specific options (target','s)'#010+
'A*1W<x>_Target-specific options (targets)'#010+
'P*1W<x>_Target-specific options (targets)'#010+
'3*2Wb_Create a bundle instead of a library (Darwin)'#010+
'P*2Wb_Create a bundle instead of a ','library (Darwin)'#010+
'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
'P*2Wb_Create a bundle instead of a library (Darwin)'#010+
'p*2Wb_Create a bundle instead of a library (Darwi','n)'#010+
'3*2WB_Create a relocatable image (Windows)'#010+
'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
'3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
'A*2WC_Specify co','nsole type application (Windows)'#010+
'P*2WC_Specify console type application (Classic Mac OS)'#010+
'A*2WC_Specify console type application (Windows)'#010+
'P*2WC_Specify console type applic','ation (Classic Mac OS)'#010+
'3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
'3*2We_Use external resource','s (Darwin)'#010+
'3*2We_Use external resources (Darwin)'#010+
'P*2We_Use external resources (Darwin)'#010+
'p*2We_Use external resources (Darwin)'#010+
'p*2We_Use externa','l resources (Darwin)'#010+
'3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
'3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
'A*2WG_Specify graphic type application',' (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*2Wi_Use internal resources (Darwin)'#010+
'P*2Wi_Use internal resources (Darwin)'#010+
'p*2Wi_Use internal resources (Darwin)'#010+
'3*2WN_Do not generate relocation code, needed for debugging',' (Windows'+
'3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
'A*2WN_Do not generate relocation code, needed for debug','ging (Windows'+
')'#010+
'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
'3*2WR_Generate relocation code (Windows)'#010+
'A*2WR_Generate relocation code (Windows)'#010+
'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
'**1X_Executable opti','ons:'#010+
'**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
'ux)'#010+
'**1X_Executable options:'#010+
'**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, Fre','eBSD, L'+
'inux)'#010+
'**2Xd_Do not use standard library search path (needed for cross compil'+
'e)'#010+
'**2Xe_Use external linker'#010+
'**2Xg_Create debuginfo in a separate file and add a debuglink ','sectio'+
'n to executable'#010+
'**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+
'**2Xg_Create debuginfo in a separate file and add a debuglink section '+
'to executable'#010+
'**2XD_Try to link units dynamically (de','fines FPC_LINK_DYNAMIC)'#010+
'**2Xi_Use internal linker'#010+
'**2Xm_Generate link map'#010+
'**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
's '#039'main'#039')'#010+
'**2XP<x>_Prepend the binutil','s names with the prefix <x>'#010+
'**2Xr<x>_Set library search path to <x> (needed for cross compile) (Be'+
'OS, Linux)'#010+
'**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
'**2Xr<x>_Set library search path to <x','> (needed for cross compile) ('+
'BeOS, Linux)'#010+
'**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
', Linux, Mac OS, Solaris)'#010+
'**2Xs_Strip all symbols from execut','able'#010+
'**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#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+
'**1*_'#010+
'**1?_Show this help'#010+
'**1h_Shows',' this help without waiting'#000
'**1h_Shows this help without waiting'#000
);

23
compiler/options.pas
View File

@ -1611,12 +1611,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
@ -1645,9 +1646,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
@ -1669,7 +1672,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);
@ -1681,7 +1684,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);
@ -1689,14 +1692,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);

2
tests/webtbf/tw12365a.cfg Normal file
View File

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

4
tests/webtbf/tw12365a.pp Normal file
View File

@ -0,0 +1,4 @@
{ %fail }
{ %OPT=@tw12365a.cfg}
begin
end.

45
tests/webtbf/tw12365b.cfg Normal file
View File

@ -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

4
tests/webtbf/tw12365b.pp Normal file
View File

@ -0,0 +1,4 @@
{ %fail }
{ %OPT=@tw12365b.cfg}
begin
end.