Browse Source

+ rtti is now automatically generated for published classes, i.e.
they are handled like an implicit property

florian 26 years ago
parent
commit
863df30860
9 changed files with 249 additions and 178 deletions
  1. 5 1
      compiler/errore.msg
  2. 6 2
      compiler/link.pas
  3. 1 0
      compiler/msgidx.inc
  4. 138 137
      compiler/msgtxt.inc
  5. 6 2
      compiler/parser.pas
  6. 10 2
      compiler/pdecl.pas
  7. 63 31
      compiler/symdef.inc
  8. 6 2
      compiler/systems.pas
  9. 14 1
      compiler/types.pas

+ 5 - 1
compiler/errore.msg

@@ -783,7 +783,11 @@ parser_e_stored_property_must_be_boolean=E_The type of the storage symbol must b
 parser_e_ill_property_storage_sym=E_This symbol isn't allowed as storage symbol
 % You can't use this type of symbol as storage specifier in property
 % declaration. You can use only methods with the result type boolean,
-% boolean class fields or boolean constants 
+% boolean class fields or boolean constants
+parser_e_only_publishable_classes_can__be_published=E_Only class which are compiled in $M+ mode can be published
+% 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
 % \end{description}
 #
 # Type Checking

+ 6 - 2
compiler/link.pas

@@ -1,6 +1,6 @@
 {
     $Id$
-    Copyright (c) 1998 by the FPC development team
+    Copyright (c) 1998,99 by the FPC development team
 
     This unit handles the linker and binder calls for programs and
     libraries
@@ -785,7 +785,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.69  1999-09-15 20:24:56  daniel
+  Revision 1.70  1999-09-15 22:09:16  florian
+    + rtti is now automatically generated for published classes, i.e.
+      they are handled like an implicit property
+
+  Revision 1.69  1999/09/15 20:24:56  daniel
   + Dw switch now does something.
 
   Revision 1.68  1999/08/18 17:05:53  florian

+ 1 - 0
compiler/msgidx.inc

@@ -210,6 +210,7 @@ type tmsgconst=(
   parser_e_exit_with_argument_not__possible,
   parser_e_stored_property_must_be_boolean,
   parser_e_ill_property_storage_sym,
+  parser_e_only_publishable_classes_can__be_published,
   type_e_mismatch,
   type_e_incompatible_types,
   type_e_not_equal_types,

+ 138 - 137
compiler/msgtxt.inc

@@ -224,236 +224,237 @@ const msgtxt : array[0..000101,1..240] of char=(
   'E_Exit with argument can'#039't be used here'#000+
   '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_Type mismatch'#000+
-  'E_Incompatible ','types: got "$1" expected "$2"'#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 expression expected, but got "$1"'#000+
-  'E_Ordinal expression expected'#000,
+  'E_Boolean exp','ression 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 compatible'#000+
+  'E_Set elements are not compa','tible'#000+
   'E_Operation not implemented for sets'#000+
-  'W_Automatic type c','onversion from floating type to COMP which is an i'+
-  'nteger type'#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_Can'#039't read or write variables',' of this type'#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_Wrong type in array constructor'#000,
   'E_Incompatible type for arg no. $1: Got $2, expected $3'#000+
-  'E_Met','hod (variable) and Procedure (variable) are not compatible'#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_Argument must be l-value'#000+
-  'E_Can'#039't assign local procedure/function to procedure variable'#000+
-  'E_I','dentifier not found $1'#000+
+  'E_Ca','n'#039't assign local procedure/function to procedure variable'#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 identifier $1'#000+
-  'E_Forward declaration not solved $1'#000+
+  'E_Forward declaration no','t solved $1'#000+
   'F_Identifier type already defined as type'#000+
-  'E_Error',' in type definition'#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 outside metho'+
   'ds'#000+
-  'E_Invalid call to tvarsym.mangledname()'#000+
+  'E_Invalid call to tvarsym','.mangledname()'#000+
   'F_record or class type expected'#000+
-  'E_Instances of',' classes or objects with an abstract method are not al'+
-  'lowed'#000+
+  'E_Instances of classes or objects with an abstract method are not allo'+
+  'wed'#000+
   'W_Label not defined $1'#000+
   'E_Illegal label declaration'#000+
   'E_GOTO and LABEL are not supported (use switch -Sg)'#000+
-  'E_Label not found'#000+
+  'E_Label not foun','d'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
-  'E_illega','l type declaration of set elements'#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 expected'#000+
-  'W_Function result does not seem to be set'#000+
+  'W_Function result does not s','eem to be set'#000+
   'E_Unknown record field identifier $1'#000+
-  'W_Local va','riable $1 does not seem to be initialized'#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_Data segment too large (max. 2GB)'#000+
+  'E_Data segment too large (max. 2GB',')'#000+
   'E_BREAK not allowed'#000+
   'E_CONTINUE not allowed'#000+
-  'E_Expression too',' complicated - FPU stack overflow'#000+
+  'E_Expression too complicated - FPU stack overflow'#000+
   '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_Can'#039't determine which overloaded function to call'#000+
-  'E_Parameter list siz','e exceeds 65535 bytes'#000+
+  'E_Can'#039't det','ermine 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 be var parameters'#000+
-  'E_The use of a far pointer isn'#039't allowed there'#000+
-  'E_illegal call by reference param','eters'#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_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+
+  'E_proc','edure 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_32-bit unsigned not supported in MC68000 mode'#000+
-  'F_Internal Error in secondinline()'#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_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,'+
-  ' use (set)length instead'#000+
+  'E_No code f','or 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+
   ' clause'#000+
-  'E_Cannot call message handler method directly'#000+
-  'D_Starting $1 sty','led assembler parsing'#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+
-  'E_OFFSET used without identifier'#000+
+  'E_OFFSET used without ','identifier'#000+
   'E_TYPE used without identifier'#000+
-  'E_Cannot use local ','variable or parameters here'#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_Invalid constant expression'#000+
-  'E_Relocatable symbol is not allowed'#000+
+  'E_Relocatable ','symbol is not allowed'#000+
   'E_Invalid reference syntax'#000+
-  'E_Local symb','ols not allowed as references'#000+
+  'E_Local symbols not 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_Invalid operand type'#000+
-  'E_Invalid string as opcode operand: $1'#000+
+  'E_Invalid string as opc','ode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
-  'E_Null label ','references are not allowed'#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_Invalid Operator in asm evaluator'#000+
+  'F_Invalid Operator in',' asm evaluator'#000+
   'E_escape sequence ignored: $1'#000+
-  'E_Invalid symbol',' reference'#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+
   'E_Constant value out of bounds'#000+
-  'E_Error converting decimal $1'#000+
+  'E_Erro','r converting decimal $1'#000+
   'E_Error converting octal $1'#000+
-  'E_Error c','onverting binary $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+
-  'E_Cannot use OLDEBP outside a nested procedure'#000+
-  'W_Functions with void return value ca','n'#039't return any value in asm'+
-  ' code'#000+
+  'E_Cannot use OLDEBP out','side 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 destination or source size do not match'#000+
-  'E_Assembler syntax error'#000+
+  'E_Assemble','r syntax error'#000+
   'E_Invalid combination of opcode and operands'#000+
-  'E','_Assemler syntax error in operand'#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+
   'E_Invalid or missing opcode'#000+
-  'E_Invalid combination of prefix and opcode: $1'#000+
-  'E_Invalid combination of overrid','e and opcode: $1'#000+
+  'E_Invalid combinat','ion 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_Undefined local symbol $1'#000+
   'E_Unknown label identifier $1'#000+
-  'E_Invalid floating point register name'#000+
+  'E_Invalid floating ','point register name'#000+
   'E_NOR not supported'#000+
-  'W_Modulo not supporte','d'#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 parameter with a register'#000+
-  'E_Invalid segment override expression'#000+
+  'E_Invalid segment override e','xpression'#000+
   'W_Identifier $1 supposed external'#000+
-  'E_Strings not all','owed as constants'#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_Dollar token is used without an identifier'#000+
-  'W_32bit constant created',' for address'#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+
-  'F_Too many assembler files'#000+
+  'F_Too many assemb','ler files'#000+
   'F_Selected assembler output not supported'#000+
-  'F_Comp no','t 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+
   'F_No binary writer selected'#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: $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+
-  'W_Source operating system redefined'#000+
+  'W_Source operating sys','tem redefined'#000+
   'I_Assembling (pipe) $1'#000+
-  'E_Can'#039't create assember ','file $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 assembl'+
-  'ing'#000+
+  'W_Can'#039't call the assembler, error $1 switching to ext','ernal assem'+
+  'bling'#000+
   'I_Assembling $1'#000+
   'I_Assembling smartlink $1'#000+
-  'W_','Linker $1 not found, switching to external linking'#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 found, Linking may fail !'#000+
   'W_Error while linking'#000+
-  'W_Can'#039't call the linker, switching to external linking'#000+
-  'I_Linkin','g $1'#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 script $1'#000+
-  'W_resource compiler not found, switching to external mode'#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 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 uninitialized data: $1 bytes'#000+
-  'X_Stack space reserved: $1 bytes'#000+
+  'X_Stack space reserved: ','$1 bytes'#000+
   'X_Stack space commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
-  'T_','PPU Loading $1'#000+
+  'T_PPU Loading $1'#000+
   'U_PPU Name: $1'#000+
   'U_PPU Flags: $1'#000+
   'U_PPU Crc: $1'#000+
@@ -461,8 +462,8 @@ const msgtxt : array[0..000101,1..240] of char=(
   'U_PPU File too short'#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 targ','et'#000+
+  'U_PPU is compil','ed for an other processor'#000+
+  'U_PPU is compiled for an other target'#000+
   'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
@@ -470,197 +471,197 @@ const msgtxt : array[0..000101,1..240] of char=(
   'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
-  'E_Illegal unit name: $1'#000+
+  'E_Illegal unit name: $','1'#000+
   'F_Too much units'#000+
-  'F_Circular unit reference between $1 and $','2'#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_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_Load f','rom $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 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_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_Second load for unit $1'#000+
   'U_PPU Check file $1 time $2'#000+
   '$1 [options] <inputfile> [options]'#000+
-  'W_Only one source file supported'#000+
+  'W_Only one source file supported'#000,
   'W_DEF file can be created only for OS/2'#000+
-  'E_nested response fil','es are not supported'#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+
+  '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+
+  '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+
+  'W_Debug information generation is not supporte','d by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
-  'E_You are u','sing the obsolete switch $1'#000+
+  'E_You are using the obsolete switch $1'#000+
   'E_You are using the obsolete switch $1, please use $2'#000+
   'N_Switching assembler to default source writing assembler'#000+
-  'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
-  'Copyright (c) 1993-99 by Florian Klae','mpfl'#000+
+  'Free Pascal Compiler version $FPCVER [$','FPCDATE] for $FPCTARGET'#000+
+  'Copyright (c) 1993-99 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #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+
+  'For more information read',' COPYING.FPC'#000+
   #000+
   'Report bugs,suggestions etc to:'#000+
-  '               ','  [email protected]'#000+
+  '                 [email protected]'#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 alloc','ation/release info in assembler file'#000+
+  '**2al_list',' sourcecode lines in assembler file'#000+
+  '**2ar_list register allocation/release info in assembler file'#000+
   '**2at_list temp allocation/release info in assembler file'#000+
   '**1b_generate browser info'#000+
   '**2bl_generate local symbol info'#000+
   '**1B_build all modules'#000+
-  '**1C<x>_code generation options:'#000+
-  '3*2CD_create dynamic library'#000,
+  '*','*1C<x>_code generation options:'#000+
+  '3*2CD_create dynamic library'#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 s','ize to <n>'#000+
   '**2Ct_stack checking'#000+
   '3*2CS_create static library'#000+
-  '3','*2Cx_use smartlinking'#000+
+  '3*2Cx_use smartlinking'#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+
+  '**1E_same as -Cn'#000,
   '**1F<x>_set file names and paths:'#000+
-  '**2FD<x>_sets the directory',' where to search for compiler utilities'#000+
+  '**2FD<x>_sets the directory where to search for compiler utilities'#000+
   '**2Fe<x>_redirect error output to <x>'#000+
   '**2FE<x>_set exe/unit output path to <x>'#000+
   '**2Fi<x>_adds <x> to include path'#000+
-  '**2Fl<x>_adds <x> to library path'#000+
+  '**2Fl<x>_adds <x> to libra','ry path'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
-  '**2Fo<x>_adds <x>',' to object path'#000+
+  '**2Fo<x>_adds <x> to object path'#000+
   '**2Fr<x>_load error message file <x>'#000+
   '**2Fu<x>_adds <x> to unit path'#000+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g<x>_generate debugger information:'#000+
-  '*g2gg_use gsym'#000+
+  '*g2g','g_use gsym'#000+
   '*g2gd_use dbx'#000+
   '*g2gh_use heap trace unit'#000+
-  '*g2gc_gene','rate checks for pointers'#000+
+  '*g2gc_generate checks for pointers'#000+
   '**1i_information'#000+
   '**2iD_return compiler date'#000+
   '**2iV_return compiler version'#000+
   '**2iSO_return compiler OS'#000+
   '**2iSP_return compiler processor'#000+
-  '**2iTO_return target OS'#000+
+  '**2iTO_return target ','OS'#000+
   '**2iTP_return target processor'#000+
-  '**1I<x>_adds <x> to include',' path'#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+
   '**1o<x>_change the name of the executable produced to <x>'#000+
-  '**1pg_generate profile code for gprof'#000+
-  '*L1P_use pipes instead of creating temporary assemb','ler files'#000+
+  '**1pg_generate profile code ','for gprof'#000+
+  '*L1P_use pipes instead of creating temporary assembler files'#000+
   '**1S<x>_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<x>_compiler stops after the <x> errors (default is 1)'#000+
-  '**2Sg_allow LABEL a','nd GOTO'#000+
+  '**2Se<x>_compiler ','stops after the <x> errors (default is 1)'#000+
+  '**2Sg_allow LABEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
   '**2Si_support C++ styled INLINE'#000+
   '**2Sm_support macros like C (global)'#000+
   '**2So_tries to be TP/BP 7.0 compatible'#000+
   '**2Sp_tries to be gpc compatible'#000+
-  '**2Ss_constructor name must be init (destructor must be done)'#000+
-  '**2St_a','llow static keyword in objects'#000+
+  '**2Ss_co','nstructor name must be init (destructor must be done)'#000+
+  '**2St_allow static keyword in objects'#000+
   '**1s_don'#039't call assembler and linker (only with -a)'#000+
   '**1u<x>_undefines the symbol <x>'#000+
   '**1U_unit options:'#000+
   '**2Un_don'#039't check the unit name'#000+
-  '**2Us_compile a system unit'#000+
-  '**1v<x>_Be verbose. <x> is a combination of t','he following letters:'#000+
+  '**2Us_compil','e 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+
   '**2*_w : Show warnings               u : Show unit info'#000+
-  '**2*_n : Show notes                  t : Show tried/used files'#000+
-  '**2*_h : Show hints                  m : S','how defined macros'#000+
+  '**2*_n : Show notes                  t : Sho','w tried/used files'#000+
+  '**2*_h : Show hints                  m : Show defined macros'#000+
   '**2*_i : Show general info           p : Show compiled procedures'#000+
   '**2*_l : Show linenumbers            c : Show conditionals'#000+
-  '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
-  '**2*_b : Show all procedur','e          r : Rhide/GCC compatibility mod'+
-  'e'#000+
+  '**2*_a : Show everything           ','  0 : Show nothing (except errors'+
+  ')'#000+
+  '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#000+
   '**2*_    occurs'#000+
   '**1X_executable options:'#000+
-  '*L2Xc_link with the c library'#000+
-  '**2XD_link with dynamic libraries (defines FPC_LINK_DYN','AMIC)'#000+
+  '*L2Xc_link with the c li','brary'#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<x>_output format:'#000+
-  '3*2Aas_assemble using GNU AS'#000+
-  '3*2Aasaout_assemble using GNU AS for aout (Go32v1)',#000+
+  '3*2Aas_assemble us','ing 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*2Acoff_coff (Go32v2) using internal writ','er'#000+
+  '3*2Atasm_obj file us','ing Tasm (Borland)'#000+
+  '3*2Acoff_coff (Go32v2) using internal writer'#000+
   '3*2Apecoff_pecoff (Win32) using internal writer'#000+
   '3*1R<x>_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*2Rdirect_copy assemble','r text directly to assembler file'#000+
   '3*1O<x>_optimizations:'#000+
-  '3*2O','g_generate smaller code'#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*2O1_level 1 optimizations (quick optimizations)'#000+
-  '3*2O2_level 2 optimiza','tions (-O1 + slower optimizations)'#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<x>_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/c','6x86/K6 (tm)'#000+
+  '3*3Op2_set target processor to Pent','ium/PentiumMMX (tm)'#000+
+  '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
   '3*1T<x>_Target operating system:'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
-  '3*2TWin32_Windows 32 Bit'#000+
+  '3*2T','Win32_Windows 32 Bit'#000+
   '6*1A<x>_output format'#000+
-  '6*2Aas_Unix o-file',' using GNU AS'#000+
+  '6*2Aas_Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
   '6*2Amit_MIT Syntax (old GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
   '6*1O_optimizations:'#000+
   '6*2Oa_turn on the optimizer'#000+
-  '6*2Og_generate smaller code'#000+
+  '6*2Og_generate smalle','r code'#000+
   '6*2OG_generate faster code (default)'#000+
-  '6*2Ox_optimize ma','ximum (still BUGGY!!!)'#000+
+  '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
   '6*2O2_set target processor to a MC68020+'#000+
   '6*1R<x>_assembler reading style:'#000+
   '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system:'#000+
-  '6*2TAMIGA_Commodore Amiga'#000+
+  '6*2TAMIGA_C','ommodore Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
-  '6*2TMACOS_Macintosh ','m68k'#000+
+  '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+

+ 6 - 2
compiler/parser.pas

@@ -1,6 +1,6 @@
 {
     $Id$
-    Copyright (c) 1993-98 by Florian Klaempfl
+    Copyright (c) 1993-99 by Florian Klaempfl
 
     This unit does the parsing process
 
@@ -481,7 +481,11 @@ unit parser;
 end.
 {
   $Log$
-  Revision 1.83  1999-08-31 15:51:11  pierre
+  Revision 1.84  1999-09-15 22:09:23  florian
+    + rtti is now automatically generated for published classes, i.e.
+      they are handled like an implicit property
+
+  Revision 1.83  1999/08/31 15:51:11  pierre
    * in_second_compile cleaned up, in_compile and in_second_load added
 
   Revision 1.82  1999/08/26 20:24:41  michael

+ 10 - 2
compiler/pdecl.pas

@@ -609,7 +609,11 @@ unit pdecl;
                begin
                   if (sp_published in current_object_option) and
                     (not((p^.deftype=objectdef) and (pobjectdef(p)^.is_class))) then
-                    Message(parser_e_cant_publish_that);
+                    Message(parser_e_cant_publish_that)
+                  else if (sp_published in current_object_option) and
+                    not(oo_can_have_published in pobjectdef(p)^.objectoptions) then
+                    Message(parser_e_only_publishable_classes_can__be_published);
+
                   if assigned(readtypesym) then
                    insert_syms(symtablestack,sc,nil,readtypesym,is_threadvar)
                   else
@@ -2532,7 +2536,11 @@ unit pdecl;
 end.
 {
   $Log$
-  Revision 1.153  1999-09-14 11:09:08  florian
+  Revision 1.154  1999-09-15 22:09:24  florian
+    + rtti is now automatically generated for published classes, i.e.
+      they are handled like an implicit property
+
+  Revision 1.153  1999/09/14 11:09:08  florian
     * per default a property is stored, fixed
 
   Revision 1.152  1999/09/12 14:50:50  florian

+ 63 - 31
compiler/symdef.inc

@@ -1,6 +1,6 @@
 {
     $Id$
-    Copyright (c) 1993-98 by Florian Klaempfl, Pierre Muller
+    Copyright (c) 1993-99 by Florian Klaempfl, Pierre Muller
 
     Symbol table implementation for the definitions
 
@@ -3533,8 +3533,7 @@ Const local_symtable_index : longint = $8001;
     procedure count_published_properties(sym:pnamedindexobject);
       {$ifndef fpc}far;{$endif}
       begin
-         if (psym(sym)^.typ=propertysym) and
-            (sp_published in psym(sym)^.symoptions) then
+         if needs_prop_entry(psym(sym)) then
            inc(count);
       end;
 
@@ -3587,41 +3586,70 @@ Const local_symtable_index : longint = $8001;
         end;
 
       begin
-         if (psym(sym)^.typ=propertysym) and
-            (ppo_indexed in ppropertysym(sym)^.propoptions) then
-           proctypesinfo:=$40
-         else
-           proctypesinfo:=0;
-         if (psym(sym)^.typ=propertysym) and
-            (sp_published in psym(sym)^.symoptions) then
-           begin
-              rttilist^.concat(new(pai_const_symbol,initname(ppropertysym(sym)^.proptype^.get_rtti_label)));
-              writeproc(ppropertysym(sym)^.readaccesssym,ppropertysym(sym)^.readaccessdef,0);
-              writeproc(ppropertysym(sym)^.writeaccesssym,ppropertysym(sym)^.writeaccessdef,2);
-              { isn't it stored ? }
-              if not(ppo_stored in ppropertysym(sym)^.propoptions) then
+         if needs_prop_entry(psym(sym)) then
+           case psym(sym)^.typ of
+              varsym:
                 begin
+                   if not(pvarsym(sym)^.definition^.deftype=objectdef) or
+                     not(pobjectdef(pvarsym(sym)^.definition)^.is_class) then
+                     internalerror(1509992);
+                   { access to implicit class property as field }
+                   proctypesinfo:=(0 shl 0) or (0 shl 2) or (0 shl 4);
+                   rttilist^.concat(new(pai_const_symbol,initname(pvarsym(sym)^.definition^.get_rtti_label)));
+                   rttilist^.concat(new(pai_const,init_32bit(pvarsym(sym)^.address)));
+                   rttilist^.concat(new(pai_const,init_32bit(pvarsym(sym)^.address)));
+                   { per default stored }
+                   rttilist^.concat(new(pai_const,init_32bit(1)));
+                   { index as well as ... }
                    rttilist^.concat(new(pai_const,init_32bit(0)));
-                   proctypesinfo:=proctypesinfo or (3 shl 4);
-                end
-              else
-                writeproc(ppropertysym(sym)^.storedsym,ppropertysym(sym)^.storeddef,4);
-              rttilist^.concat(new(pai_const,init_32bit(ppropertysym(sym)^.index)));
-              rttilist^.concat(new(pai_const,init_32bit(ppropertysym(sym)^.default)));
-              rttilist^.concat(new(pai_const,init_16bit(count)));
-              inc(count);
-              rttilist^.concat(new(pai_const,init_8bit(proctypesinfo)));
-              rttilist^.concat(new(pai_const,init_8bit(length(ppropertysym(sym)^.name))));
-              rttilist^.concat(new(pai_string,init(ppropertysym(sym)^.name)));
+                   { default value are zero }
+                   rttilist^.concat(new(pai_const,init_32bit(0)));
+                   rttilist^.concat(new(pai_const,init_16bit(count)));
+                   inc(count);
+                   rttilist^.concat(new(pai_const,init_8bit(proctypesinfo)));
+                   rttilist^.concat(new(pai_const,init_8bit(length(pvarsym(sym)^.name))));
+                   rttilist^.concat(new(pai_string,init(pvarsym(sym)^.name)));
+                end;
+              propertysym:
+                begin
+                   if ppo_indexed in ppropertysym(sym)^.propoptions then
+                     proctypesinfo:=$40
+                   else
+                     proctypesinfo:=0;
+                   rttilist^.concat(new(pai_const_symbol,initname(ppropertysym(sym)^.proptype^.get_rtti_label)));
+                   writeproc(ppropertysym(sym)^.readaccesssym,ppropertysym(sym)^.readaccessdef,0);
+                   writeproc(ppropertysym(sym)^.writeaccesssym,ppropertysym(sym)^.writeaccessdef,2);
+                   { isn't it stored ? }
+                   if not(ppo_stored in ppropertysym(sym)^.propoptions) then
+                     begin
+                        rttilist^.concat(new(pai_const,init_32bit(0)));
+                        proctypesinfo:=proctypesinfo or (3 shl 4);
+                     end
+                   else
+                     writeproc(ppropertysym(sym)^.storedsym,ppropertysym(sym)^.storeddef,4);
+                   rttilist^.concat(new(pai_const,init_32bit(ppropertysym(sym)^.index)));
+                   rttilist^.concat(new(pai_const,init_32bit(ppropertysym(sym)^.default)));
+                   rttilist^.concat(new(pai_const,init_16bit(count)));
+                   inc(count);
+                   rttilist^.concat(new(pai_const,init_8bit(proctypesinfo)));
+                   rttilist^.concat(new(pai_const,init_8bit(length(ppropertysym(sym)^.name))));
+                   rttilist^.concat(new(pai_string,init(ppropertysym(sym)^.name)));
+                end;
+              else internalerror(1509992);
            end;
       end;
 
 
     procedure generate_published_child_rtti(sym : pnamedindexobject);{$ifndef fpc}far;{$endif}
       begin
-         if (psym(sym)^.typ=propertysym) and
-            (sp_published in psym(sym)^.symoptions) then
-           ppropertysym(sym)^.proptype^.get_rtti_label;
+         if needs_prop_entry(psym(sym)) then
+           case psym(sym)^.typ of
+              varsym:
+                pvarsym(sym)^.definition^.get_rtti_label;
+              propertysym:
+                ppropertysym(sym)^.proptype^.get_rtti_label;
+              else internalerror(1509991);
+           end;
       end;
 
 
@@ -3750,7 +3778,11 @@ Const local_symtable_index : longint = $8001;
 
 {
   $Log$
-  Revision 1.163  1999-09-15 20:35:44  florian
+  Revision 1.164  1999-09-15 22:09:26  florian
+    + rtti is now automatically generated for published classes, i.e.
+      they are handled like an implicit property
+
+  Revision 1.163  1999/09/15 20:35:44  florian
     * small fix to operator overloading when in MMX mode
     + the compiler uses now fldz and fld1 if possible
     + some fixes to floating point registers

+ 6 - 2
compiler/systems.pas

@@ -1,6 +1,6 @@
 {
     $Id$
-    Copyright (C) 1995,97 by Florian Klaempfl
+    Copyright (C) 1995,99 by Florian Klaempfl
 
     This unit contains information about the target systems supported
     (these are not processor specific)
@@ -1734,7 +1734,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.93  1999-09-15 20:24:56  daniel
+  Revision 1.94  1999-09-15 22:09:27  florian
+    + rtti is now automatically generated for published classes, i.e.
+      they are handled like an implicit property
+
+  Revision 1.93  1999/09/15 20:24:56  daniel
   + Dw switch now does something.
 
   Revision 1.92  1999/09/07 15:02:41  pierre

+ 14 - 1
compiler/types.pas

@@ -163,12 +163,21 @@ interface
     { returns the mmx type }
     function mmx_type(p : pdef) : tmmxtype;
 
+    { returns true, if sym needs an entry in the proplist of a class rtti }
+    function needs_prop_entry(sym : psym) : boolean;
+
 implementation
 
     uses
        strings,globtype,globals,htypechk,
        tree,verbose,symconst;
 
+    function needs_prop_entry(sym : psym) : boolean;
+
+      begin
+         needs_prop_entry:=(sp_published in psym(sym)^.symoptions) and
+         (sym^.typ in [propertysym,varsym]);
+      end;
 
     function equal_paras(def1,def2 : pdefcoll;value_equal_const : boolean) : boolean;
       begin
@@ -984,7 +993,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.86  1999-09-11 09:08:35  florian
+  Revision 1.87  1999-09-15 22:09:27  florian
+    + rtti is now automatically generated for published classes, i.e.
+      they are handled like an implicit property
+
+  Revision 1.86  1999/09/11 09:08:35  florian
     * fixed bug 596
     * fixed some problems with procedure variables and procedures of object,
       especially in TP mode. Procedure of object doesn't apply only to classes,