Browse Source

* a lot of stuff fixed regarding rtti and publishing of properties,
basics should now work

florian 27 years ago
parent
commit
29fe330347
6 changed files with 280 additions and 147 deletions
  1. 2 0
      compiler/msgidx.inc
  2. 126 123
      compiler/msgtxt.inc
  3. 6 1
      compiler/pbase.pas
  4. 23 3
      compiler/pdecl.pas
  5. 109 15
      compiler/symdef.inc
  6. 14 5
      compiler/todo.txt

+ 2 - 0
compiler/msgidx.inc

@@ -163,6 +163,8 @@ type tmsgconst=(
   parser_e_register_calling_not_supported,
   parser_e_property_cant_have_a_default_value,
   parser_e_property_default_value_must_const,
+  parser_e_cant_publish_that,
+  parser_e_cant_publish_that_property,
   type_e_mismatch,
   type_e_integer_expr_expected,
   type_e_ordinal_expr_expected,

+ 126 - 123
compiler/msgtxt.inc

@@ -170,422 +170,425 @@ const msgtxt : array[0..00087,1..240] of char=(+
   'E_Register calling (fastcall) not supported'#000+
   'E_Property can'#039't have a default value'#000+
   'E_The default value of a property must be constant'#000+
+  'E_Symbol can'#039't be published, can be on','ly a class'#000+
+  'E_That kind of property can'#039't be published'#000+
   'E_Type mismatch'#000+
-  'E_Integer expression e','xpected'#000+
+  'E_Integer expression expected'#000+
   'E_Ordinal expression expected'#000+
   'E_Type identifier expected'#000+
   'E_Variable identifier expected'#000+
   'E_pointer type expected'#000+
   'E_class type expected'#000+
-  'E_Variable or type indentifier expected'#000+
+  'E_Vari','able or type indentifier expected'#000+
   'E_Can'#039't evaluate constant expression'#000+
-  'E_Set elements are no','t compatible'#000+
+  'E_Set elements are not compatible'#000+
   'W_Automatic type conversion from floating type to COMP which is an int'+
   'eger type'#000+
   'W_Using / will give a floating point result'#000+
-  'H_use DIV instead to get an integer result'#000+
+  'H_use DIV i','nstead 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_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_Integer or real expr','ession expected'#000+
   'E_Identifier not found $1'#000+
   'F_Internal Error in SymTableStack()'#000+
-  'E_Duplicate id','entifier $1'#000+
+  'E_Duplicate identifier $1'#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 defenition'#000+
-  'E_Type identifier not defined'#000+
-  'E_Only static variables can be used in static methods or outside met','h'+
-  'ods'#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.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+
+  'o','d 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_illegal type declaration of set eleme','nts'#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+
   'E_Unknown field identifier'#000+
-  'W_Local variable $1 does not seem to be initialized'#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_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_High range limit < low range',' limit'#000+
   'E_Illegal counter variable'#000+
   'E_Can'#039't determine which overloaded function to call'#000+
-  'E_Para','meter list size exceeds 65535 bytes'#000+
+  'E_Parameter 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_i','llegal call by reference parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
-  'W_Possible i','llegal call of constructor or destructor (doesn'#039't ma'+
-  'tch to this context)'#000+
+  'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
+  'h to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
-  'E_procedure call with stackframe ESP/SP'#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_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+
+  'F_Int','ernal Error in secondinline()'#000+
   'D_Register $1 weight $2 $3'#000+
-  'E_Stack limit excedeed in local rou','tine'#000+
+  'E_Stack limit excedeed in local routine'#000+
   'D_Stack frame is omited'#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_Divide by ze','ro in asm evaluator'#000+
   'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
-  'F_Invalid numeric',' format 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_escape sequence ignored: $1'#000,+
   'E_Asm syntax error - Prefix not found'#000+
-  'E_Asm syntax error - Trying to add more than one prefi','x'#000+
+  'E_Asm syntax error - Trying to add more than one prefix'#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_Non-lab','el pattern contains @'#000+
   'E_Invalid Operand: $1'#000+
   'W_Override operator not supported'#000+
-  'E_Error in bin','ary constant: $1'#000+
+  'E_Error in binary 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+
+  'F_Intern','al error in Findtype()'#000+
   'E_Invalid size for MOVSX/MOVZX'#000+
   'E_16-bit base in 32-bit segment'#000+
-  'E_16-b','it index in 32-bit segment'#000+
+  'E_16-bit 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+
+  'E_Invalid combination ','of opcode and operands'#000+
   'W_Opcode $1 not in table, operands not checked'#000+
-  'F_Internal Error in Co','ncatOpcode()'#000+
+  'F_Internal Error in ConcatOpcode()'#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_Invalid operand ty','pe'#000+
   'E_Segment overrides not supported'#000+
   'E_Invalid constant symbol $1'#000+
-  'F_Internal Errror converti','ng binary'#000+
+  'F_Internal Errror converting 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_Tryin','g to define an index register more than once'#000+
   'E_Invalid field specifier'#000+
-  'F_Internal Error in B','uildScaling()'#000+
+  'F_Internal Error in BuildScaling()'#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_Invalid assembler syntax. No ref with brack','ets)'#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 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_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 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+
+  'E_Null label references are not al','lowed'#000+
   'W_Calling of an overloaded function in direct assembler'#000+
-  'E_Cannot use SELF outside a me','thod'#000+
+  'E_Cannot use SELF outside a method'#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_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+
+  '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_Invali','d combination of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
-  'E_To','o many operands on line'#000+
+  'E_Too 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_Start','ing intel styled assembler parsing...'#000+
   'D_Finished intel styled assembler parsing...'#000+
-  'E_Not a d','irective or local symbol: $1'#000+
+  'E_Not a directive 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+
+  '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+
+  '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 __OLDEBP outside a nested procedure'#000+
-  'W_Identifier $1 supposed external'#000+
+  'W_Identifier $1 supposed external',#000+
   'E_Invalid segment override expression'#000+
   'E_Strings not allowed as constants'#000+
-  'D_Starting AT&T st','yled assembler parsing...'#000+
+  'D_Starting AT&T styled 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_Invalid global def','inition'#000+
   'E_Line separator expected'#000+
   'W_globl not supported'#000+
   'W_align not supported'#000+
-  'W_lcomm not su','pported'#000+
+  'W_lcomm not supported'#000+
   'W_comm not supported'#000+
   'E_Invalid local common definition'#000+
   'E_Invalid global common definition'#000+
-  'E_local symbol: $1 not found inside asm statement'#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_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_I','nvalid character: <'#000+
   'E_Invalid character: >'#000+
   'E_Unsupported opcode'#000+
-  'E_Increment and Decrement mo','de not allowed together'#000+
+  'E_Increment and Decrement mode 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_Starting Mot','orola styled assembler parsing...'#000+
   'D_Finished Motorola styled assembler parsing...'#000+
-  'W_XDEF not',' supported'#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_Extended not supported in th','is 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+
   'E_Unsupported symbol type for operand'#000+
   'I_Assembling (pipe) $1'#000+
-  'E_Can'#039't create assember file $1'#000+
+  'E_Can'#039't c','reate assember file $1'#000+
   'W_Assembler $1 not found, switching to external assembling'#000+
-  'U_Using as','sembler: $1'#000+
+  'U_Using assembler: $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+
+  'W_Linker $1 n','ot found, switching to external linking'#000+
   'U_Using linker: $1'#000+
-  'W_Object $1 not found, Linking ma','y fail !'#000+
+  'W_Object $1 not found, Linking may 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_bind','er not found, switching to external binding'#000+
   'W_ar not found, switching to external ar'#000+
-  'E_Dynam','ic Libraries not supported'#000+
+  'E_Dynamic 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+
   'D_PPU Invalid Header (no PPU at the begin)'#000+
-  'D_PPU Invalid Version $1'#000+
+  'D_PPU',' Invalid Version $1'#000+
   'D_PPU Flags: $1'#000+
   'D_PPU Crc: $1'#000+
   'T_PPU Source: $1'#000+
-  'D_objectfile and assemble','rfile are older than ppufile'#000+
+  'D_objectfile and assemblerfile 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+
   'F_reading PPU-File'#000+
-  'F_Invalid PPU-File entry: $1'#000+
+  'F_Inva','lid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
-  'F_Ci','rcular unit reference'#000+
+  'F_Circular 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+
+  'F_There were $1 errors compi','ling module, stopping'#000+
   '$1 [options] <inputfile> [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+
+  'H_-? w','rites help pages'#000+
   'F_Too many config files nested'#000+
   'F_Unable to open file $1'#000+
-  'N_Reading further o','ptions from $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+
-  'F_too many ENDIFs'#000+
+  'F_too many ENDIF','s'#000+
   'F_open conditional at the end of the file'#000+
-  'W_Debug information generation is not supported ','by this executable'#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+
+  'Copyright (c) 1993-98 by Florian Klae','mpfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   '<lf>'#000+
   'Compiler Date  : $FPCDATE'#000+
-  'Compiler Target: $F','PCTARGET'#000+
+  'Compiler Target: $FPCTARGET'#000+
   '<lf>'#000+
   'This program comes under the GNU General Public Licence'#000+
   'For more information read COPYING.FPC'#000+
   '<lf>'#000+
   'Report bugs,suggestions etc to:'#000+
-  '                [email protected]'#000+
+  '   ','             [email protected]'#000+
   '**0*_+ switch option on, - off'#000+
-  '**1a_the compil','er doesn'#039't delete the generated assembler file'#000+
+  '**1a_the compiler 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+
+  '**','1C_code generation options'#000+
   '3*2CD_create dynamic library'#000+
-  '**2Ch<n>_<n> bytes heap (between 102','3 and 67107840)'#000+
+  '**2Ch<n>_<n> 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<n>_set stack size to <n>'#000+
+  '**2Cs<n>_set stack size t','o <n>'#000+
   '**2Ct_stack checking'#000+
   '3*2CS_create static library'#000+
   '3*2Cx_use smartlinking'#000+
-  '**1d<x>_define','s the symbol <x>'#000+
+  '**1d<x>_defines the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
   '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
-  '**1F_set file names and paths'#000+
+  '**1F_','set file names and paths'#000+
   '**2Fe<x>_redirect error output to <x>'#000+
   '*L2Fg<x>_same as -Fl'#000+
-  '**2Fi<x>','_adds <x> to include path'#000+
+  '**2Fi<x>_adds <x> to include path'#000+
   '**2Fl<x>_adds <x> to library path'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
   '**2Fo<x>_adds <x> to object path'#000+
-  '**2Fr<x>_load error message file <x>'#000+
+  '**2Fr<x>_load error',' message file <x>'#000+
   '**2Fu<x>_adds <x> to unit path'#000+
   '*g1g_generate debugger information'#000+
-  '*g2gg_us','e gsym'#000+
+  '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
   '**1i_information'#000+
   '**1I<x>_adds <x> to include path'#000+
   '**1k<x>_Pass <x> to the linker'#000+
   '**1l_write logo'#000+
-  '**1n_don'#039't read the default config file'#000+
+  '**1n_don'#039't read the default co','nfig file'#000+
   '**1o<x>_change the name of the executable produced to <x>'#000+
-  '**1pg_generate profile c','ode for gprof'#000+
+  '**1pg_generate profile code 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 bu','t slower)'#000+
+  '**2Sc_suppor','ts operators like C (*=,+=,/= and -=)'#000+
+  '**2Sd_compiler disposes asm lists (uses less memory but 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+
+  '**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 n','ame must be init (destructor must be done)'#000+
+  '**2Ss_constructor name 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+
+  '**1s_','don'#039't call assembler and linker (only with -a)'#000+
   '**1T<x>_Target operating system'#000+
-  '3*2TGO32V1_ve','rsion 1 of DJ Delorie DOS extender'#000+
+  '3*2TGO32V1_version 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+
-  '6*2TAMIGA_Commodore Amiga'#000+
+  '6*2TAMI','GA_Commodore Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
-  '**','1u<x>_undefines the symbol <x>'#000+
+  '**1u<x>_undefines the symbol <x>'#000+
   '**1U_unit options'#000+
   '**2Un_don'#039't check the unit name'#000+
   '**2Up<x>_same as -Fu<x>'#000+
   '**2Us_compile a system unit'#000+
-  '**1v<x>_Be verbose. <x> is a combination of the following letters :'#000+
-  '**2*_e : Show errors (default)       d ',': Show debug info'#000+
+  '**1v<x>_Be verb','ose. <x> is a combination of the following letters :'#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*_h : Show h','ints                  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*_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_executab','le options'#000+
+  '**1X_executable 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+
+  '**2XS_','link with static libraries (defines FPC_LINK_STATIC)'#000+
   '**0*_Processor specific options:'#000+
-  '3*1A_o','utput format'#000+
+  '3*1A_output 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*2Anasmobj_obj file using Nas','m'#000+
   '3*2Amasm_obj using Masm (Mircosoft)'#000+
   '3*2Atasm_obj using Tasm (Borland)'#000+
-  '3*1R_assembler readi','ng style'#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*1O<x>_optimizations'#000+
+  '3*1O<x>_op','timizations'#000+
   '3*2Og_generate smaller code'#000+
   '3*2OG_generate faster code (default)'#000+
-  '3*2Or_keep cert','ain variables in registers (still BUGGY!!!)'#000+
+  '3*2Or_keep certain 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*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*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
+  '3*3Op3_set target processor t','o PPro/PII/c6x86/K6 (tm)'#000+
   '6*1A_output format'#000+
   '6*2Ao_Unix o-file using GNU AS'#000+
-  '6*2Agas_GNU Motor','ola assembler'#000+
+  '6*2Agas_GNU Motorola 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 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*2O2_set target processor to a MC68020+'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+
   '**1h_shows this help without waiting'#000

+ 6 - 1
compiler/pbase.pas

@@ -193,6 +193,7 @@ unit pbase;
                    s:=lower(st^.name^)+'_'+s;
                    st^.defowner^.owner^.insert(new(pvarsym,init(s,def)));
                 end;
+
            end;
          dispose(sc,done);
       end;
@@ -201,7 +202,11 @@ end.
 
 {
   $Log$
-  Revision 1.14  1998-07-14 21:46:49  peter
+  Revision 1.15  1998-09-07 23:10:21  florian
+    * a lot of stuff fixed regarding rtti and publishing of properties,
+      basics should now work
+
+  Revision 1.14  1998/07/14 21:46:49  peter
     * updated messages file
 
   Revision 1.13  1998/07/14 14:46:52  peter

+ 23 - 3
compiler/pdecl.pas

@@ -425,7 +425,12 @@ unit pdecl;
               end;
              { insert it in the symtable, if not done yet }
              if not symdone then
-              insert_syms(symtablestack,sc,p);
+               begin
+                  if (current_object_option=sp_published) and
+                    (not((p^.deftype=objectdef) and (pobjectdef(p)^.isclass))) then
+                    Message(parser_e_cant_publish_that);
+                  insert_syms(symtablestack,sc,p);
+               end;
            end;
        { Check for Case }
          if is_record and (token=_CASE) then
@@ -716,6 +721,9 @@ unit pdecl;
                 { property parameters ? }
                 if token=LECKKLAMMER then
                   begin
+                     if current_object_option=sp_published then
+                       Message(parser_e_cant_publish_that_property);
+
                      { create a list of the parameters in propertyparas }
                      consume(LECKKLAMMER);
                      inc(testcurobject);
@@ -819,6 +827,11 @@ unit pdecl;
                           message(parser_e_no_property_found_to_override);
                        end;
                   end;
+
+                if (current_object_option=sp_published) and
+                  not(p^.proptype^.is_publishable) then
+                  Message(parser_e_cant_publish_that_property);
+
                 { create data defcoll to allow correct parameter checks }
                 new(datacoll);
                 datacoll^.paratyp:=vs_value;
@@ -1358,7 +1371,10 @@ unit pdecl;
                 datasegment^.concat(new(pai_const,init_32bit(0)));
 
               { pointer to type info of published section }
-              datasegment^.concat(new(pai_const,init_symbol(strpnew(aktclass^.rtti_name))));
+              if (aktclass^.options and oo_can_have_published)<>0 then
+                datasegment^.concat(new(pai_const,init_symbol(strpnew(aktclass^.rtti_name))))
+              else
+                datasegment^.concat(new(pai_const,init_32bit(0)));
 
               { pointer to field table }
               datasegment^.concat(new(pai_const,init_32bit(0)));
@@ -1992,7 +2008,11 @@ unit pdecl;
 end.
 {
   $Log$
-  Revision 1.51  1998-09-07 19:33:22  florian
+  Revision 1.52  1998-09-07 23:10:22  florian
+    * a lot of stuff fixed regarding rtti and publishing of properties,
+      basics should now work
+
+  Revision 1.51  1998/09/07 19:33:22  florian
     + some stuff for property rtti added:
        - NameIndex of the TPropInfo record is now written correctly
        - the DEFAULT/NODEFAULT keyword is supported now

+ 109 - 15
compiler/symdef.inc

@@ -46,6 +46,7 @@
        tkClass         = 16;
        tkObject        = 17;
        tkWChar         = 18;
+       tkBool          = 19;
 
        otSByte         = 0;
        otUByte         = 1;
@@ -574,6 +575,12 @@
          end;
       end;
 
+    function tstringdef.is_publishable : boolean;
+
+      begin
+         is_publishable:=true;
+      end;
+
 {*************************************************************************************************************************
                                  TENUMDEF
 ****************************************************************************}
@@ -711,12 +718,38 @@
       end;
 {$endif GDB}
 
-    procedure tenumdef.generate_rtti;
+    procedure tenumdef.write_child_rtti_data;
+
+      begin
+         if assigned(basedef) then
+           basedef^.get_rtti_label;
+      end;
+
+    procedure tenumdef.write_rtti_data;
 
       begin
-         inherited generate_rtti;
          rttilist^.concat(new(pai_const,init_8bit(tkEnumeration)));
-         rttilist^.concat(new(pai_const,init_8bit(0)));
+         case savesize of
+            1:
+              rttilist^.concat(new(pai_const,init_8bit(otUByte)));
+            2:
+              rttilist^.concat(new(pai_const,init_8bit(otUWord)));
+            4:
+              rttilist^.concat(new(pai_const,init_8bit(otULong)));
+         end;
+         rttilist^.concat(new(pai_const,init_32bit(min)));
+         rttilist^.concat(new(pai_const,init_32bit(max)));
+         if assigned(basedef) then
+           rttilist^.concat(new(pai_const,init_symbol(strpnew(lab2str(basedef^.get_rtti_label)))))
+         else
+           rttilist^.concat(new(pai_const,init_32bit(0)));
+         {!!!!!!! Name list }
+      end;
+
+    function tenumdef.is_publishable : boolean;
+
+      begin
+         is_publishable:=true;
       end;
 
 {*************************************************************************************************************************
@@ -856,8 +889,27 @@
 
     procedure torddef.write_rtti_data;
 
+      const
+        trans : array[uchar..bool8bit] of byte =
+          (otUByte,otUByte,otUWord,otULong,otSByte,otSWord,otSLong,otUByte);
+
+      begin
+         case typ of
+            bool8bit:
+              rttilist^.concat(new(pai_const,init_8bit(tkBool)));
+            uchar:
+              rttilist^.concat(new(pai_const,init_8bit(tkChar)));
+            else
+              rttilist^.concat(new(pai_const,init_8bit(tkInteger)));
+         end;
+         rttilist^.concat(new(pai_const,init_32bit(low)));
+         rttilist^.concat(new(pai_const,init_32bit(high)));
+      end;
+
+    function torddef.is_publishable : boolean;
+
       begin
-         rttilist^.concat(new(pai_const,init_8bit(255)));
+         is_publishable:=typ in [uchar..bool8bit];
       end;
 
 {*************************************************************************************************************************
@@ -943,6 +995,12 @@
          rttilist^.concat(new(pai_const,init_8bit(translate[typ])));
       end;
 
+    function tfloatdef.is_publishable : boolean;
+
+      begin
+         is_publishable:=true;
+      end;
+
 {*************************************************************************************************************************
                                 TFILEDEF
 ****************************************************************************}
@@ -1236,11 +1294,24 @@
          resolvedef(setof);
       end;
 
-    procedure tsetdef.generate_rtti;
+    procedure tsetdef.write_rtti_data;
 
       begin
-         inherited generate_rtti;
-         rttilist^.concat(new(pai_const,init_8bit(255)));
+         rttilist^.concat(new(pai_const,init_8bit(tkSet)));
+         rttilist^.concat(new(pai_const,init_8bit(otULong)));
+         rttilist^.concat(new(pai_const,init_symbol(strpnew(lab2str(setof^.get_rtti_label)))));
+      end;
+
+    procedure tsetdef.write_child_rtti_data;
+
+      begin
+         setof^.get_rtti_label;
+      end;
+
+    function tsetdef.is_publishable : boolean;
+
+      begin
+         is_publishable:=settype=smallset;
       end;
 
 {***********************************************************************************
@@ -1386,7 +1457,7 @@
     procedure tarraydef.write_child_rtti_table;
 
       begin
-         definition^.generate_rtti;
+         definition^.get_rtti_label;
       end;
 
     procedure tarraydef.write_rtti_data;
@@ -1399,7 +1470,7 @@
          { count of elements }
          rttilist^.concat(new(pai_const,init_32bit(highrange-lowrange+1)));
          { element type }
-         rttilist^.concat(new(pai_const,init_symbol(strpnew(lab2str(definition^.get_inittable_label)))));
+         rttilist^.concat(new(pai_const,init_symbol(strpnew(lab2str(definition^.get_rtti_label)))));
       end;
 
 {***********************************************************************************
@@ -2167,11 +2238,6 @@
 {$endif UseBrowser}
       end;
 
-    procedure tprocdef.write_rtti_data;
-
-      begin
-      end;
-
 {***********************************************************************************
                                  TPROCVARDEF
 ***************************************************************************}
@@ -2255,6 +2321,24 @@
       end;
 {$endif GDB}
 
+    procedure tprocvardef.write_rtti_data;
+
+      begin
+         {!!!!!!!}
+      end;
+
+    procedure tprocvardef.write_child_rtti_data;
+
+      begin
+         {!!!!!!!!}
+      end;
+
+    function tprocvardef.is_publishable : boolean;
+
+      begin
+         is_publishable:=(options and pomethodpointer)<>0;
+      end;
+
 {***************************************************************************
                               TOBJECTDEF
 ***************************************************************************}
@@ -2790,6 +2874,12 @@
          publicsyms^.foreach(write_property_info);
       end;
 
+    function tobjectdef.is_publishable : boolean;
+
+      begin
+         is_publishable:=isclass;
+      end;
+
 {****************************************************************************
                                   TERRORDEF
 ****************************************************************************}
@@ -2809,7 +2899,11 @@
 
 {
   $Log$
-  Revision 1.37  1998-09-07 19:33:24  florian
+  Revision 1.38  1998-09-07 23:10:23  florian
+    * a lot of stuff fixed regarding rtti and publishing of properties,
+      basics should now work
+
+  Revision 1.37  1998/09/07 19:33:24  florian
     + some stuff for property rtti added:
        - NameIndex of the TPropInfo record is now written correctly
        - the DEFAULT/NODEFAULT keyword is supported now

+ 14 - 5
compiler/todo.txt

@@ -12,20 +12,24 @@ compiler version and your short cut.
           does read/write access ................................. 0.99.6 (FK)
         - indexed properties ..................................... 0.99.6 (FK)
         - default properties ..................................... 0.99.6 (FK)
+    - save array for overriding
     - stored qualifier
         - read/write from/to unit file ........................... 0.99.6 (FK)
   - call of destructor helper routine
   - message qualifier
         - correct handling of constructor result type ............ 0.99.6 (FK)
-  - rtti
-  - published
+        - rtti ................................................... 0.99.8 (FK)
+        - published .............................................. 0.99.8 (FK)
   - dynamic methods
-  - correct handling of access specifiers ........................ 0.99.7 (FK)
+        - correct handling of access specifiers .................. 0.99.7 (FK)
   - interface
 * rtti
           - generation ........................................... 0.99.7 (FK)
           - use when copying etc. ................................ 0.99.7 (FK)
-  - new/dispose should look for rtti'ed data
+          - new/dispose should look for rtti'ed data ............. 0.99.8 (FK)
+  - enumeration names
+  - methodpointers
+  - change booleans into enumerations
 * AnsiString
   - operators
   - indexed access
@@ -53,7 +57,7 @@ compiler version and your short cut.
       - open array with call by value ............................ 0.99.6 (FK)
       - subrange types of enumerations ........................... 0.99.7 (PFV)
 - method pointers (procedure of object)
-- code generation for exceptions
+      - code generation for exceptions ........................... 0.99.7 (FK)
 - assertation
 - sysutils unit for go32v2 (excpetions!)
 - initialisation/finalization for units
@@ -68,3 +72,8 @@ compiler version and your short cut.
 - include/exclude
         - make dec/inc internal................................... 0.99.6 (PFV)
         - make length internal.................................... 0.99.7 (PFV)
+* Delphi 4 support
+  - overloaded directive
+  - default parameters
+  - dynamic arrays
+  - 64 bit int