From 1316bbd21f26fc3b30bf7d4d3d3036ab228213ac Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Wed, 19 May 1999 16:48:21 +0000
Subject: [PATCH]   * tdef.typename: returns a now a proper type name for the
 most types

---
 compiler/cg386mem.pas |  35 ++---------
 compiler/msgtxt.inc   | 141 +++++++++++++++++++++---------------------
 compiler/symdef.inc   | 110 +++++++++++++++++++++++++++++++-
 compiler/symdefh.inc  |  18 +++++-
 compiler/types.pas    |  18 +++++-
 5 files changed, 216 insertions(+), 106 deletions(-)

diff --git a/compiler/cg386mem.pas b/compiler/cg386mem.pas
index acd34063f8..698fd2c101 100644
--- a/compiler/cg386mem.pas
+++ b/compiler/cg386mem.pas
@@ -769,36 +769,6 @@ implementation
               if p^.memseg then
                 p^.location.reference.segment:=R_FS;
            end;
-
-         { have we to remove a temp. wide/ansistring ?
-           c:=(s1+s2)[i]
-           for example
-         }
-         if (p^.location.loc=LOC_MEM) and
-            (rl^.deftype=stringdef) then
-           begin
-              case pstringdef(rl)^.string_typ of
-                 st_ansistring:
-                   begin
-                      del_reference(p^.location.reference);
-                      hr:=reg32toreg8(getregister32);
-                      exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,S_B,
-                        newreference(p^.location.reference),hr)));
-                      reset_reference(p^.location.reference);
-                      p^.location.loc:=LOC_REGISTER;
-                      p^.location.register:=hr;
-                   end;
-                 st_widestring:
-                   begin
-                      del_reference(p^.location.reference);
-                      hr:=reg32toreg16(getregister32);
-                      exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,S_W,
-                        newreference(p^.location.reference),hr)));                      reset_reference(p^.location.reference);
-                      p^.location.loc:=LOC_REGISTER;
-                      p^.location.register:=hr;
-                   end;
-              end;
-           end;
       end;
 
 {*****************************************************************************
@@ -884,7 +854,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.42  1999-05-18 22:11:52  pierre
+  Revision 1.43  1999-05-19 16:48:21  florian
+    * tdef.typename: returns a now a proper type name for the most types
+
+  Revision 1.42  1999/05/18 22:11:52  pierre
    * checkpointer code was wrong!
 
   Revision 1.41  1999/05/18 21:58:29  florian
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index c3e0125764..013d943fed 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -214,7 +214,7 @@ const msgtxt : array[0..000095,1..240] of char=(
   'hi} instead'#000+
   'E_OVERRIDE can'#039't be used in objects'#000+
   'E_Type mismatch'#000+
-  'E_Incompa','tible types: got $1 expected $2'#000+
+  'E_Incompa','tible types: got "$1" expected "$2"'#000+
   'E_Type mismatch between $1 and $2'#000+
   'E_Integer expression expected'#000+
   'E_Ordinal expression expected'#000+
@@ -222,53 +222,53 @@ const msgtxt : array[0..000095,1..240] of char=(
   '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 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 g','et an integer result'#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_Type conflict between set elements'#000+
-  'W_lo/hi(longint/dword) returns th','e upper/lower word'#000+
+  'W_lo/hi(longint/dword) return','s the upper/lower word'#000+
   'E_Integer or real expression expected'#000+
   'E_Wrong type in array constructor'#000+
   'E_Incompatible type for arg #$1: Got $2, expected $3'#000+
   'E_Identifier not found $1'#000+
   'F_Internal Error in SymTableStack()'#000+
   'E_Duplicate identifier $1'#000+
-  'H_Identi','fier already defined in $1 at line $2'#000+
+  'H_Id','entifier already defined 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 stati','c variables can be used in static methods or outside met'+
+  'E_Only s','tatic 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+
   '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_Ille','gal label declaration'#000+
   'E_GOTO und 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+
+  '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+
   '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_ide','ntifier idents no member $1'#000+
+  'E','_identifier idents no member $1'#000+
   'B_Found declaration: $1'#000+
   'E_BREAK not allowed'#000+
   'E_CONTINUE not allowed'#000+
@@ -276,93 +276,93 @@ const msgtxt : array[0..000095,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_High range limit < ','low range limit'#000+
   'E_Illegal counter variable'#000+
   'E_Can'#039't determine which overloaded function to call'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
   'E_File types must be var parameters'#000+
-  'E_The use of a far pointer isn'#039't allowed ther','e'#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_procedure call with stackf','rame 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_32-bit unsigned not supported in MC68000 m','ode'#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_No code for inline procedure st','ored'#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+
   'W_Probably illegal constant passed to internal math function'#000+
-  'E_Constructors or destructors can not ','be called inside a '#039'with'#039+
+  '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 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 r','ecord offset'#000+
+  'E_Error buildi','ng record offset'#000+
   'E_OFFSET 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_Invalid constant expression'#000+
-  'E_Relocata','ble symbol is not allowed'#000+
+  'E_Relo','catable symbol is not allowed'#000+
   'E_Invalid reference syntax'#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 strin','g 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_Invalid Operato','r in asm evaluator'#000+
+  'F_Invalid Ope','rator 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+
-  'E_Constant value out of bounds'#000+
-  'E_','Error converting decimal $1'#000+
+  'E_Constant value out of bound','s'#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+
-  'E_Cannot use __SELF',' outside a method'#000+
+  'E_Cannot use __','SELF outside a method'#000+
   'E_Cannot use __OLDEBP outside a nested procedure'#000+
   'W_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 destina','tion or source size do not match'#000+
+  'W_Size suffix and des','tination 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+
-  'E_I','nvalid or missing opcode'#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 override and opcode: $1'#000+
   'E_Too many operands on line'#000+
@@ -370,61 +370,61 @@ const msgtxt : array[0..000095,1..240] of char=(
   'W_FAR ignored'#000+
   'E_Duplicate local symbol $1'#000+
   'E_Undefined local symbol $1'#000+
-  'E_Unkn','own 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 parameter w','ith a register'#000+
+  'E_Cannot index a local var or paramet','er 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_Usi','ng a defined name as a local label'#000+
+  'E','_Using a defined name as a local label'#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+
-  'F_No binary writer sele','cted'#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: 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_A','sm: 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+
   '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_Library $1 not found, Linking may f','ail !'#000+
   'W_Error while linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
   'W_binder not found, switching to external binding'#000+
   'W_ar not found, switching to external ar'#000+
   'E_Dynamic Libraries not supported'#000+
-  'I_Closing script $1'#000+
-  'W_r','esource compiler not found, switching to external mode'#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 uninitialized data: $1 byte','s'#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+
@@ -435,7 +435,7 @@ const msgtxt : array[0..000095,1..240] of char=(
   'U_PPU Time: $1'#000+
   'U_PPU File too short'#000+
   'U_PPU Invalid Header (no PPU at the begin)'#000+
-  'U_PPU Invalid ','Version $1'#000+
+  'U_PPU Inva','lid Version $1'#000+
   'U_PPU is compiled for an other processor'#000+
   'U_PPU is compiled for an other target'#000+
   'U_PPU Source: $1'#000+
@@ -444,26 +444,26 @@ const msgtxt : array[0..000095,1..240] of char=(
   'F_reading PPU-File'#000+
   'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
-  'F_PPU Dbx count prob','lem'#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+
   'W_Compiling the system unit requires the -Us switch'#000+
-  'F_There were $1 errors compiling module, stopping'#000+
-  'U_L','oad from $1 ($2) unit $3'#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 unit, shared lib is older than ppufile'#000+
-  'U_Recompiling unit, obj and asm',' are 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_Second load for unit $1'#000+
   'U_PPU Check file $1 time $2'#000+
   '$1 [options] <inputfile> [options]'#000+
-  'W_Only one source file suppo','rted'#000+
+  'W_Only one source file s','upported'#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+
@@ -471,18 +471,18 @@ const msgtxt : array[0..000095,1..240] of char=(
   'H_-? writes help pages'#000+
   'F_Too many config files nested'#000+
   'F_Unable to open file $1'#000+
-  'N_Reading fu','rther options from $1'#000+
+  'N_Readin','g 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_open conditional at the end of the file'#000+
-  'W_Debug information generation is not sup','ported by this executable'#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+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
-  'Copyright (c) 1993-98 by Flor','ian Klaempfl'#000+
+  'Copyright (c) 1993-98 by ','Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
   'Compiler Date  : $FPCDATE'#000+
@@ -492,18 +492,18 @@ const msgtxt : array[0..000095,1..240] of char=(
   'For more information read COPYING.FPC'#000+
   #000+
   'Report bugs,suggestions etc to:'#000+
-  '       ','          fpc-devel@vekoll.saturnus.vein.hu'#000+
+  '   ','              fpc-devel@vekoll.saturnus.vein.hu'#000+
   '**0*_put + after a boolean switch option to enable it, - to disable it'+
   #000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
-  '**2ar_list regist','er allocation/release info in assembler file'#000+
+  '**2ar_list re','gister 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+
+  '3*2CD_create dyna','mic library'#000+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
   '**2Ci_IO-checking'#000+
   '**2Cn_omit linking stage'#000+
@@ -511,7 +511,7 @@ const msgtxt : array[0..000095,1..240] of char=(
   '**2Cr_range checking'#000+
   '**2Cs<n>_set stack size to <n>'#000+
   '**2Ct_stack checking'#000+
-  '3*2CS_create static l','ibrary'#000+
+  '3*2CS_create stat','ic library'#000+
   '3*2Cx_use smartlinking'#000+
   '**1d<x>_defines the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
@@ -520,21 +520,21 @@ const msgtxt : array[0..000095,1..240] of char=(
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F<x>_set file names and paths:'#000+
-  '**2FD<x>_sets the d','irectory where to search for compiler utilities'#000+
+  '**2FD<x>_sets t','he 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+
   '*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+
   '*g2gd_use dbx'#000+
-  '*g2gh_use heap trace unit'#000+
-  '**','1i_information'#000+
+  '*g2gh_use heap trace uni','t'#000+
+  '**1i_information'#000+
   '**2iD_return compiler date'#000+
   '**2iV_return compiler version'#000+
   '**2iSO_return compiler OS'#000+
@@ -542,76 +542,77 @@ const msgtxt : array[0..000095,1..240] of char=(
   '**2iTO_return target OS'#000+
   '**2iTP_return target processor'#000+
   '**1I<x>_adds <x> to include path'#000+
-  '**1k<x>_Pass <x> to t','he linker'#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 assembler files'#000+
-  '**1S<x>_syntax op','tions:'#000+
+  '**1S<x>_synta','x 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 first error'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
-  '**2Si_support ','C++ styled INLINE'#000+
+  '**2Si_supp','ort 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+
-  '**1s_don'#039't ca','ll assembler and linker (only with -a)'#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 the following letters:'#000+
-  '**2*_e : Show errors (','default)       d : Show debug info'#000+
+  '**2*_e : Show erro','rs (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*_i : Show general inf','o           p : Show compiled procedures'#000+
+  '**2*_i : Show general',' info           p : Show compiled procedures'#000+
   '**2*_l : Show linenumbers            c : Show conditionals'#000+
   '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
-  '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000,
+  '**2*_b : Show all procedure          r : Rhide/GCC compatibility m','od'+
+  'e'#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_DYNAMIC)'#000+
-  '**2Xs_strip all symbols from executabl','e'#000+
+  '**2Xs_strip all symbols from execu','table'#000+
   '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
   '**0*_Processor specific options:'#000+
   '3*1A<x>_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 fi','le using Nasm'#000+
+  '3*2Anasmobj_ob','j file using Nasm'#000+
   '3*2Amasm_obj file using Masm (Mircosoft)'#000+
   '3*2Atasm_obj file using Tasm (Borland)'#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 assembler text directl','y to assembler file'#000+
   '3*1O<x>_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*2O1_level 1 optimizations (','quick optimizations)'#000+
+  '3*2O1_level 1 optimizatio','ns (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*3Op2_set target processor to Pentium/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 B','it'#000+
+  '3*2TWin32_Windows ','32 Bit'#000+
   '6*1A<x>_output format'#000+
   '6*2Ao_Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
@@ -620,14 +621,14 @@ const msgtxt : array[0..000095,1..240] of char=(
   '6*1O_optimizations:'#000+
   '6*2Oa_turn on the optimizer'#000+
   '6*2Og_generate smaller code'#000+
-  '6*2OG_genera','te faster code (default)'#000+
+  '6*2OG_ge','nerate faster code (default)'#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*2T','ATARI_Atari ST/STe/TT'#000+
+  '6*2TAMIGA_Commodore Amiga'#000,
+  '6*2TATARI_Atari ST/STe/TT'#000+
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
diff --git a/compiler/symdef.inc b/compiler/symdef.inc
index e7eba47881..b89e5fad3d 100644
--- a/compiler/symdef.inc
+++ b/compiler/symdef.inc
@@ -174,9 +174,14 @@
         if assigned(sym) then
          typename:=Upper(sym^.name)
         else
-         typename:='unknown';
+         typename:=gettypename;
       end;
 
+    function tdef.gettypename : string;
+
+      begin
+         gettypename:='<unknown type>'
+      end;
 
     function tdef.is_in_current : boolean;
       var
@@ -633,6 +638,15 @@
          needs_inittable:=string_typ in [st_ansistring,st_widestring];
       end;
 
+    function tstringdef.gettypename : string;
+
+      const
+         names : array[tstringtype] of string[20] =
+           ('ShortString','LongString','AnsiString','WideString');
+
+      begin
+         gettypename:=names[string_typ];
+      end;
 
     procedure tstringdef.write_rtti_data;
       begin
@@ -882,6 +896,11 @@
          is_publishable:=true;
       end;
 
+    function tenumdef.gettypename : string;
+
+      begin
+         gettypename:='<enumeration type>';
+      end;
 
 {****************************************************************************
                                  TORDDEF
@@ -1069,6 +1088,17 @@
          is_publishable:=typ in [uchar..bool8bit];
       end;
 
+    function torddef.gettypename : string;
+
+      const
+        names : array[tbasetype] of string[20] = ('<unknown type>',
+          'untyped','Char','Byte','Word','DWord','ShortInt',
+          'SmallInt','LongInt','Boolean','WordBool',
+          'LongBool','QWord','Int64');
+
+      begin
+         gettypename:=names[typ];
+      end;
 
 {****************************************************************************
                                 TFLOATDEF
@@ -1161,6 +1191,15 @@
          is_publishable:=true;
       end;
 
+    function tfloatdef.gettypename : string;
+
+      const
+        names : array[tfloattype] of string[20] = (
+          'Single','Double','Extended','Comp','Fixed','Fixed16');
+
+      begin
+         gettypename:=names[typ];
+      end;
 
 {****************************************************************************
                                 TFILEDEF
@@ -1263,6 +1302,20 @@
       end;
 {$endif GDB}
 
+    function tfiledef.gettypename : string;
+
+      begin
+         case filetype of
+           ft_untyped:
+             gettypename:='File';
+           ft_typed:
+             gettypename:='File Of '+typed_as^.typename;
+           ft_text:
+             gettypename:='Text'
+         end;
+      end;
+
+
 
 {****************************************************************************
                                TPOINTERDEF
@@ -1368,6 +1421,11 @@
       end;
 {$endif GDB}
 
+    function tpointerdef.gettypename : string;
+
+      begin
+         gettypename:='^'+definition^.typename;
+      end;
 
 {****************************************************************************
                               TCLASSREFDEF
@@ -1414,6 +1472,12 @@
       end;
 {$endif GDB}
 
+    function tclassrefdef.gettypename : string;
+
+      begin
+         gettypename:='Class Of '+definition^.typename;
+      end;
+
 
 {***************************************************************************
                                    TSETDEF
@@ -1529,6 +1593,12 @@
          is_publishable:=settype=smallset;
       end;
 
+    function tsetdef.gettypename : string;
+
+      begin
+         gettypename:='Set Of '+setof^.typename;
+      end;
+
 
 {***************************************************************************
                                  TFORMALDEF
@@ -1581,6 +1651,11 @@
       end;
 {$endif GDB}
 
+    function tformaldef.gettypename : string;
+
+      begin
+         gettypename:='Var';
+      end;
 
 {***************************************************************************
                            TARRAYDEF
@@ -1722,6 +1797,22 @@
          rttilist^.concat(new(pai_const_symbol,init(definition^.get_rtti_label)));
       end;
 
+    function tarraydef.gettypename : string;
+
+      begin
+         if isarrayofconst or isConstructor then
+           gettypename:='Array Of Const'
+         else if is_open_array(@self) then
+           gettypename:='Array Of '+definition^.typename
+         else
+           begin
+              if rangedef^.deftype=enumdef then
+                gettypename:='Array['+rangedef^.typename+'] Of '+definition^.typename
+              else
+                gettypename:='Array['+tostr(lowrange)+'..'+
+                  tostr(highrange)+'] Of '+definition^.typename
+           end;
+      end;
 
 {***************************************************************************
                                   TRECDEF
@@ -1973,6 +2064,12 @@
          symtable^.foreach(write_field_inittable);
       end;
 
+    function trecdef.gettypename : string;
+
+      begin
+         gettypename:='<record type>'
+      end;
+
 
 {***************************************************************************
                        TABSTRACTPROCDEF
@@ -2753,6 +2850,12 @@ Const local_symtable_index : longint = $8001;
          is_publishable:=(options and pomethodpointer)<>0;
       end;
 
+    function tprocvardef.gettypename : string;
+
+      begin
+         gettypename:='<procedure variable type>'
+      end;
+
 
 {***************************************************************************
                               TOBJECTDEF
@@ -3380,7 +3483,10 @@ Const local_symtable_index : longint = $8001;
 
 {
   $Log$
-  Revision 1.118  1999-05-19 12:08:11  florian
+  Revision 1.119  1999-05-19 16:48:26  florian
+    * tdef.typename: returns a now a proper type name for the most types
+
+  Revision 1.118  1999/05/19 12:08:11  florian
     * tobject wasn't set as default anchestor, was a problem with the new ppu
       handling
 
diff --git a/compiler/symdefh.inc b/compiler/symdefh.inc
index ac2e25309a..7281cb935f 100644
--- a/compiler/symdefh.inc
+++ b/compiler/symdefh.inc
@@ -90,6 +90,7 @@
           { returns true, if the definition can be published }
           function is_publishable : boolean;virtual;
           function is_in_current : boolean;
+          function gettypename:string;virtual;
        end;
 
        targconvtyp = (act_convertable,act_equal,act_exact);
@@ -120,6 +121,7 @@
           function stabstring : pchar;virtual;
           procedure concatstabto(asmlist : paasmoutput);virtual;
 {$endif GDB}
+          function gettypename:string;virtual;
        end;
 
        pformaldef = ^tformaldef;
@@ -131,6 +133,7 @@
           function stabstring : pchar;virtual;
           procedure concatstabto(asmlist : paasmoutput);virtual;
 {$endif GDB}
+          function gettypename:string;virtual;
        end;
 
        perrordef = ^terrordef;
@@ -160,6 +163,7 @@
           procedure concatstabto(asmlist : paasmoutput);virtual;
 {$endif GDB}
           procedure deref;virtual;
+          function gettypename:string;virtual;
        end;
 
 
@@ -214,6 +218,7 @@
           function stabstring : pchar;virtual;
           procedure concatstabto(asmlist : paasmoutput);virtual;
 {$endif GDB}
+          function gettypename:string;virtual;
        end;
 
        parraydef = ^tarraydef;
@@ -228,6 +233,7 @@
           IsVariant,
           IsConstructor,
           IsArrayOfConst : boolean;
+          function gettypename:string;virtual;
           function elesize : longint;
           constructor init(l,h : longint;rd : pdef);
           constructor load;
@@ -266,6 +272,7 @@
           procedure write_init_data;virtual;
           procedure write_child_rtti_data;virtual;
           procedure write_child_init_data;virtual;
+          function gettypename:string;virtual;
        end;
 
        { base types }
@@ -298,6 +305,7 @@
           function getrangecheckstring : string;
           procedure write_rtti_data;virtual;
           function is_publishable : boolean;virtual;
+          function gettypename:string;virtual;
        end;
 
        { sextreal is dependant on the cpu, s64bit is also }
@@ -323,6 +331,7 @@
           procedure setsize;
           function is_publishable : boolean;virtual;
           procedure write_rtti_data;virtual;
+          function gettypename:string;virtual;
        end;
 
        pabstractprocdef = ^tabstractprocdef;
@@ -360,6 +369,7 @@
           procedure write_child_rtti_data;virtual;
           function is_publishable : boolean;virtual;
           procedure write_rtti_data;virtual;
+          function gettypename:string;virtual;
        end;
 
        tmessageinf = record
@@ -451,6 +461,7 @@
           function needs_inittable : boolean;virtual;
           procedure write_rtti_data;virtual;
           function is_publishable : boolean;virtual;
+          function gettypename:string;virtual;
        end;
 
        penumdef = ^tenumdef;
@@ -480,6 +491,7 @@
           procedure write_child_rtti_data;virtual;
           procedure write_rtti_data;virtual;
           function is_publishable : boolean;virtual;
+          function  gettypename:string;virtual;
        end;
 
        tsettype = (normset,smallset,varset);
@@ -499,11 +511,15 @@
           function is_publishable : boolean;virtual;
           procedure write_rtti_data;virtual;
           procedure write_child_rtti_data;virtual;
+          function gettypename:string;virtual;
        end;
 
 {
   $Log$
-  Revision 1.27  1999-05-13 21:59:42  peter
+  Revision 1.28  1999-05-19 16:48:28  florian
+    * tdef.typename: returns a now a proper type name for the most types
+
+  Revision 1.27  1999/05/13 21:59:42  peter
     * removed oldppu code
     * warning if objpas is loaded from uses
     * first things for new deref writing
diff --git a/compiler/types.pas b/compiler/types.pas
index 4430faa373..a2c9e7d9e7 100644
--- a/compiler/types.pas
+++ b/compiler/types.pas
@@ -794,6 +794,10 @@ implementation
       end;
 
     function CheckTypes(def1,def2 : pdef) : boolean;
+
+      var
+         s1,s2 : string;
+
       begin
         if not is_equal(def1,def2) then
          begin
@@ -801,7 +805,14 @@ implementation
            if (not assigned(def1)) or (not assigned(def2)) then
              Message(type_e_mismatch)
            else
-             Message2(type_e_not_equal_types,def1^.typename,def2^.typename);
+             begin
+                s1:=def1^.typename;
+                s2:=def2^.typename;
+                if (s1<>'<unknown type>') and (s2<>'<unknown type>') then
+                  Message2(type_e_not_equal_types,def1^.typename,def2^.typename)
+                else
+                  Message(type_e_mismatch);
+             end;
            CheckTypes:=false;
          end
         else
@@ -811,7 +822,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.61  1999-05-19 10:31:56  florian
+  Revision 1.62  1999-05-19 16:48:29  florian
+    * tdef.typename: returns a now a proper type name for the most types
+
+  Revision 1.61  1999/05/19 10:31:56  florian
     * two bugs reported by Romio (bugs 13) are fixed:
         - empty array constructors are now handled correctly (e.g. for sysutils.format)
         - comparsion of ansistrings was sometimes coded wrong