Browse Source

+ add error if trying to use readln or writeln for files
or read or write on untyped files.
Reset and rewrite are still incompatible with BP
(reset(dat,1); is allowed for typed file !)

pierre 25 years ago
parent
commit
9c44048ad2
4 changed files with 167 additions and 143 deletions
  1. 4 0
      compiler/errore.msg
  2. 2 0
      compiler/msgidx.inc
  3. 143 140
      compiler/msgtxt.inc
  4. 18 3
      compiler/tcinl.pas

+ 4 - 0
compiler/errore.msg

@@ -922,6 +922,10 @@ type_e_cant_read_write_type=E_Can't read or write variables of this type
 % You are trying to \var{read} or \var{write} a variable from or to a
 % file of type text, which doesn't support that. Only integer types,
 % booleans, reals, pchars and strings can be read from/written to a text file.
+type_e_no_readln_writeln_for_typed_file=E_Can't use readln or writeln on typed file
+% \var{readln} and \var{writeln} are only allowed for text files.
+type_e_no_read_write_for_untyped_file=E_Can't use read or write on untyped file.
+% \var{read} and \var{write} are only allowed for text or typed files.
 type_e_typeconflict_in_set=E_Type conflict between set elements
 % There is at least one set element which is of the wrong type, i.e. not of
 % the set type.

+ 2 - 0
compiler/msgidx.inc

@@ -243,6 +243,8 @@ type tmsgconst=(
   type_e_strict_var_string_violation,
   type_e_succ_and_pred_enums_with_assign_not_possible,
   type_e_cant_read_write_type,
+  type_e_no_readln_writeln_for_typed_file,
+  type_e_no_read_write_for_untyped_file,
   type_e_typeconflict_in_set,
   type_w_maybe_wrong_hi_lo,
   type_e_integer_or_real_expr_expected,

+ 143 - 140
compiler/msgtxt.inc

@@ -259,449 +259,452 @@ const msgtxt : array[0..000109,1..240] of char=(
   '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 co','nflict between set elements'#000+
+  'E_Can'#039't u','se readln or writeln on typed file'#000+
+  'E_Can'#039't use read or write on untyped file.'#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 $1 in array constructor'#000+
+  'E_Wrong type $1 in array constr','uctor'#000+
   'E_Incompatible type for arg no. $1: Got $2, expected $3'#000+
-  'E_Method (variable) and P','rocedure (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 can'#039't be assigned to'#000+
+  'E_Argument can'#039't be assig','ned to'#000+
   'E_Can'#039't assign local procedure/function to procedure variable'#000+
-  'E_Can'#039't assign val','ues to an address'#000+
+  'E_Can'#039't assign values to an address'#000+
   'E_Can'#039't assign values to const 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+
+  'H_Ident','ifier already defined in $1 at line $2'#000+
   'E_Unknown identifier $1'#000+
-  'E_Forward declaration no','t solved $1'#000+
+  'E_Forward declaration not solved $1'#000+
   'F_Identifier type already defined as type'#000+
   'E_Error in type definition'#000+
   'E_Type identifier not defined'#000+
   'E_Forward type not resolved $1'#000+
-  'E_Only static variables can be used in static methods or outside metho'+
-  'ds'#000+
-  'E_Invalid call to tvarsym','.mangledname()'#000+
+  'E_Only stat','ic 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_Label used but not defined $1'#000+
+  'E_Label u','sed but not defined $1'#000+
   'E_Illegal label declaration'#000+
-  'E_GOTO and LABEL are not supported (','use switch -Sg)'#000+
+  'E_GOTO and LABEL are not supported (use switch -Sg)'#000+
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
   'E_illegal type declaration of set elements'#000+
-  'E_Forward class definition not resolved $1'#000+
+  'E_Forward class definitio','n not resolved $1'#000+
   'H_Parameter $1 not used'#000+
   'N_Local variable $1 not used'#000+
-  'H_Value paramete','r $1 is assigned but never used'#000+
+  'H_Value parameter $1 is assigned but never used'#000+
   'N_Local variable $1 is assigned but never used'#000+
   'H_Local $1 $2 is not used'#000+
   'N_Private field $1.$2 is never used'#000+
-  'N_Private field $1.$2 is assigned but never used'#000+
+  'N_Private fi','eld $1.$2 is assigned but never used'#000+
   'N_Private method $1.$2 never used'#000+
-  'E_Set type expec','ted'#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+
+  '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_Illegal expression'#000+
-  'E_Invalid integer expression'#000+
+  'E_Inv','alid integer expression'#000+
   'E_Illegal qualifier'#000+
   'E_High range limit < low range limit'#000+
-  'E_Ille','gal counter variable'#000+
+  'E_Illegal counter variable'#000+
   'E_Can'#039't determine which overloaded function to call'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
-  'D_Conversion between ordinals and pointers is not portable across plat'+
-  'forms'#000+
-  'E_File types must be va','r parameters'#000+
+  'D_Conversion',' between ordinals and pointers is not portable across pl'+
+  'atforms'#000+
+  'E_File types must be var parameters'#000+
   'E_The use of a far pointer isn'#039't allowed there'#000+
   'E_illegal call by reference parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
-  'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
-  'h to this context)'#000+
-  'N_Inefficien','t code'#000+
+  'W_Possible',' illegal call of constructor or destructor (doesn'#039't ma'+
+  'tch to this context)'#000+
+  'N_Inefficient code'#000+
   'W_unreachable code'#000+
   'E_procedure call with stackframe ESP/SP'#000+
   'E_Abstract methods can'#039't be called directly'#000+
-  'F_Internal Error in getfloatreg(), allocation failure'#000+
+  'F_Internal Error in getfloatreg(), allocati','on failure'#000+
   'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
-  'F_Extended cg68k not ','supported'#000+
+  'F_Extended cg68k not supported'#000+
   'F_32-bit unsigned not supported in MC68000 mode'#000+
   'F_Internal Error in secondinline()'#000+
   'D_Register $1 weight $2 $3'#000+
-  'E_Stack limit excedeed in local routine'#000+
+  'E_Stack limit excedeed in local r','outine'#000+
   'D_Stack frame is omitted'#000+
-  'W_Range check for 64 bit integers is not supported on t','his target'#000+
+  'W_Range check for 64 bit integers is not supported on this target'#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_Direct call of interrupt procedure $1 is not possible'#000+
-  'E_Element zero of an ansi/wide- or longstring can'#039't be acce','ssed,'+
-  ' use (set)length instead'#000+
+  'E_Direct call of interrupt p','rocedure $1 is not possible'#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+
-  'E_Jump in or outside of an exception block',#000+
+  'E','_Cannot call message handler method directly'#000+
+  'E_Jump in or outside of an exception block'#000+
   'E_Control flow statements aren'#039't allowed in a finally block'#000+
   'D_Starting $1 styled assembler parsing'#000+
   'D_Finished $1 styled assembler parsing'#000+
-  'E_Non-label pattern contains @'#000+
+  'E_Non-label pa','ttern contains @'#000+
   'W_Override operator not supported'#000+
   'E_Error building record offset'#000+
-  'E_OFF','SET 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_need to use OFFSET here'#000+
-  'E_Cannot use multiple relocatable symbols'#000+
+  'E_Cannot use multiple',' relocatable symbols'#000+
   'E_Relocatable symbol can only be added'#000+
-  'E_Invalid constant expressi','on'#000+
+  'E_Invalid constant expression'#000+
   'E_Relocatable symbol is not allowed'#000+
   'E_Invalid reference syntax'#000+
   'E_You can not reach $1 from that code'#000+
-  'E_Local symbols/labels aren'#039't allowed as references'#000+
+  'E_Local symbols/labels aren'#039't allowed as referenc','es'#000+
   'E_Invalid base and index register usage'#000+
   'E_Wrong scale factor specified'#000+
-  'E_Multiple in','dex register usage'#000+
+  'E_Multiple index register usage'#000+
   'E_Invalid operand type'#000+
   'E_Invalid string as opcode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
-  'E_Null label references are not allowed'#000+
+  'E_Null label references are not allowed'#000,
   'F_Divide by zero in asm evaluator'#000+
   'F_Evaluator stack overflow'#000+
-  'F_Evaluator stack underflo','w'#000+
+  'F_Evaluator stack underflow'#000+
   'F_Invalid numeric format in asm evaluator'#000+
   'F_Invalid Operator in asm evaluator'#000+
   'E_escape sequence ignored: $1'#000+
   'E_Invalid symbol reference'#000+
-  'W_Fwait can cause emulation problems with emu387'#000+
+  'W_Fwait can caus','e emulation problems with emu387'#000+
   'W_Calling an overload function in assembler'#000+
-  'E_Unsuppor','ted symbol type for operand'#000+
+  'E_Unsupported symbol type for operand'#000+
   'E_Constant value out of bounds'#000+
   'E_Error converting decimal $1'#000+
   'E_Error converting octal $1'#000+
   'E_Error converting binary $1'#000+
-  'E_Error converting hexadecimal $1'#000+
+  'E_Error',' converting hexadecimal $1'#000+
   'H_$1 translated to $2'#000+
-  'W_$1 is associated to an overloaded fu','nction'#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_Procedures can'#039't return any value in asm code'#000+
-  'E_SEG not supported'#000+
+  'E_SEG not suppor','ted'#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 destination or source size do not match'#000+
   'E_Assembler syntax error'#000+
   'E_Invalid combination of opcode and operands'#000+
   'E_Assemler syntax error in operand'#000+
-  'E_Assemler syntax error in constant'#000+
+  'E_Assemler synt','ax error in constant'#000+
   'E_Invalid String expression'#000+
   '32bit constant created for address'#000+
-  'E_I','nvalid or missing opcode'#000+
+  'E_Invalid or missing opcode'#000+
   'E_Invalid combination of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
   'E_Too many operands on line'#000+
-  'W_NEAR ignored'#000+
+  'W_NE','AR ignored'#000+
   '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_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 parameter with a register'#000+
   'E_Invalid segment override expression'#000+
   'W_Identifier $1 supposed external'#000+
   'E_Strings not allowed as constants'#000+
   'No type of variable specified'#000+
-  'E_assembler code not returned to text section'#000+
+  'E','_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+
   '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+
+  'N_.align is target specific, use .ba','lign or .p2align'#000+
   'E_Can'#039't access fields directly for parameters'#000+
-  'E_Can'#039't access fields of',' objects/classes directly'#000+
+  'E_Can'#039't access fields of objects/classes directly'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
   'F_Comp not supported'#000+
-  'F_Direct not support for binary writers'#000+
+  'F_Direct not support for binary write','rs'#000+
   'E_Allocating of data is only allowed in bss section'#000+
   'F_No binary writer selected'#000+
-  'E_As','m: Opcode $1 not in table'#000+
+  'E_Asm: Opcode $1 not in table'#000+
   'E_Asm: $1 invalid combination of opcode and operands'#000+
   'E_Asm: 16 Bit references not supported'#000+
   'E_Asm: Invalid effective address'#000+
-  'E_Asm: Immediate or reference expected'#000+
+  'E_','Asm: Immediate or reference expected'#000+
   'E_Asm: $1 value exceeds bounds $2'#000+
-  'E_Asm: Short jum','p is out of range $1'#000+
+  'E_Asm: Short jump is out of range $1'#000+
   'E_Asm: Undefined label $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+
+  'W_Assembler $1 ','not found, switching to external assembling'#000+
   'T_Using assembler: $1'#000+
-  'W_Error while assembl','ing exitcode $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+
   'I_Assembling smartlink $1'#000+
-  'W_Object $1 not found, Linking may fail !'#000+
+  'W_Object $1 not found, Li','nking 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+
+  'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
   'W_Util $1 not found, switching to external linking'#000+
   'T_Using util $1'#000+
-  'E_Creation of Executables not supported'#000+
+  'E_Creation of Executabl','es not supported'#000+
   'E_Creation of Dynamic/Shared Libraries not supported'#000+
-  'I_Closing script ','$1'#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 Code: $1 bytes'#000+
   'X_Size of initialized data: $1 bytes'#000+
-  'X_Size of uninitialized data: $','1 bytes'#000+
+  'X_Size of uninitialized data: $1 bytes'#000+
   'X_Stack space reserved: $1 bytes'#000+
   'X_Stack space commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
   'T_PPU Loading $1'#000+
   'U_PPU Name: $1'#000+
   'U_PPU Flags: $1'#000+
-  'U_PPU Crc: $1'#000+
+  'U_PPU Crc: $1'#000,
   'U_PPU Time: $1'#000+
   'U_PPU File too short'#000+
   'U_PPU Invalid Header (no PPU at the begin)'#000+
-  'U_PPU In','valid Version $1'#000+
+  'U_PPU Invalid Version $1'#000+
   'U_PPU is compiled for an other processor'#000+
   'U_PPU is compiled for an other target'#000+
   'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
-  'F_Error reading PPU-File'#000+
+  'F_Er','ror reading PPU-File'#000+
   'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
-  'F_PPU Db','x count problem'#000+
+  'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
   'F_Circular unit reference between $1 and $2'#000+
   'F_Can'#039't compile unit $1, no sources available'#000+
-  'F_Can'#039't find unit $1'#000+
+  'F_Can'#039,'t find unit $1'#000+
   'W_Unit $1 was not found but $2 exists'#000+
   'F_Unit $1 searched but $2 found'#000+
-  'W_','Compiling the system unit requires the -Us switch'#000+
+  'W_Compiling the system unit requires the -Us switch'#000+
   'F_There were $1 errors compiling module, stopping'#000+
   'U_Load from $1 ($2) unit $3'#000+
-  'U_Recompiling $1, checksum changed for $2'#000+
+  'U_Recompiling $1, checksu','m changed for $2'#000+
   'U_Recompiling $1, source found only'#000+
-  'U_Recompiling unit, static lib is ','older than ppufile'#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 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_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_DEF file can be created only for OS/2'#000+
-  'E_nested response files are not supported'#000+
+  'E_nes','ted response files are not supported'#000+
   'F_No source file name in command line'#000+
-  'N_No option ','inside $1 config file'#000+
+  'N_No option inside $1 config file'#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 fr','om $1'#000+
   'W_Target is already set to: $1'#000+
-  'W_Shared libs not supported on DOS platform, rever','ting 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 supported by this e','xecutable'#000+
   'H_Try recompiling with -dGDB'#000+
   'E_You are using the obsolete switch $1'#000+
-  'E_You are',' using the obsolete switch $1, please use $2'#000+
+  'E_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+
+  'Free Pascal Compiler version $FPCVER [$FPCDATE] fo','r $FPCTARGET'#000+
   'Copyright (c) 1993-2000 by Florian Klaempfl'#000+
-  'Free Pascal Compiler version $','FPCVER'#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+
-  '**0*_put + ','after a boolean switch option to enable it, - to disable '+
-  'it'#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+
+  '**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+
+  '**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+
+  '**1C<x>_code generatio','n options:'#000+
   '**2CD_create also dynamic library (not supported)'#000+
-  '**2Ch<n>_<n> bytes heap (b','etween 1023 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 s','ize to <n>'#000+
   '**2Ct_stack checking'#000+
   '**2CX_create also smartlinked library'#000+
-  '**1d<x>_defines t','he 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<x>_set file names and paths:'#000+
-  '**2FD<x>_sets the directory where to search for compiler utilities',#000+
+  '**1F<x>_set f','ile names and paths:'#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+
-  '*L2FL<x>_uses <x> as dynamic linker'#000+
+  '*L2FL','<x>_uses <x> as dynamic linker'#000+
   '**2Fo<x>_adds <x> to object path'#000+
-  '**2Fr<x>_load error mes','sage file <x>'#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_generate debugger information:'#000+
   '*g2gg_use gsym'#000+
-  '*g2gd_use dbx'#000+
+  '*g2gd','_use dbx'#000+
   '*g2gh_use heap trace unit (for memory leak debugging)'#000+
-  '*g2gl_use line info unit',' to show more info for backtraces'#000+
+  '*g2gl_use line info unit to show more info for backtraces'#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+
+  '**2iSO_ret','urn compiler OS'#000+
   '**2iSP_return compiler processor'#000+
   '**2iTO_return target OS'#000+
-  '**2iTP_return ','target processor'#000+
+  '**2iTP_return target processor'#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 (define','s FPC_PROFILE)'#000+
+  '**1o<x>_change t','he name of the executable produced to <x>'#000+
+  '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#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+
+  '**2Sc_suppor','ts operators like C (*=,+=,/= and -=)'#000+
   '**2sa_include assertion code.'#000+
-  '**2Sd_tries to be D','elphi compatible'#000+
+  '**2Sd_tries to be Delphi compatible'#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+
+  '**2Si_support C++ styled IN','LINE'#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+
+  '**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 call 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+
+  '**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 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*_n : Show notes                  t : Show 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*_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*_    declarations if an error    x : Executable info (Win32 only)'#000+
+  '**2*_    decl','arations if an error    x : Executable info (Win32 only'+
+  ')'#000+
   '**2*_    occurs'#000+
-  '**1X_executabl','e options:'#000+
+  '**1X_executable options:'#000+
   '*L2Xc_link with the c library'#000+
   '**2Xs_strip all symbols from executable'#000+
   '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#000+
-  '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#000+
-  '**2XX_try to link smart            (','defines FPC_LINK_SMART)'#000+
+  '**2XS_try ','to link static (default) (defines FPC_LINK_STATIC)'#000+
+  '**2XX_try to link smart            (defines FPC_LINK_SMART)'#000+
   '**0*_Processor specific options:'#000+
   '3*1A<x>_output format:'#000+
   '3*2Aas_assemble using GNU AS'#000+
-  '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#000+
+  '3*2Aasaout_assemble using GNU AS for aout (G','o32v1)'#000+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#000+
-  '3*2Anasmelf_elf32 (Linux) 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 writer'#000+
+  '3*2Acoff_coff (Go32v2) using interna','l writer'#000+
   '3*2Apecoff_pecoff (Win32) using internal writer'#000+
-  '3*1R<x>_assembler reading styl','e:'#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*1O<x>_optimizations:'#000+
+  '3*1O<x>_optimizations',':'#000+
   '3*2Og_generate smaller code'#000+
   '3*2OG_generate faster code (default)'#000+
-  '3*2Or_keep certain v','ariables in registers'#000+
+  '3*2Or_keep certain variables in registers'#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*2O2_level 2 optimizations (-O1 ','+ slower optimizations)'#000+
   '3*2O3_level 3 optimizations (same as -O2u)'#000+
-  '3*2Op<x>_target proc','essor:'#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/c6x86/K6 (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*2T','GO32V2_version 2 of DJ Delorie DOS extender'#000+
+  '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
   '3*2TWin32_Windows 32 Bit'#000+
   '3*1W<x>_Win32 target options'#000+
-  '3*2WB<x>_Set Image base to Hexadecimal <x> value'#000+
+  '3*2WB<x>_Set Image bas','e to Hexadecimal <x> value'#000+
   '3*2WC_Specify console type application'#000+
-  '3*2WD_Use DEFFILE to ','export functions of DLL or EXE'#000+
+  '3*2WD_Use DEFFILE to export functions of DLL or EXE'#000+
   '3*2WG_Specify graphic type application'#000+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#000+
-  '3*2WR_Generate relocation code'#000+
+  '3*2WR_Generate relo','cation code'#000+
   '6*1A<x>_output format'#000+
   '6*2Aas_Unix o-file using GNU AS'#000+
-  '6*2Agas_GNU Motorola ','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 faster code (default)'#000+
+  '6*','2OG_generate faster code (default)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
-  '6*2O2_set ta','rget processor to a MC68020+'#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_Commodore ','Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
-  '**1?','_shows this help'#000+
+  '**1?_shows this help'#000+
   '**1h_shows this help without waiting'#000
 );

+ 18 - 3
compiler/tcinl.pas

@@ -670,11 +670,20 @@ implementation
                        { file is not typed.                             }
                        if assigned(hp) and assigned(hp^.resulttype) then
                          Begin
-                           if (hp^.resulttype^.deftype=filedef) and
-                              (pfiledef(hp^.resulttype)^.filetyp=ft_typed) then
+                           if (hp^.resulttype^.deftype=filedef) then
+                           if (pfiledef(hp^.resulttype)^.filetyp=ft_untyped) then
+                             begin
+                              if (p^.inlinenumber in [in_readln_x,in_writeln_x]) then
+                                CGMessage(type_e_no_readln_writeln_for_typed_file)
+                              else
+                                CGMessage(type_e_no_read_write_for_untyped_file);
+                             end
+                           else if (pfiledef(hp^.resulttype)^.filetyp=ft_typed) then
                             begin
                               file_is_typed:=true;
                               { test the type }
+                              if (p^.inlinenumber in [in_readln_x,in_writeln_x]) then
+                                CGMessage(type_e_no_readln_writeln_for_typed_file);
                               hpp:=p^.left;
                               while (hpp<>hp) do
                                begin
@@ -1306,7 +1315,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.71  2000-03-22 17:34:53  jonas
+  Revision 1.72  2000-03-27 09:42:50  pierre
+    + add error if trying to use readln or writeln for files
+      or read or write on untyped files.
+      Reset and rewrite are still incompatible with BP
+      (reset(dat,1); is allowed for typed file !)
+
+  Revision 1.71  2000/03/22 17:34:53  jonas
     * fix for webbug 886
 
   Revision 1.70  2000/03/21 09:12:40  florian