From 532d85cd50735b9a7c7e11564e219b1c0057b5fb Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 1 Oct 1999 10:05:37 +0000 Subject: [PATCH] + procedure directive support in const declarations, fixes bug #232 --- compiler/errore.msg | 9 ++ compiler/msgidx.inc | 1 + compiler/msgtxt.inc | 247 ++++++++++++++++++++++--------------------- compiler/pdecl.pas | 57 ++++++++-- compiler/psub.pas | 68 +++++++++--- compiler/symdef.inc | 54 +++++++++- compiler/symdefh.inc | 6 +- 7 files changed, 288 insertions(+), 154 deletions(-) diff --git a/compiler/errore.msg b/compiler/errore.msg index 95bf622456..e43af077a8 100644 --- a/compiler/errore.msg +++ b/compiler/errore.msg @@ -788,6 +788,15 @@ parser_e_only_publishable_classes_can__be_published=E_Only class which are compi % In the published section of a class can be only class as fields used which % are compiled in $M+ or which are derived from such a class. Normally % such a class should be derived from TPersitent +parser_e_proc_directive_expected=E_Procedure directive expected +% When declaring a procedure in a const block you used a ; after the +% procedure declaration after which a procedure directive must follow. +% Correct declarations are: +% \begin{verbatim} +% const +% p : procedure;stdcall=nil; +% p : procedure stdcall=nil; +% \end{verbatim} % \end{description} # # Type Checking diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index ca5f99d5e1..4b147ede66 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -211,6 +211,7 @@ type tmsgconst=( parser_e_stored_property_must_be_boolean, parser_e_ill_property_storage_sym, parser_e_only_publishable_classes_can__be_published, + parser_e_proc_directive_expected, type_e_mismatch, type_e_incompatible_types, type_e_not_equal_types, diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index ef2ad5b88a..715470494b 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -225,48 +225,49 @@ const msgtxt : array[0..000102,1..240] of char=( 'E_The type of the storage symbol must be boolean'#000+ 'E_This symbol isn'#039't allowed as storage symbol'#000+ 'E_Only class which are compiled',' in $M+ mode can be published'#000+ + 'E_Procedure directive expected'#000+ 'E_Type mismatch'#000+ 'E_Incompatible types: got "$1" expected "$2"'#000+ 'E_Type mismatch between $1 and $2'#000+ 'E_Type identifier expected'#000+ 'E_Variable identifier expected'#000+ - 'E_Integer expression expected, but got "$1"'#000+ - 'E_Boolean exp','ression expected, but got "$1"'#000+ + 'E_Integer expression expec','ted, but got "$1"'#000+ + 'E_Boolean expression expected, but got "$1"'#000+ 'E_Ordinal expression expected'#000+ 'E_pointer type expected, but got "$1"'#000+ 'E_class type expected, but got "$1"'#000+ 'E_Variable or type indentifier expected'#000+ - 'E_Can'#039't evaluate constant expression'#000+ - 'E_Set elements are not compa','tible'#000+ + 'E_Can'#039't evaluate constant expressi','on'#000+ + 'E_Set elements are not compatible'#000+ 'E_Operation not implemented for sets'#000+ 'W_Automatic type conversion from floating type to COMP which is an int'+ 'eger type'#000+ 'H_use DIV instead to get an integer result'#000+ - 'E_string types doesn'#039't match, because of $V+ mode'#000+ - 'E_succ or pred on enums ','with assignments not possible'#000+ + 'E_string types doesn'#039't match, because of $V','+ mode'#000+ + '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+ 'W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+ 'E_Integer or real expression expected'#000+ - 'E_Wrong type in array constructor'#000, + 'E_W','rong type in array constructor'#000+ 'E_Incompatible type for arg no. $1: Got $2, expected $3'#000+ 'E_Method (variable) and Procedure (variable) are not compatible'#000+ 'E_Illegal constant passed to internal math function'#000+ - 'E_Can'#039't get the address of constants'#000+ + 'E_Can'#039't get the address of constants'#000, 'E_Argument must be l-value'#000+ - 'E_Ca','n'#039't assign local procedure/function to procedure variable'#000+ + 'E_Can'#039't assign local procedure/function to procedure variable'#000+ 'E_Can'#039't assign values to an address'#000+ 'E_Identifier not found $1'#000+ 'F_Internal Error in SymTableStack()'#000+ 'E_Duplicate identifier $1'#000+ - 'H_Identifier already defined in $1 at line $2'#000+ - 'E_Unknown id','entifier $1'#000+ + 'H_Identifier already define','d in $1 at line $2'#000+ + 'E_Unknown identifier $1'#000+ 'E_Forward declaration not solved $1'#000+ 'F_Identifier type already defined as type'#000+ 'E_Error in type definition'#000+ 'E_Type identifier not defined'#000+ 'E_Forward type not resolved $1'#000+ - 'E_Only static variables can be used in static methods or outsi','de met'+ + 'E_Only static variables can be ','used in static methods or outside met'+ 'hods'#000+ 'E_Invalid call to tvarsym.mangledname()'#000+ 'F_record or class type expected'#000+ @@ -274,21 +275,21 @@ const msgtxt : array[0..000102,1..240] of char=( 'wed'#000+ 'W_Label not defined $1'#000+ 'E_Illegal label declaration'#000+ - 'E_GOTO and LABEL are not support','ed (use switch -Sg)'#000+ + 'E','_GOTO and LABEL are not supported (use 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+ - 'N_Local variable not used $1'#000+ - 'E_Set type e','xpected'#000+ + 'N_Local va','riable not used $1'#000+ + 'E_Set type expected'#000+ 'W_Function result does not seem to be set'#000+ 'E_Unknown record field identifier $1'#000+ 'W_Local variable $1 does not seem to be initialized'#000+ 'W_Variable $1 does not seem to be initialized'#000+ - 'E_identifier idents no member $1'#000+ - 'B_Found declaration: $','1'#000+ + 'E_identifier idents no m','ember $1'#000+ + 'B_Found declaration: $1'#000+ 'E_Data segment too large (max. 2GB)'#000+ 'E_BREAK not allowed'#000+ 'E_CONTINUE not allowed'#000+ @@ -296,162 +297,162 @@ const msgtxt : array[0..000102,1..240] of char=( 'E_Illegal expression'#000+ 'E_Invalid integer expression'#000+ 'E_Illegal qualifier'#000+ - 'E_High range limit < low range limit'#000+ - 'E_','Illegal counter variable'#000+ + 'E_High r','ange 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+ - 'D_Conversion between ordinals and pointers is not portable across plat'+ - 'forms'#000+ - 'E_File types must b','e var parameters'#000+ + 'D_Conversion between ordinals and pointers is not portable acros','s pl'+ + 'atforms'#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 destructor (doesn'#039't matc'+ - 'h to this context)'#000+ - 'N_Ineffi','cient code'#000+ + 'W_Possible illegal 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_Unknown float type'#000+ - 'F_SecondVecn() base defined twice'#000+ - 'F_Extended cg68k ','not supported'#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+ 'D_Stack frame is omitted'#000+ - 'E_Object or class methods can'#039't be inline.'#000+ - 'E_Procva','r calls can'#039't be inline.'#000+ + 'E_Object or class me','thods can'#039't be inline.'#000+ + 'E_Procvar calls can'#039't be inline.'#000+ 'E_No code for inline procedure stored'#000+ 'E_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+ 'se (set)length instead'#000+ 'E_Include and exclude not implemented in this case'#000+ - 'E_Constructors or destructors can not',' be called inside a '#039'with'#039+ + 'E_Cons','tructors or destructors can not be called inside a '#039'with'#039+ ' clause'#000+ 'E_Cannot call message handler method directly'#000+ 'D_Starting $1 styled assembler parsing'#000+ 'D_Finished $1 styled assembler parsing'#000+ 'E_Non-label pattern contains @'#000+ - 'W_Override operator not supported'#000+ - 'E_Error building ','record offset'#000+ + 'W_Override operator ','not supported'#000+ + 'E_Error building record offset'#000+ 'E_OFFSET used without identifier'#000+ 'E_TYPE used without identifier'#000+ 'E_Cannot use local variable or parameters here'#000+ 'E_need to use OFFSET here'#000+ 'E_Cannot use multiple relocatable symbols'#000+ - 'E_Relocatable symbol can only be added'#000+ - 'E_Invali','d constant expression'#000+ + 'E_Relocatable sy','mbol can only be added'#000+ + 'E_Invalid constant expression'#000+ 'E_Relocatable symbol is not allowed'#000+ 'E_Invalid reference syntax'#000+ 'E_Local symbols/labels aren'#039't allowed as references'#000+ 'E_Invalid base and index register usage'#000+ 'E_Wrong scale factor specified'#000+ - 'E_Multiple index register usage'#000, + 'E','_Multiple index register usage'#000+ 'E_Invalid operand type'#000+ 'E_Invalid string as opcode operand: $1'#000+ 'W_@CODE and @DATA not supported'#000+ 'E_Null label references are not allowed'#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_Evaluator st','ack underflow'#000+ + 'F_Invalid numeric format in asm evaluator'#000+ 'F_Invalid Operator in asm evaluator'#000+ 'E_escape sequence ignored: $1'#000+ 'E_Invalid symbol reference'#000+ 'W_Fwait can cause emulation problems with emu387'#000+ - 'W_Calling an overload function in assembler'#000+ - 'E_Unsupported symbol type for',' operand'#000+ + 'W_Calling an overload function in assemble','r'#000+ + 'E_Unsupported symbol type for operand'#000+ 'E_Constant value out of bounds'#000+ 'E_Error converting decimal $1'#000+ 'E_Error converting octal $1'#000+ 'E_Error converting binary $1'#000+ 'E_Error converting hexadecimal $1'#000+ 'H_$1 translated to $2'#000+ - 'W_$1 is associated to an overloaded function'#000+ - 'E_Cannot use',' SELF outside a method'#000+ + 'W_$1 is associated to an o','verloaded function'#000+ + 'E_Cannot use SELF outside a method'#000+ 'E_Cannot use OLDEBP outside a nested procedure'#000+ 'W_Functions with void return value can'#039't return any value in asm c'+ 'ode'#000+ 'E_SEG not supported'#000+ - 'E_Size suffix and destination or source size do not match'#000+ - 'W_Size suffix and dest','ination or source size do not match'#000+ + 'E_Size suffix and destination or source size do n','ot match'#000+ + 'W_Size suffix and destination or source size do not match'#000+ 'E_Assembler syntax error'#000+ 'E_Invalid combination of opcode and operands'#000+ 'E_Assemler syntax error in operand'#000+ 'E_Assemler syntax error in constant'#000+ 'E_Invalid String expression'#000+ - '32bit constant created for address'#000, + '32bi','t constant created for address'#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+ 'W_NEAR ignored'#000+ 'W_FAR ignored'#000+ - 'E_Duplicate local symbol $1'#000+ + 'E_Duplicate local symbol $1'#000, 'E_Undefined local symbol $1'#000+ - 'E_U','nknown label identifier $1'#000+ + 'E_Unknown label identifier $1'#000+ 'E_Invalid floating point register name'#000+ 'E_NOR not supported'#000+ 'W_Modulo not supported'#000+ 'E_Invalid floating point constant $1'#000+ 'E_Invalid floating point expression'#000+ 'E_Wrong symbol type'#000+ - 'E_Cannot index a local var or paramete','r with a register'#000+ + 'E_Canno','t index a local var or parameter with a register'#000+ 'E_Invalid segment override expression'#000+ 'W_Identifier $1 supposed external'#000+ 'E_Strings not allowed as constants'#000+ 'No type of variable specified'#000+ 'E_assembler code not returned to text section'#000+ - 'E_Not a directive or local symbol $1'#000+ - 'E_','Using a defined name as a local label'#000+ + 'E_Not a ','directive or local symbol $1'#000+ + 'E_Using a defined name as a local label'#000+ 'E_Dollar token is used without an identifier'#000+ 'W_32bit constant created for address'#000+ 'N_.align is target specific, use .balign or .p2align'#000+ - 'E_Can'#039't access fields directly for parameters'#000+ - 'E_Can'#039't access fields',' of objects/classes directly'#000+ + 'E_Can'#039't access fields directly for p','arameters'#000+ + 'E_Can'#039't access fields of objects/classes directly'#000+ 'F_Too many assembler files'#000+ 'F_Selected assembler output not supported'#000+ 'F_Comp not supported'#000+ 'F_Direct not support for binary writers'#000+ - 'E_Allocating of data is only allowed in bss section'#000+ + 'E_Allocating of data is only allowed in bss sectio','n'#000+ 'F_No binary writer selected'#000+ - 'E','_Asm: Opcode $1 not in table'#000+ + 'E_Asm: Opcode $1 not in table'#000+ 'E_Asm: $1 invalid combination of opcode and operands'#000+ 'E_Asm: 16 Bit references not supported'#000+ 'E_Asm: Invalid effective address'#000+ 'E_Asm: Immediate or reference expected'#000+ - 'E_Asm: $1 value exceeds bounds $2'#000+ - 'E_Asm: Short ','jump is out of range $1'#000+ + 'E_Asm: $1 value ','exceeds bounds $2'#000+ + 'E_Asm: Short jump is out of range $1'#000+ 'W_Source operating system redefined'#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+ 'T_Using assembler: $1'#000+ - 'W_Error while assembling exitcode $1'#000+ - 'W_Can'#039't',' call the assembler, error $1 switching to external assem'+ - 'bling'#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+ 'I_Assembling smartlink $1'#000+ 'W_Linker $1 not found, switching to external linking'#000+ 'T_Using linker: $1'#000+ - 'W_Object $1 not found, Linking may fail !'#000+ - 'W_Library $1 not foun','d, Linking may fail !'#000+ + 'W_Object $1 not found, Linking m','ay 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_C','losing script $1'#000+ + 'E_Dyna','mic Libraries not supported'#000+ + 'I_Closing script $1'#000+ 'W_resource compiler not found, switching to external mode'#000+ 'I_Compiling resource $1'#000+ 'F_Can'#039't post process executable $1'#000+ 'F_Can'#039't open executable $1'#000+ 'X_Size of Code: $1 bytes'#000+ - 'X_Size of initialized data: $1 bytes'#000+ - 'X_Size of uniniti','alized data: $1 bytes'#000+ + 'X_Size of initialized d','ata: $1 bytes'#000+ + 'X_Size of uninitialized data: $1 bytes'#000+ 'X_Stack space reserved: $1 bytes'#000+ 'X_Stack space commited: $1 bytes'#000+ 'T_Unitsearch: $1'#000+ @@ -461,7 +462,7 @@ const msgtxt : array[0..000102,1..240] of char=( 'U_PPU Crc: $1'#000+ 'U_PPU Time: $1'#000+ 'U_PPU File too short'#000+ - 'U_PPU Invalid Header (no PPU at the b','egin)'#000+ + 'U_PPU ','Invalid Header (no PPU at the begin)'#000+ 'U_PPU Invalid Version $1'#000+ 'U_PPU is compiled for an other processor'#000+ 'U_PPU is compiled for an other target'#000+ @@ -469,81 +470,81 @@ const msgtxt : array[0..000102,1..240] of char=( 'U_Writing $1'#000+ 'F_Can'#039't Write PPU-File'#000+ 'F_reading PPU-File'#000+ - 'F_unexpected end of PPU-File'#000+ - 'F_Invalid PPU-File entry: $1'#000, + 'F_unexpected end of PPU-Fil','e'#000+ + 'F_Invalid PPU-File entry: $1'#000+ 'F_PPU Dbx count problem'#000+ 'E_Illegal unit name: $1'#000+ 'F_Too much units'#000+ 'F_Circular unit reference between $1 and $2'#000+ 'F_Can'#039't compile unit $1, no sources available'#000+ 'F_Can'#039't find unit $1'#000+ - 'W_Unit $1 was not found but $2 exists'#000+ - 'F_Unit $1 searched but $2 ','found'#000+ + 'W_Unit $1 was not found but $2 ex','ists'#000+ + 'F_Unit $1 searched but $2 found'#000+ 'W_Compiling the system unit requires the -Us switch'#000+ 'F_There were $1 errors compiling module, stopping'#000+ 'U_Load from $1 ($2) unit $3'#000+ 'U_Recompiling $1, checksum changed for $2'#000+ - 'U_Recompiling $1, source found only'#000+ - 'U_Recompiling unit, static',' lib is older than ppufile'#000+ + 'U_Recompiling $1, source found ','only'#000+ + 'U_Recompiling unit, static lib is older than ppufile'#000+ 'U_Recompiling unit, shared lib is older than ppufile'#000+ 'U_Recompiling unit, obj and asm are older than ppufile'#000+ 'U_Recompiling unit, obj is older than asm'#000+ 'U_Parsing interface of $1'#000+ - 'U_Parsing implementation of $1'#000+ - 'U_Seco','nd load for unit $1'#000+ + 'U_Pars','ing implementation of $1'#000+ + 'U_Second load for unit $1'#000+ 'U_PPU Check file $1 time $2'#000+ '$1 [options] [options]'#000+ 'W_Only one source file supported'#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_Il','legal parameter: $1'#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+ - 'W_Shared libs not supported on DOS platform, reverting to static'#000+ - 'F_too many ','IF(N)DEFs'#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 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_Yo','u 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-1999 by Florian Klaempfl'#000+ - 'Free Pascal Compiler version $FPCVER'#000+ + 'Free Pascal Compiler vers','ion $FPCVER'#000+ #000+ - 'Compiler 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 boolea','n switch option to enable it, - to disable '+ - 'it'#000+ + ' fpc-devel@vekoll.saturnus.ve','in.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_list temp allocati','on/release info in assembler file'#000+ + '**2ar_list register allocation/release info in assemble','r 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 67107840)'#000+ - '**2Ci_IO-','checking'#000+ + '**2Ch_ bytes heap (betwe','en 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 lib','rary'#000+ + '**','2CX_create also smartlinked library'#000+ '**1d_defines the symbol '#000+ '*O1D_generate a DEF file'#000+ '*O2Dd_set description to '#000+ @@ -551,21 +552,21 @@ const msgtxt : array[0..000102,1..240] of char=( '**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+ + '**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+ - '*','*2Fr_load error message file '#000+ + '**2','Fo_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_generate checks for p','ointers'#000+ + '*g2gh_use heap trace u','nit'#000+ + '*g2gc_generate checks for pointers'#000+ '**1i_information'#000+ '**2iD_return compiler date'#000+ '**2iV_return compiler version'#000+ @@ -573,81 +574,81 @@ const msgtxt : array[0..000102,1..240] of char=( '**2iSP_return compiler processor'#000+ '**2iTO_return target OS'#000+ '**2iTP_return target processor'#000+ - '**1I_adds to include path'#000+ - '**1k_Pas','s to the linker'#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 creating temporary a','ssembler files'#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+ - '**2Sg_allow LA','BEL and GOTO'#000+ + '**2Se_compiler stops after the error','s (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+ - '**','2St_allow static keyword in objects'#000+ + '**2Ss_constructor name must be in','it (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+ + '**1v_B','e 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*_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 pro','cedure r : Rhide/GCC compatibility mod'+ - 'e'#000+ + '**2*_a : Show everything 0 : Show nothing (excep','t 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 executable'#000+ - '**2XD_try ','to link dynamic (defines FPC_LINK_DYNAMIC)'#000+ + '**2Xs_strip all sym','bols 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 format:'#000+ - '3*2Aas_asse','mble using GNU AS'#000+ + '3*1','A_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 (Microsoft)'#000+ - '3*2Atasm_obj ','file using Tasm (Borland)'#000+ + '3*2Amasm_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 a','ssembler text directly to assembler file'#000+ + '3*2Rintel_read Intel st','yle 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*2O','1_level 1 optimizations (quick optimizations)'#000+ + '3*2Ou_enable uncertai','n 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 target processor ','to Pentium/PentiumMMX (tm)'#000+ + '3*3Op1_set target processor to 386/4','86'#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*2TGO32V2_version 2 of DJ Delorie DOS extender',#000+ '3*2TLINUX_Linux'#000+ - '3*2TOS2_OS/2 2','.x'#000+ + '3*2TOS2_OS/2 2.x'#000+ '3*2TWin32_Windows 32 Bit'#000+ '6*1A_output format'#000+ '6*2Aas_Unix o-file using GNU AS'#000+ @@ -655,15 +656,15 @@ const msgtxt : array[0..000102,1..240] of char=( '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*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 motorola style assembler'#000+ - '6*1T_Target operating system:'#000+ - '6*2T','AMIGA_Commodore Amiga'#000+ + '6*1T_Target operating system:'#000+ + '6*2TAMIGA_Commodore Amiga'#000+ '6*2TATARI_Atari ST/STe/TT'#000+ '6*2TMACOS_Macintosh m68k'#000+ '6*2TLINUX_Linux-68k'#000+ diff --git a/compiler/pdecl.pas b/compiler/pdecl.pas index 1f387d1792..000bffbd14 100644 --- a/compiler/pdecl.pas +++ b/compiler/pdecl.pas @@ -146,6 +146,7 @@ unit pdecl; ps : pconstset; pd : pbestreal; sp : pchar; + skipequal : boolean; begin consume(_CONST); old_block_type:=block_type; @@ -155,6 +156,7 @@ unit pdecl; filepos:=tokenpos; consume(_ID); case token of + _EQUAL: begin consume(_EQUAL); @@ -210,6 +212,7 @@ unit pdecl; consume(_SEMICOLON); disposetree(p); end; + _COLON: begin { set the blocktype first so a consume also supports a @@ -220,6 +223,8 @@ unit pdecl; def:=read_type(''); ignore_equal:=false; block_type:=bt_const; + skipequal:=false; + { create symbol } storetokenpos:=tokenpos; tokenpos:=filepos; {$ifdef DELPHI_CONST_IN_RODATA} @@ -240,16 +245,45 @@ unit pdecl; end; tokenpos:=storetokenpos; symtablestack^.insert(sym); - consume(_EQUAL); + { procvar can have proc directives } + if (def^.deftype=procvardef) then + begin + { support p : procedure;stdcall=nil; } + if (token=_SEMICOLON) then + begin + consume(_SEMICOLON); + if is_proc_directive(token) then + parse_var_proc_directives(sym) + else + begin + Message(parser_e_proc_directive_expected); + skipequal:=true; + end; + end + else + { support p : procedure stdcall=nil; } + begin + if is_proc_directive(token) then + parse_var_proc_directives(sym); + end; + end; + if not skipequal then + begin + { get init value } + consume(_EQUAL); {$ifdef DELPHI_CONST_IN_RODATA} - if m_delphi in aktmodeswitches then - readtypedconst(def,ptypedconstsym(sym),true) - else + if m_delphi in aktmodeswitches then + readtypedconst(def,ptypedconstsym(sym),true) + else {$endif DELPHI_CONST_IN_RODATA} - readtypedconst(def,ptypedconstsym(sym),false); - consume(_SEMICOLON); + readtypedconst(def,ptypedconstsym(sym),false); + consume(_SEMICOLON); + end; end; - else consume(_EQUAL); + + else + { generate an error } + consume(_EQUAL); end; until token<>_ID; block_type:=old_block_type; @@ -506,7 +540,7 @@ unit pdecl; if (p^.deftype=procvardef) and (p^.sym=nil) then begin newtype:=new(ptypesym,init('unnamed',p)); - parse_var_proc_directives(newtype); + parse_var_proc_directives(psym(newtype)); newtype^.definition:=nil; p^.sym:=nil; dispose(newtype,done); @@ -2387,7 +2421,7 @@ unit pdecl; consume(_SEMICOLON); if assigned(newtype^.definition) and (newtype^.definition^.deftype=procvardef) then - parse_var_proc_directives(newtype); + parse_var_proc_directives(psym(newtype)); until token<>_ID; typecanbeforward:=false; symtablestack^.foreach({$ifndef TP}@{$endif}resolve_type_forward); @@ -2567,7 +2601,10 @@ unit pdecl; end. { $Log$ - Revision 1.158 1999-10-01 08:02:46 peter + Revision 1.159 1999-10-01 10:05:42 peter + + procedure directive support in const declarations, fixes bug 232 + + Revision 1.158 1999/10/01 08:02:46 peter * forward type declaration rewritten Revision 1.157 1999/09/27 23:44:53 peter diff --git a/compiler/psub.pas b/compiler/psub.pas index d340db7ce8..5d895f0370 100644 --- a/compiler/psub.pas +++ b/compiler/psub.pas @@ -25,7 +25,7 @@ interface uses cobjects, - symconst,symtable; + symconst,tokens,symtable; const pd_global = $1; { directive must be global } @@ -40,7 +40,8 @@ procedure compile_proc_body(const proc_names:Tstringcontainer; make_global,parent_has_class:boolean); procedure parse_proc_head(options:tproctypeoption); procedure parse_proc_dec; -procedure parse_var_proc_directives(var sym : ptypesym); +function is_proc_directive(tok:ttoken):boolean; +procedure parse_var_proc_directives(var sym : psym); procedure parse_object_proc_directives(var sym : pprocsym); procedure read_proc; @@ -48,7 +49,7 @@ procedure read_proc; implementation uses - globtype,systems,tokens, + globtype,systems, strings,globals,verbose,files, scanner,aasm,tree,types, import,gendef, @@ -912,10 +913,6 @@ end; {$F-} {$endif} -function parse_proc_direc(const proc_names:Tstringcontainer;var pdflags:word):boolean; -{ - Parse the procedure directive, returns true if a correct directive is found -} const namelength=15; type @@ -1199,6 +1196,25 @@ const ) ); + +function is_proc_directive(tok:ttoken):boolean; +var + i : longint; +begin + is_proc_directive:=false; + for i:=1 to num_proc_directives do + if proc_direcdata[i].idtok=idtoken then + begin + is_proc_directive:=true; + exit; + end; +end; + + +function parse_proc_direc(const proc_names:Tstringcontainer;var pdflags:word):boolean; +{ + Parse the procedure directive, returns true if a correct directive is found +} var p : longint; found : boolean; @@ -1810,28 +1826,45 @@ begin end else res:=parse_proc_direc(Anames^,pdflags); - { A procedure directive is always followed by a semicolon } + { A procedure directive normally followed by a semicolon, but in + a const section we should stop when _EQUAL is found } if res then - consume(_SEMICOLON) + begin + if (block_type=bt_const) and + (token=_EQUAL) then + break; + consume(_SEMICOLON); + end else break; end; end; -procedure parse_var_proc_directives(var sym : ptypesym); +procedure parse_var_proc_directives(var sym : psym); var - anames : pstringcontainer; + anames : pstringcontainer; pdflags : word; - oldsym : pprocsym; + oldsym : pprocsym; + pd : pabstractprocdef; begin oldsym:=aktprocsym; anames:=new(pstringcontainer,init); pdflags:=pd_procvar; { we create a temporary aktprocsym to read the directives } aktprocsym:=new(pprocsym,init(sym^.name)); - { aktprocsym^.definition:=pprocdef(sym^.definition); - this breaks the rule for TESTOBJEXT !! } - pabstractprocdef(aktprocsym^.definition):=pabstractprocdef(sym^.definition); + case sym^.typ of + varsym : + pd:=pabstractprocdef(pvarsym(sym)^.definition); + typedconstsym : + pd:=pabstractprocdef(ptypedconstsym(sym)^.definition); + typesym : + pd:=pabstractprocdef(ptypesym(sym)^.definition); + else + internalerror(994932432); + end; + if pd^.deftype<>procvardef then + internalerror(994932433); + pabstractprocdef(aktprocsym^.definition):=pd; { names should never be used anyway } inc(lexlevel); parse_proc_directives(anames,pdflags); @@ -2044,7 +2077,10 @@ end. { $Log$ - Revision 1.24 1999-10-01 08:02:47 peter + Revision 1.25 1999-10-01 10:05:44 peter + + procedure directive support in const declarations, fixes bug 232 + + Revision 1.24 1999/10/01 08:02:47 peter * forward type declaration rewritten Revision 1.23 1999/09/27 23:44:56 peter diff --git a/compiler/symdef.inc b/compiler/symdef.inc index d87a6a0d7e..fa9d5218c3 100644 --- a/compiler/symdef.inc +++ b/compiler/symdef.inc @@ -2420,6 +2420,48 @@ end; + function tabstractprocdef.proccalloption2str : string; + type + tproccallopt=record + mask : tproccalloption; + str : string[30]; + end; + const + proccallopts=12; + proccallopt : array[1..proccallopts] of tproccallopt=( + (mask:pocall_none; str:''), + (mask:pocall_clearstack; str:'ClearStack'), + (mask:pocall_leftright; str:'LeftRight'), + (mask:pocall_cdecl; str:'Cdecl'), + (mask:pocall_register; str:'Register'), + (mask:pocall_stdcall; str:'StdCall'), + (mask:pocall_safecall; str:'SafeCall'), + (mask:pocall_palmossyscall;str:'PalmOSSysCall'), + (mask:pocall_system; str:'System'), + (mask:pocall_inline; str:'Inline'), + (mask:pocall_internproc; str:'InternProc'), + (mask:pocall_internconst; str:'InternConst') + ); + var + s : string; + i : longint; + first : boolean; + begin + s:=''; + first:=true; + for i:=1to proccallopts do + if (proccallopt[i].mask in proccalloptions) then + begin + if first then + first:=false + else + s:=s+';'; + s:=s+proccallopt[i].str; + end; + proccalloption2str:=s; + end; + + {$ifdef GDB} function tabstractprocdef.stabstring : pchar; begin @@ -3098,13 +3140,14 @@ Const local_symtable_index : longint = $8001; function tprocvardef.gettypename : string; - begin if assigned(retdef) and (retdef<>pdef(voiddef)) then - gettypename:='' + gettypename:='' else - gettypename:=''; + gettypename:=''; end; @@ -3816,7 +3859,10 @@ Const local_symtable_index : longint = $8001; { $Log$ - Revision 1.167 1999-10-01 08:02:48 peter + Revision 1.168 1999-10-01 10:05:44 peter + + procedure directive support in const declarations, fixes bug 232 + + Revision 1.167 1999/10/01 08:02:48 peter * forward type declaration rewritten Revision 1.166 1999/09/26 21:30:21 peter diff --git a/compiler/symdefh.inc b/compiler/symdefh.inc index 7b20779364..ab57783623 100644 --- a/compiler/symdefh.inc +++ b/compiler/symdefh.inc @@ -352,6 +352,7 @@ procedure concattypesym(p : ptypesym;vsp : tvarspez); function para_size : longint; function demangled_paras : string; + function proccalloption2str : string; procedure test_if_fpu_result; { debug } {$ifdef GDB} @@ -530,7 +531,10 @@ { $Log$ - Revision 1.42 1999-10-01 08:02:48 peter + Revision 1.43 1999-10-01 10:05:44 peter + + procedure directive support in const declarations, fixes bug 232 + + Revision 1.42 1999/10/01 08:02:48 peter * forward type declaration rewritten Revision 1.41 1999/08/10 12:34:49 pierre