diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index e506b8f0c9..e5aeafbc2b 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -180,6 +180,7 @@ type tmsgconst=( type_e_succ_and_pred_enums_with_assign_not_possible, type_e_cant_read_write_type, type_e_typeconflict_in_set, + type_e_integer_or_real_expr_expected, sym_e_id_not_found, sym_f_internal_error_in_symtablestack, sym_e_duplicate_id, @@ -451,7 +452,6 @@ type tmsgconst=( option_info_end, ol_begin, ol001, - ol120, ol002, ol003, ol004, @@ -528,9 +528,6 @@ type tmsgconst=( ol075, ol076, ol077, - ol121, - ol122, - ol123, ol078, ol079, ol080, @@ -573,6 +570,10 @@ type tmsgconst=( ol117, ol118, ol119, + ol120, + ol121, + ol122, + ol123, ol_end, endmsgconst ); diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 1883226865..ce85fbb208 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -188,230 +188,231 @@ const msgtxt : array[0..00087,1..240] of char=(+ 'E_succ or ','pred on enums with assignments not possible'#000+ 'E_Can'#039't read or write variables of this type'#000+ 'E_Type conflict between set elements'#000+ + 'E_Integer or real expression expected'#000+ 'E_Identifier not found $1'#000+ 'F_Internal Error in SymTableStack()'#000+ - 'E_Duplicate identifier $1'#000+ + 'E_Duplicate id','entifier $1'#000+ 'E_Unknown identifier $1'#000+ - 'E_','Forward declaration not solved: $1'#000+ + 'E_Forward declaration not solved: $1'#000+ 'F_Identifier type already defined as type'#000+ 'E_Error in type defenition'#000+ 'E_Type identifier not defined'#000+ - 'E_Only static variables can be used in static methods or outside metho'+ - 'ds'#000+ - 'E_Invalid call to tvarsym.mangled','name()'#000+ + 'E_Only static variables can be used in static methods or outside met','h'+ + 'ods'#000+ + 'E_Invalid call to tvarsym.mangledname()'#000+ 'F_record or class type expected'#000+ 'E_To generate an instance of a class or an object with an abtract meth'+ 'od isn'#039't allowed'#000+ 'E_Label not defined $1'#000+ 'E_Illegal label declaration'#000+ - 'E_GOTO und LABEL are not supported (use command line switch -Sg',')'#000+ + 'E_GOTO und LABEL are not ','supported (use command line switch -Sg)'#000+ 'E_Label not found'#000+ 'E_identifier isn'#039't a label'#000+ 'E_label already defined'#000+ 'E_illegal type declaration of set elements'#000+ 'E_Forward class definition not resolved $1'#000+ 'H_Parameter not used $1'#000+ - 'W_Local variable not used $1'#000+ + 'W_Local variable not ','used $1'#000+ 'E_Set type expected'#000+ - 'W_Function',' result does not seem to be set'#000+ + 'W_Function result does not seem to be set'#000+ 'E_Unknown field identifier'#000+ 'W_Local variable $1 does not seem to be initialized'#000+ 'E_identifier idents no member $1'#000+ 'B_Found declaration: $1'#000+ 'E_BREAK not allowed'#000+ - 'E_CONTINUE not allowed'#000+ - 'E_Expression too complicated ','- FPU stack overflow'#000+ + 'E_CONTINUE not',' allowed'#000+ + 'E_Expression too complicated - FPU stack overflow'#000+ 'E_Illegal expression'#000+ 'E_Invalid integer'#000+ 'E_Illegal qualifier'#000+ 'E_High range limit < low range limit'#000+ 'E_Illegal counter variable'#000+ 'E_Can'#039't determine which overloaded function to call'#000+ - 'E_Parameter list size exceeds 65535 bytes'#000+ - 'E_','Illegal type conversion'#000+ + 'E_Para','meter list size exceeds 65535 bytes'#000+ + 'E_Illegal type conversion'#000+ 'E_File types must be var parameters'#000+ 'E_The use of a far pointer isn'#039't allowed there'#000+ 'E_illegal call by reference parameters'#000+ 'E_EXPORT declared functions can'#039't be called'#000+ - 'W_Possible illegal call of constructor or destruct','or (doesn'#039't ma'+ + 'W_Possible i','llegal call of constructor or destructor (doesn'#039't ma'+ 'tch to this context)'#000+ 'N_Inefficient code'#000+ 'W_unreachable code'#000+ 'E_procedure call with stackframe ESP/SP'#000+ 'E_Abstract methods can'#039't be called directly'#000+ - 'F_Internal Error in getfloatreg(), allocation failure'#000+ + 'F_Internal Error in getfloatreg(), allocation',' failure'#000+ 'F_Unknown float type'#000+ - 'F_Second','Vecn() base defined twice'#000+ + 'F_SecondVecn() base defined twice'#000+ 'F_Extended cg68k not supported'#000+ 'F_32-bit unsigned not supported in MC68000 mode'#000+ 'F_Internal Error in secondinline()'#000+ 'D_Register $1 weight $2 $3'#000+ - 'E_Stack limit excedeed in local routine'#000+ + 'E_Stack limit excedeed in local rou','tine'#000+ 'D_Stack frame is omited'#000+ - 'E_Unable ','to inline object methods'#000+ + 'E_Unable to inline object methods'#000+ 'E_Unable to inline procvar calls'#000+ 'E_No code for inline procedure stored'#000+ 'F_Divide by zero in asm evaluator'#000+ 'F_Evaluator stack overflow'#000+ 'F_Evaluator stack underflow'#000+ - 'F_Invalid numeric format in asm evaluator'#000+ - 'F_Invalid Ope','rator in asm evaluator'#000+ + 'F_Invalid numeric',' format in asm evaluator'#000+ + 'F_Invalid Operator in asm evaluator'#000+ 'F_Unknown error in asm evaluator'#000+ 'W_Invalid numeric value'#000+ 'E_escape sequence ignored: $1'#000+ 'E_Asm syntax error - Prefix not found'#000+ - 'E_Asm syntax error - Trying to add more than one prefix'#000+ - 'E_Asm syntax error - Opcode not foun','d'#000+ + 'E_Asm syntax error - Trying to add more than one prefi','x'#000+ + 'E_Asm syntax error - Opcode not found'#000+ 'E_Invalid symbol reference'#000+ 'W_Calling an overload function in an asm'#000+ 'E_Constant value out of bounds'#000+ 'E_Non-label pattern contains @'#000+ 'E_Invalid Operand: $1'#000+ 'W_Override operator not supported'#000+ - 'E_Error in binary constant: $1'#000+ - 'E_Error in octal cons','tant: $1'#000+ + 'E_Error in bin','ary constant: $1'#000+ + 'E_Error in octal constant: $1'#000+ 'E_Error in hexadecimal constant: $1'#000+ 'E_Error in integer constant: $1'#000+ 'E_Invalid labeled opcode'#000+ 'F_Internal error in Findtype()'#000+ 'E_Invalid size for MOVSX/MOVZX'#000+ 'E_16-bit base in 32-bit segment'#000+ - 'E_16-bit index in 32-bit segment'#000+ - 'E_Invalid O','pcode'#000+ + 'E_16-b','it index in 32-bit segment'#000+ + 'E_Invalid Opcode'#000+ 'E_Constant reference not allowed'#000+ 'W_Fwait can cause emulation problems with emu387'#000+ 'E_Invalid combination of opcode and operands'#000+ 'W_Opcode $1 not in table, operands not checked'#000+ - 'F_Internal Error in ConcatOpcode()'#000+ - 'E_Invalid size in referen','ce'#000+ + 'F_Internal Error in Co','ncatOpcode()'#000+ + 'E_Invalid size in reference'#000+ 'E_Invalid middle sized operand'#000+ 'E_Invalid three operand opcode'#000+ 'E_Assembler syntax error'#000+ 'E_Invalid operand type'#000+ 'E_Segment overrides not supported'#000+ 'E_Invalid constant symbol $1'#000+ - 'F_Internal Errror converting binary'#000+ - 'F_Internal Errror converting',' hexadecimal'#000+ + 'F_Internal Errror converti','ng binary'#000+ + 'F_Internal Errror converting hexadecimal'#000+ 'F_Internal Errror converting octal'#000+ 'E_Invalid constant expression'#000+ 'E_Unknown identifier: $1'#000+ 'E_Trying to define an index register more than once'#000+ 'E_Invalid field specifier'#000+ - 'F_Internal Error in BuildScaling()'#000+ - 'E_Invalid scaling factor',#000+ + 'F_Internal Error in B','uildScaling()'#000+ + 'E_Invalid scaling factor'#000+ 'E_Invalid scaling value'#000+ 'E_Scaling value only allowed with index'#000+ 'E_Invalid assembler syntax. No ref with brackets)'#000+ 'E_Expressions of the form [sreg:reg...] are currently not supported'#000+ - 'E_Trying to define a segment register twice'#000+ - 'E_Trying to d','efine a base register twice'#000+ + 'E_Trying to define ','a segment register twice'#000+ + 'E_Trying to define a base register twice'#000+ 'E_Trying to use a negative index register'#000+ 'E_Asm syntax error - error in reference'#000+ 'E_Local symbols not allowed as references'#000+ 'E_Invalid operand in bracket expression'#000+ - 'E_Invalid symbol name: $1'#000+ - 'E_Invalid Reference sy','ntax'#000+ + 'E_Invalid ','symbol name: $1'#000+ + 'E_Invalid Reference syntax'#000+ 'E_Invalid string as opcode operand: $1'#000+ 'W_@CODE and @DATA not supported'#000+ 'E_Null label references are not allowed'#000+ 'W_Calling of an overloaded function in direct assembler'#000+ - 'E_Cannot use SELF outside a method'#000+ - 'E_Asm syntax error - Should start',' with bracket'#000+ + 'E_Cannot use SELF outside a me','thod'#000+ + 'E_Asm syntax error - Should start with bracket'#000+ 'E_Asm syntax error - register: $1'#000+ 'E_SEG and OFFSET not supported'#000+ 'E_Asm syntax error - in opcode operand'#000+ 'E_Invalid String expression'#000+ 'E_Constant expression out of bounds'#000+ - 'F_Internal Error in BuildConstant()'#000+ - 'W_A repeat prefix and ','a segment override on <= i386 may result in er'+ - 'rors if an interrupt occurs'#000+ + 'F_Internal Error in ','BuildConstant()'#000+ + 'W_A repeat prefix and a segment override on <= i386 may result in erro'+ + 'rs if an interrupt occurs'#000+ 'E_Invalid or missing opcode'#000+ 'E_Invalid combination of prefix and opcode: $1'#000+ 'E_Invalid combination of override and opcode: $1'#000+ - 'E_Too many operands on line'#000+ - 'E_Duplicate lo','cal symbol: $1'#000+ + 'E_To','o many operands on line'#000+ + 'E_Duplicate local symbol: $1'#000+ 'E_Unknown label identifer: $1'#000+ 'E_Assemble node syntax error'#000+ 'E_Undefined local symbol: $1'#000+ 'D_Starting intel styled assembler parsing...'#000+ 'D_Finished intel styled assembler parsing...'#000+ - 'E_Not a directive or local symbol: $1'#000+ - 'E_/ at be','ginning of line not allowed'#000+ + 'E_Not a d','irective or local symbol: $1'#000+ + 'E_/ at beginning of line not allowed'#000+ 'E_NOR not supported'#000+ 'E_Invalid floating point register name'#000+ 'W_Modulo not supported'#000+ 'E_Invalid floating point constant: $1'#000+ 'E_Size suffix and destination register do not match'#000+ - 'E_Internal error in ConcatLabeledInstr()',#000+ + 'E_','Internal error in ConcatLabeledInstr()'#000+ 'W_Floating point binary representation ignored'#000+ 'W_Floating point hexadecimal representation ignored'#000+ 'W_Floating point octal representation ignored'#000+ 'E_Invalid real constant expression'#000+ - 'E_Parenthesis are not allowed'#000+ + 'E_Parenthesis are not',' allowed'#000+ 'E_Invalid Reference'#000+ - 'E_Cannot ','use __SELF outside a method'#000+ + 'E_Cannot use __SELF outside a method'#000+ 'E_Cannot use __OLDEBP outside a nested procedure'#000+ 'W_Identifier $1 supposed external'#000+ 'E_Invalid segment override expression'#000+ 'E_Strings not allowed as constants'#000+ - 'D_Starting AT&T styled assembler parsing...'#000+ - 'D_Finished A','T&T styled assembler parsing...'#000+ + 'D_Starting AT&T st','yled assembler parsing...'#000+ + 'D_Finished AT&T styled assembler parsing...'#000+ 'E_Switching sections is not allowed in an assembler block'#000+ 'E_Invalid global definition'#000+ 'E_Line separator expected'#000+ 'W_globl not supported'#000+ 'W_align not supported'#000+ - 'W_lcomm not supported'#000+ + 'W_lcomm not su','pported'#000+ 'W_comm not supported'#000+ - 'E_Invalid',' local common definition'#000+ + 'E_Invalid local common definition'#000+ 'E_Invalid global common definition'#000+ 'E_local symbol: $1 not found inside asm statement'#000+ 'E_assembler code not returned to text'#000+ 'F_internal error in BuildReference()'#000+ - 'E_invalid opcode size'#000+ + 'E_invalid opcode ','size'#000+ 'W_NEAR ignored'#000+ 'W_FAR ignored'#000+ - 'D_Cr','eating inline asm lookup tables'#000+ + 'D_Creating inline asm lookup tables'#000+ 'W_Using a defined name as a local label'#000+ 'F_internal error in HandleExtend()'#000+ 'E_Invalid character: <'#000+ 'E_Invalid character: >'#000+ 'E_Unsupported opcode'#000+ - 'E_Increment and Decrement mode not allowed together'#000+ - 'E_Invalid Regi','ster list in movem/fmovem'#000+ + 'E_Increment and Decrement mo','de not allowed together'#000+ + 'E_Invalid Register list in movem/fmovem'#000+ 'E_Invalid Register list for opcode'#000+ 'E_68020+ mode required to assemble'#000+ 'D_Starting Motorola styled assembler parsing...'#000+ 'D_Finished Motorola styled assembler parsing...'#000+ - 'W_XDEF not supported'#000+ - 'W_Functions with void retur','n value can'#039't return any value in asm'+ - ' code'#000+ + 'W_XDEF not',' supported'#000+ + 'W_Functions with void return value can'#039't return any value in asm c'+ + 'ode'#000+ 'E_Invalid suffix for intel assembler'#000+ 'E_Extended not supported in this mode'#000+ 'E_Comp not supported in this mode'#000+ - 'W_You need GNU as version >= 2.81 to compile this MMX code'#000+ + 'W_You need GNU as version >= 2.81 to compile this ','MMX code'#000+ 'F_Too many assembler files'#000+ - 'F_','Selected assembler output not supported'#000+ + 'F_Selected assembler output not supported'#000+ 'E_Unsupported symbol type for operand'#000+ 'I_Assembling (pipe) $1'#000+ 'E_Can'#039't create assember file $1'#000+ 'W_Assembler $1 not found, switching to external assembling'#000+ - 'U_Using assembler: $1'#000+ - 'W_Error while assembling e','xitcode $1'#000+ + 'U_Using as','sembler: $1'#000+ + 'W_Error while assembling exitcode $1'#000+ 'W_Can'#039't call the assembler, error $1 switching to external assembl'+ 'ing'#000+ 'I_Assembling $1'#000+ 'W_Linker $1 not found, switching to external linking'#000+ 'U_Using linker: $1'#000+ - 'W_Object $1 not found, Linking may fail !'#000+ - 'W_Library $1 not found, Linki','ng may fail !'#000+ + 'W_Object $1 not found, Linking ma','y fail !'#000+ + 'W_Library $1 not found, Linking may fail !'#000+ 'W_Error while linking'#000+ 'W_Can'#039't call the linker, switching to external linking'#000+ 'I_Linking $1'#000+ 'W_binder not found, switching to external binding'#000+ 'W_ar not found, switching to external ar'#000+ - 'E_Dynamic Libraries not supported'#000+ - 'I_Closing s','cript $1'#000+ + 'E_Dynam','ic Libraries not supported'#000+ + 'I_Closing script $1'#000+ 'U_PPU Loading $1'#000+ 'D_PPU Time: $1'#000+ 'D_PPU File too short'#000+ @@ -420,8 +421,8 @@ const msgtxt : array[0..00087,1..240] of char=(+ 'D_PPU Flags: $1'#000+ 'D_PPU Crc: $1'#000+ 'T_PPU Source: $1'#000+ - 'D_objectfile and assemblerfile are older than ppufile'#000+ - 'D_objectf','ile is older than assemblerfile'#000+ + 'D_objectfile and assemble','rfile are older than ppufile'#000+ + 'D_objectfile is older than assemblerfile'#000+ 'T_Unitsearch: $1'#000+ 'U_Writing $1'#000+ 'F_Can'#039't Write PPU-File'#000+ @@ -430,57 +431,57 @@ const msgtxt : array[0..00087,1..240] of char=(+ 'F_PPU Dbx count problem'#000+ 'E_Illegal unit name: $1'#000+ 'F_Too much units'#000+ - 'F_Circular unit reference'#000+ - 'F_Can'#039't compile ','unit $1, no sources available'#000+ + 'F_Ci','rcular unit reference'#000+ + 'F_Can'#039't compile unit $1, no sources available'#000+ 'W_Compiling the system unit requires the -Us switch'#000+ 'F_There were $1 errors compiling module, stopping'#000+ '$1 [options] [options]'#000+ 'W_Only one source file supported'#000+ - 'W_DEF file can be created only for OS/2'#000,+ + '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 command line'#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+ + 'N_Reading further o','ptions from $1'#000+ + 'W_Target is already set to: $1'#000+ 'W_Shared libs not supported 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 w','ith -dGDB'#000+ + 'W_Debug information generation is not supported ','by this executable'#000+ + 'H_Try recompiling with -dGDB'#000+ 'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+ 'Copyright (c) 1993-98 by Florian Klaempfl'#000+ 'Free Pascal Compiler version $FPCVER'#000+ ''#000+ 'Compiler Date : $FPCDATE'#000+ - 'Compiler Target: $FPCTARGET'#000+ + 'Compiler Target: $F','PCTARGET'#000+ ''#000+ - 'This program comes under',' the GNU General Public Licence'#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@mail.tolna.hungary.net'#000+ '**0*_+ switch option on, - off'#000+ - '**1a_the compiler doesn'#039't delete the generated assemb','ler file'#000+ + '**1a_the compil','er doesn'#039't delete the generated assembler file'#000+ '**2al_list sourcecode lines in assembler file (still BETA !!)'#000+ '*t1b_use EMS'#000+ '**1B_build all modules'#000+ '**1C_code generation options'#000+ '3*2CD_create dynamic library'#000+ - '**2Ch_ bytes heap (between 1023 and 67107840)'#000+ + '**2Ch_ bytes heap (between 102','3 and 67107840)'#000+ '**2Ci_IO-checking'#000+ - '**2C','n_omit linking stage'#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+ '3*2CS_create static library'#000+ '3*2Cx_use smartlinking'#000+ - '**1d_defines the symbol '#000+ - '*O1D_generate a DEF f','ile'#000+ + '**1d_define','s the symbol '#000+ + '*O1D_generate a DEF file'#000+ '*O2Dd_set description to '#000+ '*O2Dw_PM application'#000+ '**1e_set path to executable'#000+ @@ -488,40 +489,40 @@ const msgtxt : array[0..00087,1..240] of char=(+ '**1F_set file names and paths'#000+ '**2Fe_redirect error output to '#000+ '*L2Fg_same as -Fl'#000+ - '**2Fi_adds to include path'#000+ - '**2Fl_add','s to library path'#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+ '**2Fr_load error message file '#000+ '**2Fu_adds to unit path'#000+ '*g1g_generate debugger information'#000+ - '*g2gg_use gsym'#000+ + '*g2gg_us','e gsym'#000+ '*g2gd_use dbx'#000+ - '**1i_information'#000,+ + '**1i_information'#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'#000+ - '*L1P_use pipes instead o','f creating temporary assembler files'#000+ + '**1pg_generate profile c','ode for gprof'#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_compiler disposes asm lists (uses less memory but slower)'#000+ - '**2Se_compiler stops after t','he first error'#000+ + '**2Sd_compiler disposes asm lists (uses less memory bu','t slower)'#000+ + '**2Se_compiler stops after the first error'#000+ '**2Sg_allow LABEL and GOTO'#000+ '**2Si_support C++ stlyed 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 d','one)'#000+ + '**2Ss_constructor n','ame must be init (destructor must be done)'#000+ '**2St_allow static keyword in objects'#000+ '**2Sv_allow variable directives (cvar,external,public,export)'#000+ '**1s_don'#039't call assembler and linker (only with -a)'#000+ '**1T_Target operating system'#000+ - '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+ - '3*2','TGO32V2_version 2 of DJ Delorie DOS extender'#000+ + '3*2TGO32V1_ve','rsion 1 of DJ Delorie DOS extender'#000+ + '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+ '3*2TLINUX_Linux'#000+ '3*2TOS2_OS/2 2.x'#000+ '3*2TWin32_Windows 32 Bit'#000+ @@ -529,63 +530,63 @@ const msgtxt : array[0..00087,1..240] of char=(+ '6*2TATARI_Atari ST/STe/TT'#000+ '6*2TMACOS_Macintosh m68k'#000+ '6*2TLINUX_Linux-68k'#000+ - '**1u_undefines the symbol '#000+ - '**1U_un','it options'#000+ + '**','1u_undefines the symbol '#000+ + '**1U_unit options'#000+ '**2Un_don'#039't check the unit name'#000+ '**2Up_same as -Fu'#000+ '**2Us_compile a system 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 warnin','gs u : Show used files'#000+ + '**2*_e : Show errors (default) d ',': Show debug info'#000+ + '**2*_w : Show warnings u : Show used files'#000+ '**2*_n : Show notes t : Show tried files'#000+ '**2*_h : Show hints m : Show defined macros'#000+ - '**2*_i : Show general info p : Show compiled procedures'#000+ - '**2*_l : Show line','numbers c : Show conditionals'#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'#000+ '**2*_ declarations if an error'#000+ '**2*_ occurs'#000+ - '**1X_executable options'#000+ - '*L2Xc_link with the c libra','ry'#000+ + '**1X_executab','le options'#000+ + '*L2Xc_link with the c library'#000+ '**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+ '**2Xs_strip all symbols from executable'#000+ '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+ '**0*_Processor specific options:'#000+ - '3*1A_output format'#000+ - '3*2Ao_coff file using GNU',' AS'#000+ + '3*1A_o','utput format'#000+ + '3*2Ao_coff file using GNU AS'#000+ '3*2Anasmcoff_coff file using Nasm'#000+ '3*2Anasmelf_elf32 (linux) file using Nasm'#000+ '3*2Anasmobj_obj file using Nasm'#000+ '3*2Amasm_obj using Masm (Mircosoft)'#000+ '3*2Atasm_obj using Tasm (Borland)'#000+ - '3*1R_assembler reading style'#000+ - '3*2Ratt_read AT&T style assem','bler'#000+ + '3*1R_assembler readi','ng 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*1O_optimizations'#000+ '3*2Og_generate smaller code'#000+ '3*2OG_generate faster code (default)'#000+ - '3*2Or_keep certain variables in registers (still BUGG','Y!!!)'#000+ + '3*2Or_keep cert','ain variables in registers (still BUGGY!!!)'#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*2O3_level 3 optimizations (same as -O2u',')'#000+ '3*2Op_target processor'#000+ - '3*3Op1_set ta','rget processor to 386/486'#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+ '6*1A_output format'#000+ '6*2Ao_Unix o-file using GNU AS'#000+ - '6*2Agas_GNU Motorola assembler'#000+ - '6*2Amit_MIT Syntax (old ','GAS)'#000+ + '6*2Agas_GNU Motor','ola assembler'#000+ + '6*2Amit_MIT Syntax (old GAS)'#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+ - '**1*_'#000,+ + '6*2O2_set',' target processor to a MC68020+'#000+ + '**1*_'#000+ '**1?_shows this help'#000+ '**1h_shows this help without waiting'#000 ); diff --git a/compiler/pass_1.pas b/compiler/pass_1.pas index d6173f3aaf..b6d95687d2 100644 --- a/compiler/pass_1.pas +++ b/compiler/pass_1.pas @@ -4072,41 +4072,30 @@ unit pass_1; if assigned(hp) and assigned(hp^.resulttype) then Begin if (hp^.resulttype^.deftype=filedef) and - (pfiledef(hp^.resulttype)^.filetype=ft_typed) then - begin + (pfiledef(hp^.resulttype)^.filetype=ft_typed) then + begin file_is_typed:=true; - { test the type here - so we can use a trick in cgi386 (PM) } + { test the type } hpp:=p^.left; while (hpp<>hp) do - begin - { should we allow type conversion ? (PM) - if not isconvertable(hpp^.resulttype, - pfiledef(hp^.resulttype)^.typed_as,convtyp,hpp^.treetype) then - Message(type_e_mismatch); - if not(is_equal(hpp^.resulttype,pfiledef(hp^.resulttype)^.typed_as)) then - begin - hpp^.left:=gentypeconvnode(hpp^.left,pfiledef(hp^.resulttype)^.typed_as); - end; } - if not is_equal(hpp^.resulttype,pfiledef(hp^.resulttype)^.typed_as) then - Message(type_e_mismatch); - hpp:=hpp^.right; - end; - { once again for typeconversions } - firstcallparan(p^.left,nil); - end; + begin + if not is_equal(hpp^.resulttype,pfiledef(hp^.resulttype)^.typed_as) then + Message(type_e_mismatch); + hpp:=hpp^.right; + end; + end; end; { endif assigned(hp) } { insert type conversions for write(ln) } - if (not file_is_typed) and - ((p^.inlinenumber in [in_write_x,in_writeln_x,in_read_x,in_readln_x])) then + if (not file_is_typed) then begin - hp:=p^.left; dowrite:=(p^.inlinenumber in [in_write_x,in_writeln_x]); + hp:=p^.left; while assigned(hp) do begin if assigned(hp^.left^.resulttype) then begin + isreal:=false; case hp^.left^.resulttype^.deftype of filedef : begin { only allowed as first parameter } @@ -4152,17 +4141,43 @@ unit pass_1; Message(type_e_cant_read_write_type); end; end; - else - Message(type_e_cant_read_write_type); - end + else + Message(type_e_cant_read_write_type); + end; + + { some format options ? } + hpp:=hp^.right; + if assigned(hpp) and hpp^.is_colon_para then + begin + if (not is_integer(hpp^.resulttype)) then + Message(type_e_integer_expr_expected) + else + hpp^.left:=gentypeconvnode(hpp^.left,s32bitdef); + hpp:=hpp^.right; + if assigned(hpp) and hpp^.is_colon_para then + begin + if isreal then + begin + if (not is_integer(hpp^.resulttype)) then + Message(type_e_integer_expr_expected) + else + hpp^.left:=gentypeconvnode(hpp^.left,s32bitdef); + end + else + Message(parser_e_illegal_colon_qualifier); + end; + end; + end; hp:=hp^.right; end; end; - { pass all parameters again } + { pass all parameters again for the typeconversions } + if codegenerror then + exit; + must_be_valid:=true; firstcallparan(p^.left,nil); - { this was missing to get the right - registers32 value at first pass PM } + { calc registers } left_right_max(p); end; end; @@ -4208,7 +4223,6 @@ unit pass_1; p^.left^.right:=hp; firstcallparan(p^.left^.right,nil); hp:=p^.left; - isreal:=false; { valid string ? } if not assigned(hp) or (hp^.left^.resulttype^.deftype<>stringdef) or @@ -4217,52 +4231,66 @@ unit pass_1; Message(cg_e_illegal_expression); { !!!! check length of string } - while assigned(hp^.right) do hp:=hp^.right; - + while assigned(hp^.right) do + hp:=hp^.right; { check and convert the first param } if hp^.is_colon_para then - Message(cg_e_illegal_expression) - else if hp^.resulttype^.deftype=orddef then - case porddef(hp^.left^.resulttype)^.typ of - u8bit,s8bit, - u16bit,s16bit : - hp^.left:=gentypeconvnode(hp^.left,s32bitdef); - end - else if hp^.resulttype^.deftype=floatdef then - begin - isreal:=true; - end - else Message(cg_e_illegal_expression); + Message(cg_e_illegal_expression); + + isreal:=false; + case hp^.resulttype^.deftype of + orddef : begin + case porddef(hp^.left^.resulttype)^.typ of + u32bit,s32bit : ; + u8bit,s8bit, + u16bit,s16bit : hp^.left:=gentypeconvnode(hp^.left,s32bitdef); + else + Message(type_e_integer_or_real_expr_expected); + end; + end; + floatdef : begin + isreal:=true; + end; + else + Message(type_e_integer_or_real_expr_expected); + end; { some format options ? } - hp:=p^.left^.right; - if assigned(hp) and hp^.is_colon_para then + hpp:=p^.left^.right; + if assigned(hpp) and hpp^.is_colon_para then begin - hp^.left:=gentypeconvnode(hp^.left,s32bitdef); - hp:=hp^.right; - end; - if assigned(hp) and hp^.is_colon_para then - begin - if isreal then - hp^.left:=gentypeconvnode(hp^.left,s32bitdef) - else - Message(parser_e_illegal_colon_qualifier); - hp:=hp^.right; + if (not is_integer(hpp^.resulttype)) then + Message(type_e_integer_expr_expected) + else + hpp^.left:=gentypeconvnode(hpp^.left,s32bitdef); + hpp:=hpp^.right; + if assigned(hpp) and hpp^.is_colon_para then + begin + if isreal then + begin + if (not is_integer(hpp^.resulttype)) then + Message(type_e_integer_expr_expected) + else + hpp^.left:=gentypeconvnode(hpp^.left,s32bitdef); + end + else + Message(parser_e_illegal_colon_qualifier); + end; end; { for first local use } must_be_valid:=false; count_ref:=true; - if assigned(hp) then - firstcallparan(hp,nil); end else Message(parser_e_illegal_parameter_list); - { check params once more } + { pass all parameters again for the typeconversions } if codegenerror then exit; must_be_valid:=true; firstcallparan(p^.left,nil); + { calc registers } + left_right_max(p); end; in_include_x_y, in_exclude_x_y: @@ -5456,7 +5484,11 @@ unit pass_1; end. { $Log$ - Revision 1.76 1998-09-07 18:46:05 peter + Revision 1.77 1998-09-07 22:25:52 peter + * fixed str(boolean,string) which was allowed + * fixed write(' ':) only constants where allowed :( + + Revision 1.76 1998/09/07 18:46:05 peter * update smartlinking, uses getdatalabel * renamed ptree.value vars to value_str,value_real,value_set diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas index 8587eecbbc..6be2dc6219 100644 --- a/compiler/pexpr.pas +++ b/compiler/pexpr.pas @@ -87,8 +87,6 @@ unit pexpr; begin consume(COLON); p1:=comp_expr(true); - if not is_constintnode(p1) then - Message(type_e_integer_expr_expected); p2:=gencallparanode(p1,p2); p2^.is_colon_para:=true; if token=COLON then @@ -1857,7 +1855,11 @@ unit pexpr; end. { $Log$ - Revision 1.47 1998-09-07 18:46:10 peter + Revision 1.48 1998-09-07 22:25:53 peter + * fixed str(boolean,string) which was allowed + * fixed write(' ':) only constants where allowed :( + + Revision 1.47 1998/09/07 18:46:10 peter * update smartlinking, uses getdatalabel * renamed ptree.value vars to value_str,value_real,value_set