diff --git a/compiler/errore.msg b/compiler/errore.msg index 5471c19243..444eba0083 100644 --- a/compiler/errore.msg +++ b/compiler/errore.msg @@ -1530,6 +1530,8 @@ option_no_nested_response_file=E_nested response files are not supported % you cannot nest response files with the \var{@file} command-line option. option_no_source_found=F_No source file name in command line % The compiler expects a source file name on the command line. +option_no_option_found=N_No option inside $1 config file +% The compiler didn't find any option in that config file. option_illegal_para=E_Illegal parameter: $1 % You specified an unknown option. option_help_pages_para=H_-? writes help pages diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 8d165cd00a..7dd306a9f0 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -496,6 +496,7 @@ type tmsgconst=( option_def_only_for_os2, option_no_nested_response_file, option_no_source_found, + option_no_option_found, option_illegal_para, option_help_pages_para, option_too_many_cfg_files, diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 35bb6058f4..3693b57db7 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const msgtxt : array[0..000107] of string[240]=( +const msgtxt : array[0..000108] of string[240]=( {$else Delphi} -const msgtxt : array[0..000107,1..240] of char=( +const msgtxt : array[0..000108,1..240] of char=( {$endif Delphi} 'T_Compiler: $1'#000+ 'D_Compiler OS: $1'#000+ @@ -519,177 +519,178 @@ const msgtxt : array[0..000107,1..240] of char=( 'W_DEF file can be created only for OS/2'#000+ 'E_nested response files are not supported'#000+ 'F_No source file name in c','ommand line'#000+ + 'N_No option inside $1 config file'#000+ 'E_Illegal parameter: $1'#000+ 'H_-? writes help pages'#000+ 'F_Too many config files nested'#000+ 'F_Unable to open file $1'#000+ 'N_Reading further options from $1'#000+ 'W_Target is already set to: $1'#000+ - 'W_Shared libs not supported on DOS platform, reverting to st','atic'#000+ + 'W_Shared libs not supporte','d on DOS platform, reverting to static'#000+ 'F_too many IF(N)DEFs'#000+ 'F_too many ENDIFs'#000+ 'F_open conditional at the end of the file'#000+ 'W_Debug information generation is not supported by this executable'#000+ 'H_Try recompiling with -dGDB'#000+ - 'E_You are using the obsolete switch $1'#000+ - 'E_You are using the',' obsolete switch $1, please use $2'#000+ + 'E_You are using the obso','lete switch $1'#000+ + 'E_You are using the obsolete switch $1, please use $2'#000+ 'N_Switching assembler to default source writing assembler'#000+ 'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+ 'Copyright (c) 1993-2000 by Florian Klaempfl'#000+ - 'Free Pascal Compiler version $FPCVER'#000+ + 'Free P','ascal Compiler version $FPCVER'#000+ #000+ - 'Co','mpiler Date : $FPCDATE'#000+ + 'Compiler Date : $FPCDATE'#000+ 'Compiler Target: $FPCTARGET'#000+ #000+ 'This program comes under the GNU General Public Licence'#000+ 'For more information read COPYING.FPC'#000+ #000+ 'Report bugs,suggestions etc to:'#000+ - ' fpc-devel@vekoll.saturnus.vein.hu'#000+ - '**0*_put ','+ after a boolean switch option to enable it, - to disable '+ - 'it'#000+ + ' fpc-devel','@vekoll.saturnus.vein.hu'#000+ + '**0*_put + after a boolean switch option to enable it, - to disable it'+ + #000+ '**1a_the compiler doesn'#039't delete the generated assembler file'#000+ '**2al_list sourcecode lines in assembler file'#000+ - '**2ar_list register allocation/release info in assembler file'#000+ - '**2at_li','st temp allocation/release info in assembler file'#000+ + '**2ar_list register allocation/relea','se info in assembler file'#000+ + '**2at_list temp allocation/release info in assembler file'#000+ '**1b_generate browser info'#000+ '**2bl_generate local symbol info'#000+ '**1B_build all modules'#000+ '**1C_code generation options:'#000+ '3*2CD_create dynamic library'#000+ - '**2Ch_ bytes heap (between 1023 and 671','07840)'#000+ + '**2Ch_ bytes heap (between 1023 and 67107840)'#000+ '**2Ci_IO-checking'#000+ '**2Cn_omit linking stage'#000+ '**2Co_check overflow of integer operations'#000+ '**2Cr_range checking'#000+ '**2Cs_set stack size to '#000+ '**2Ct_stack checking'#000+ - '**2CD_create also dynamic library (* doesn'#039't work yet *)'#000+ - '**2CX_create also',' smartlinked library'#000+ + '**2CD_create also dynamic library (* doe','sn'#039't work yet *)'#000+ + '**2CX_create also smartlinked library'#000+ '**1d_defines the symbol '#000+ '*O1D_generate a DEF file'#000+ '*O2Dd_set description to '#000+ '*O2Dw_PM application'#000+ '**1e_set path to executable'#000+ '**1E_same as -Cn'#000+ - '**1F_set file names and paths:'#000+ - '**2FD_sets the directory ','where to search for compiler utilities'#000+ + '**1F_set file names and p','aths:'#000+ + '**2FD_sets the directory where to search for compiler utilities'#000+ '**2Fe_redirect error output to '#000+ '**2FE_set exe/unit output path to '#000+ '**2Fi_adds to include path'#000+ '**2Fl_adds to library path'#000+ - '*L2FL_uses as dynamic linker'#000+ - '**2Fo_adds ','to object path'#000+ + '*L2FL_uses as',' dynamic linker'#000+ + '**2Fo_adds to object path'#000+ '**2Fr_load error message file '#000+ '**2Fu_adds to unit path'#000+ '**2FU_set unit output path to , overrides -FE'#000+ '*g1g_generate debugger information:'#000+ '*g2gg_use gsym'#000+ '*g2gd_use dbx'#000+ - '*g2gh_use heap trace unit'#000+ - '*g2gc_gener','ate checks for pointers'#000+ + '*g2','gh_use heap trace unit'#000+ + '*g2gc_generate checks for pointers'#000+ '**1i_information'#000+ '**2iD_return compiler date'#000+ '**2iV_return compiler version'#000+ '**2iSO_return compiler OS'#000+ '**2iSP_return compiler processor'#000+ '**2iTO_return target OS'#000+ - '**2iTP_return target processor'#000+ - '**1I_adds to include ','path'#000+ + '**2iTP_return target proc','essor'#000+ + '**1I_adds to include path'#000+ '**1k_Pass to the linker'#000+ '**1l_write logo'#000+ '**1n_don'#039't read the default config file'#000+ '**1o_change the name of the executable produced to '#000+ - '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#000+ - '*L1P_use pipes instead of crea','ting temporary assembler files'#000+ + '**1pg_generate profile code for gprof (defines FPC_PROFI','LE)'#000+ + '*L1P_use pipes instead of creating temporary assembler files'#000+ '**1S_syntax options:'#000+ '**2S2_switch some Delphi 2 extensions on'#000+ '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+ '**2Sd_tries to be Delphi compatible'#000+ - '**2Se_compiler stops after the errors (default is 1',')'#000+ + '**2Se_compiler stops ','after the errors (default is 1)'#000+ '**2Sg_allow LABEL and GOTO'#000+ '**2Sh_Use ansistrings'#000+ '**2Si_support C++ styled INLINE'#000+ '**2Sm_support macros like C (global)'#000+ '**2So_tries to be TP/BP 7.0 compatible'#000+ '**2Sp_tries to be gpc compatible'#000+ - '**2Ss_constructor name must be init (destructor ','must be done)'#000+ + '**2Ss_construc','tor name must be init (destructor must be done)'#000+ '**2St_allow static keyword in objects'#000+ '**1s_don'#039't call assembler and linker (only with -a)'#000+ '**1u_undefines the symbol '#000+ '**1U_unit options:'#000+ '**2Un_don'#039't check the unit name'#000+ - '**2Us_compile a system unit'#000+ - '**1v_Be verbose. ','is a combination of the following letters:'#000+ + '**2Us_compile a sy','stem unit'#000+ + '**1v_Be verbose. is a combination of the following letters:'#000+ '**2*_e : Show errors (default) d : Show debug info'#000+ '**2*_w : Show warnings u : Show unit info'#000+ - '**2*_n : Show notes t : Show tried/used files'#000+ - '**2*_h : Show hints ',' m : Show defined macros'#000+ + '**2*_n : Show notes t : Show trie','d/used files'#000+ + '**2*_h : Show hints m : Show defined macros'#000+ '**2*_i : Show general info p : Show compiled procedures'#000+ '**2*_l : Show linenumbers c : Show conditionals'#000+ - '**2*_a : Show everything 0 : Show nothing (except errors)'#000+ - '**2*_','b : Show all procedure r : Rhide/GCC compatibility mod'+ - 'e'#000+ + '**2*_a : Show everything 0 : ','Show nothing (except errors'+ + ')'#000+ + '**2*_b : Show all procedure r : Rhide/GCC compatibility mode'#000+ '**2*_ declarations if an error x : Executable info (Win32 only)'#000+ '**2*_ occurs'#000+ '**1X_executable options:'#000+ - '*L2Xc_link with the c library'#000+ - '**2Xs_strip all symbols from execu','table'#000+ + '*L2Xc_link with the c library'#000, + '**2Xs_strip all symbols from executable'#000+ '**2XD_try to link dynamic (defines FPC_LINK_DYNAMIC)'#000+ '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#000+ '**2XX_try to link smart (defines FPC_LINK_SMART)'#000+ - '**0*_Processor specific options:'#000+ - '3*1A_output for','mat:'#000+ + '**0*_Processor sp','ecific options:'#000+ + '3*1A_output format:'#000+ '3*2Aas_assemble using GNU AS'#000+ '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#000+ '3*2Anasmcoff_coff (Go32v2) file using Nasm'#000+ '3*2Anasmelf_elf32 (Linux) file using Nasm'#000+ '3*2Anasmobj_obj file using Nasm'#000+ - '3*2Amasm_obj file using Masm (Microsof','t)'#000+ + '3*2A','masm_obj file using Masm (Microsoft)'#000+ '3*2Atasm_obj file using Tasm (Borland)'#000+ '3*2Acoff_coff (Go32v2) using internal writer'#000+ '3*2Apecoff_pecoff (Win32) using internal writer'#000+ '3*1R_assembler reading style:'#000+ '3*2Ratt_read AT&T style assembler'#000+ - '3*2Rintel_read Intel style assembler'#000+ - '3','*2Rdirect_copy assembler text directly to assembler file'#000+ + '3*2R','intel_read Intel style assembler'#000+ + '3*2Rdirect_copy assembler text directly to assembler file'#000+ '3*1O_optimizations:'#000+ '3*2Og_generate smaller code'#000+ '3*2OG_generate faster code (default)'#000+ '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+ - '3*2Ou_enable uncertain optimizations',' (see docs)'#000+ + '3*','2Ou_enable uncertain optimizations (see docs)'#000+ '3*2O1_level 1 optimizations (quick optimizations)'#000+ '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+ '3*2O3_level 3 optimizations (same as -O2u)'#000+ '3*2Op_target processor:'#000+ - '3*3Op1_set target processor to 386/486'#000+ - '3*3Op2_set t','arget processor to Pentium/PentiumMMX (tm)'#000+ + '3*3Op1_set target',' processor to 386/486'#000+ + '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+ '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+ '3*1T_Target operating system:'#000+ '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+ - '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+ - '3*2TLINUX_Linu','x'#000+ + '3*2TGO32V2_version 2 of DJ D','elorie DOS extender'#000+ + '3*2TLINUX_Linux'#000+ '3*2TOS2_OS/2 2.x'#000+ '3*2TWin32_Windows 32 Bit'#000+ '3*1WB_ Set Image base to Hexadecimal value'#000+ '3*1WC_ Specify console type application'#000+ '3*1WD_ Use DEFFILE to export functions of DLL or EXE'#000+ - '3*1WG_ Specify graphic type application'#000+ - '3*1WN_ Do not',' generate relocation code (necessary for debugging)'#000+ + '3*1WG_ Specify grap','hic type application'#000+ + '3*1WN_ Do not generate relocation code (necessary for debugging)'#000+ '3*1WR_ Generate relocation code'#000+ '6*1A_output format'#000+ '6*2Aas_Unix o-file using GNU AS'#000+ '6*2Agas_GNU Motorola assembler'#000+ '6*2Amit_MIT Syntax (old GAS)'#000+ - '6*2Amot_Standard Motorola assembler'#000+ - '6*1O_o','ptimizations:'#000+ + '6*2Amot_','Standard Motorola assembler'#000+ + '6*1O_optimizations:'#000+ '6*2Oa_turn on the optimizer'#000+ '6*2Og_generate smaller code'#000+ '6*2OG_generate faster code (default)'#000+ '6*2Ox_optimize maximum (still BUGGY!!!)'#000+ '6*2O2_set target processor to a MC68020+'#000+ - '6*1R_assembler reading style:'#000+ - '6*2RMOT_read motoro','la style assembler'#000+ + '6*1R_assembler ','reading style:'#000+ + '6*2RMOT_read motorola style assembler'#000+ '6*1T_Target operating system:'#000+ '6*2TAMIGA_Commodore Amiga'#000+ '6*2TATARI_Atari ST/STe/TT'#000+ @@ -697,5 +698,5 @@ const msgtxt : array[0..000107,1..240] of char=( '6*2TLINUX_Linux-68k'#000+ '**1*_'#000+ '**1?_shows this help'#000+ - '**1h_shows this help without waiting'#000 + '**1h_shows this help without w','aiting'#000 ); diff --git a/compiler/options.pas b/compiler/options.pas index 3d7e8393ab..f723aed91f 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -873,9 +873,11 @@ var opts : string; skip : array[0..maxlevel-1] of boolean; level : longint; + option_read : boolean; begin { avoid infinite loop } Inc(FileLevel); + Option_read:=false; If FileLevel>MaxLevel then Message(option_too_many_cfg_files); { open file } @@ -978,13 +980,21 @@ begin end else begin - if (not skip[level]) and (opts[1]='-') then - interpret_option(opts,false) + if (opts[1]='-') then + begin + if (not skip[level]) then + interpret_option(opts,false); + Option_read:=true; + end + else + Message1(option_illegal_para,opts); end; end; end; if Level>0 then Message(option_too_less_endif); + if Not Option_read then + Message1(option_no_option_found,filename); Close(f); Dec(FileLevel); end; @@ -1377,7 +1387,10 @@ end; end. { $Log$ - Revision 1.49 2000-01-10 11:14:19 peter + Revision 1.50 2000-01-14 14:33:54 pierre + + some warnings for wrong lines inside config files + + Revision 1.49 2000/01/10 11:14:19 peter * fixed memory leak with options, you must use StopOptions instead of Stop * fixed memory leak with forward resolving, make_ref is now false @@ -1516,4 +1529,4 @@ end. * tlinker object is now inherited for win32 and dos * postprocessexecutable is now a method of tlinker -} +} \ No newline at end of file