2
0
Эх сурвалжийг харах

* bug #487 fixed, (inc(<property>) isn't allowed)
* more fixes to compile with Delphi

florian 26 жил өмнө
parent
commit
774df6096e

+ 6 - 2
compiler/ag386int.pas

@@ -584,7 +584,7 @@ ait_stab_function_name : ;
     procedure ti386intasmlist.WriteExternals;
       begin
         currentasmlist:=@self;
-        AsmSymbolList^.foreach({$ifndef TP}@{$endif}writeexternal);
+        AsmSymbolList^.foreach({$ifndef VER70}@{$endif}writeexternal);
       end;
 
 
@@ -627,7 +627,11 @@ ait_stab_function_name : ;
 end.
 {
   $Log$
-  Revision 1.48  1999-07-18 10:19:39  florian
+  Revision 1.49  1999-07-18 14:47:19  florian
+    * bug 487 fixed, (inc(<property>) isn't allowed)
+    * more fixes to compile with Delphi
+
+  Revision 1.48  1999/07/18 10:19:39  florian
     * made it compilable with Dlephi 4 again
     + fixed problem with large stack allocations on win32
 

+ 9 - 1
compiler/ag386nsm.pas

@@ -559,7 +559,11 @@ ait_stab_function_name : ;
     procedure ti386nasmasmlist.WriteExternals;
       begin
         currentasmlist:=@self;
+{$ifdef Delphi}
+        AsmSymbolList^.foreach(@writeexternal);
+{$else}
         AsmSymbolList^.foreach({$ifndef TP}@{$endif}writeexternal);
+{$endif Delphi}
       end;
 
 
@@ -597,7 +601,11 @@ ait_stab_function_name : ;
 end.
 {
   $Log$
-  Revision 1.44  1999-07-18 10:19:41  florian
+  Revision 1.45  1999-07-18 14:47:20  florian
+    * bug 487 fixed, (inc(<property>) isn't allowed)
+    * more fixes to compile with Delphi
+
+  Revision 1.44  1999/07/18 10:19:41  florian
     * made it compilable with Dlephi 4 again
     + fixed problem with large stack allocations on win32
 

+ 7 - 1
compiler/compiler.pas

@@ -223,7 +223,9 @@ begin
   Message1(general_t_librarypath,Linker.librarysearchpath);
   Message1(general_t_objectpath,objectsearchpath);
 {$ifdef TP}
+{$ifndef Delphi}
   Comment(V_Info,'Memory: '+tostr(MemAvail)+' Bytes Free');
+{$endif Delphi}  
 {$endif}
 
 {$ifdef USEEXCEPT}
@@ -273,7 +275,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.24  1999-07-18 10:19:48  florian
+  Revision 1.25  1999-07-18 14:47:22  florian
+    * bug 487 fixed, (inc(<property>) isn't allowed)
+    * more fixes to compile with Delphi
+
+  Revision 1.24  1999/07/18 10:19:48  florian
     * made it compilable with Dlephi 4 again
     + fixed problem with large stack allocations on win32
 

+ 16 - 8
compiler/daopt386.pas

@@ -172,10 +172,10 @@ Type
 
   PPaiProp = ^TPaiProp;
 
-{$IfNDef TP}
+{$IfNDef VER70}
   TPaiPropBlock = Array[1..250000] Of TPaiProp;
   PPaiPropBlock = ^TPaiPropBlock;
-{$EndIf TP}
+{$EndIf VER70}
 
   TInstrSinceLastMod = Array[R_EAX..R_EDI] Of Byte;
 
@@ -187,11 +187,11 @@ Type
                       JmpsProcessed: Word
 {$EndIf JumpAnal}
                     End;
-{$IfDef tp}
+{$IfDef VER70}
   TLabelTable = Array[0..10000] Of TLabelTableItem;
-{$Else tp}
+{$Else VER70}
   TLabelTable = Array[0..2500000] Of TLabelTableItem;
-{$Endif tp}
+{$Endif VER70}
   PLabelTable = ^TLabelTable;
 
 {******************************* Variables *******************************}
@@ -200,7 +200,7 @@ Var
 {the amount of PaiObjects in the current assembler list}
   NrOfPaiObjs: Longint;
 
-{$IfNDef TP}
+{$IfNDef VER70}
 {Array which holds all TPaiProps}
   PaiPropBlock: PPaiPropBlock;
 {$EndIf TP}
@@ -658,9 +658,11 @@ Begin
   If (LabelDif <> 0) Then
     Begin
 {$IfDef TP}
+{$ifndef Delphi}
       If (MaxAvail >= LabelDif*SizeOf(Pai))
         Then
           Begin
+{$endif Delphi}
 {$EndIf TP}
             GetMem(LabelTable, LabelDif*SizeOf(TLabelTableItem));
             FillChar(LabelTable^, LabelDif*SizeOf(TLabelTableItem), 0);
@@ -716,8 +718,10 @@ Begin
                   P := Pai(P^.Next);
               End;
 {$IfDef TP}
+{$ifndef Delphi}
           End
         Else LabelDif := 0;
+{$endif Delphi}
 {$EndIf TP}
     End;
 End;
@@ -2043,7 +2047,7 @@ Begin
       Inc(NrOfPaiObjs);
       GetNextInstruction(p, p);
     End;
-{$IfDef TP}
+{$IfDef VER70}
   If (MemAvail < (SizeOf(TPaiProp)*NrOfPaiObjs))
      Or (NrOfPaiObjs = 0)
     {this doesn't have to be one contiguous block}
@@ -2097,7 +2101,11 @@ End.
 
 {
  $Log$
- Revision 1.48  1999-07-01 18:21:21  jonas
+ Revision 1.49  1999-07-18 14:47:23  florian
+   * bug 487 fixed, (inc(<property>) isn't allowed)
+   * more fixes to compile with Delphi
+
+ Revision 1.48  1999/07/01 18:21:21  jonas
    * removed unused AsmL parameter from FindLoHiLabels
 
  Revision 1.47  1999/05/27 19:44:24  peter

+ 6 - 1
compiler/errore.msg

@@ -700,7 +700,7 @@ parser_e_register_calling_not_supported=E_Register calling (fastcall) not suppor
 parser_e_property_cant_have_a_default_value=E_Property can't have a default value
 % Set properties or indexed properties cannot have a default value.
 parser_e_property_default_value_must_const=E_The default value of a property must be constant
-% The value of a \var{default} declared property must be knwon at compile
+% The value of a \var{default} declared property must be known at compile
 % time. The value you specified is only known at run time. This happens
 % .e.g. if you specify a variable name as a default value.
 parser_e_cant_publish_that=E_Symbol can't be published, can be only a class
@@ -871,6 +871,11 @@ type_e_wrong_math_argument=E_Illegal constant passed to internal math function
 type_e_no_addr_of_constant=E_Can't get the address of constants
 % It's not possible to get the address of a constant, because they
 % aren't stored in memory, you can try making it a typed constant.
+type_e_argument_must_be_lvalue=E_Argument must be l-value
+% Only expressions which can be on the left side of an
+% assignment can be passed as call by reference argument
+% Remark: Properties can be only
+% used on the left side of an assignment, but they can't be used as l-values
 % \end{description}
 #
 # Symtable

+ 6 - 2
compiler/files.pas

@@ -345,7 +345,7 @@ uses
         if closed then
          exit;
         inc(bufstart,bufsize);
-      {$ifdef TP}
+      {$ifdef VER70}
         blockread(f,buf^,maxbufsize-1,w);
         bufsize:=w;
       {$else}
@@ -1314,7 +1314,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.98  1999-07-18 10:19:51  florian
+  Revision 1.99  1999-07-18 14:47:26  florian
+    * bug 487 fixed, (inc(<property>) isn't allowed)
+    * more fixes to compile with Delphi
+
+  Revision 1.98  1999/07/18 10:19:51  florian
     * made it compilable with Dlephi 4 again
     + fixed problem with large stack allocations on win32
 

+ 1 - 0
compiler/msgidx.inc

@@ -227,6 +227,7 @@ type tmsgconst=(
   type_e_no_method_and_procedure_not_compatible,
   type_e_wrong_math_argument,
   type_e_no_addr_of_constant,
+  type_e_argument_must_be_lvalue,
   sym_e_id_not_found,
   sym_f_internal_error_in_symtablestack,
   sym_e_duplicate_id,

+ 101 - 99
compiler/msgtxt.inc

@@ -242,37 +242,38 @@ const msgtxt : array[0..000097,1..240] of char=(
   '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_Identifier not found $1'#000+
-  'F_Internal Error in SymTableStack()'#000+
-  'E_Duplicate identif','ier $1'#000+
+  'F_Internal Error in SymTable','Stack()'#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+
   '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','_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+
   '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 define','d $1'#000+
+  'E_Instances of classes or objects with an abstract method are not',' al'+
+  'lowed'#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_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 ','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+
   '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 in','itialized'#000+
+  'W_Variabl','e $1 does not seem to be initialized'#000+
   'E_identifier idents no member $1'#000+
   'B_Found declaration: $1'#000+
   'E_BREAK not allowed'#000+
@@ -280,157 +281,157 @@ const msgtxt : array[0..000097,1..240] of char=(
   'E_Expression too complicated - FPU stack overflow'#000+
   'E_Illegal expression'#000+
   'E_Invalid integer expression'#000+
-  'E_Illegal qualifier'#000+
-  'E_High ran','ge limit < low range limit'#000+
+  'E_I','llegal 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 size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
-  'D_Conversion between ordinals and pointers is not portable across ','pl'+
+  'D_Conversion between ordinals and point','ers 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 ma','t'+
-  'ch to this context)'#000+
+  'W_Possible illegal call of constructo','r or destructor (doesn'#039't ma'+
+  'tch to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
   'E_procedure call with stackframe ESP/SP'#000+
   'E_Abstract methods can'#039't be called directly'#000+
   'F_Internal Error in getfloatreg(), allocation failure'#000+
-  'F_Unknown float type'#000+
-  'F_SecondVecn() base de','fined twice'#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+
   '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 meth','ods can'#039't be inline.'#000+
+  'D_Stack frame is omi','tted'#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, u'+
   'se (set)length instead'#000+
-  'E_Include and exclude not implemented in this case'#000+
-  'E_Constr','uctors or destructors can not be called inside a '#039'with'#039+
+  'E_Include and exclude not implem','ented 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 styled assembler parsing'#000+
   'D_Finished $1 styled assembler parsing'#000+
-  'E_Non-label pattern contains @'#000+
-  'W_Override operator no','t supported'#000+
+  'E_Non-label pattern contai','ns @'#000+
+  'W_Override operator not supported'#000+
   'E_Error building 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_Relocatable symbol c','an only be added'#000+
+  'E_Invalid constant expression'#000+
   'E_Relocatable 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 op','erand type'#000+
+  'E_Multiple index ','register usage'#000+
+  'E_Invalid operand type'#000+
   'E_Invalid string as opcode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
   'E_Null label references are not allowed'#000+
   'F_Divide by zero in asm evaluator'#000+
   'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
-  'F_Invalid numeric format in a','sm evaluator'#000+
+  'F_','Invalid numeric format in asm evaluator'#000+
   'F_Invalid Operator in asm evaluator'#000+
   'E_escape sequence ignored: $1'#000+
   'E_Invalid symbol reference'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
   'W_Calling an overload function in assembler'#000+
-  'E_Unsupported symbol type for operand'#000+
-  'E_C','onstant value out of bounds'#000+
+  'E_Unsupported ','symbol type for operand'#000+
+  'E_Constant value out of bounds'#000+
   'E_Error converting decimal $1'#000+
   'E_Error converting octal $1'#000+
   'E_Error converting binary $1'#000+
   'E_Error converting hexadecimal $1'#000+
   'H_$1 translated to $2'#000+
-  'W_$1 is associated to an overloaded function'#000+
-  'E_Cannot use SELF outsid','e a method'#000+
+  'W_$1 is associated to an overloaded functi','on'#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 destination or s','ource 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_Invalid String expression'#000+
-  '32bit constant created for address'#000+
-  'E_Invalid or',' missing opcode'#000+
+  '32bit constant creat','ed for address'#000+
+  'E_Invalid or missing opcode'#000+
   'E_Invalid combination of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
   'E_Too many operands on line'#000+
   'W_NEAR ignored'#000+
   'W_FAR ignored'#000+
   'E_Duplicate local symbol $1'#000+
-  'E_Undefined local symbol $1'#000+
-  'E_Unknown label',' identifier $1'#000+
+  'E_Undefined loca','l symbol $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 with a reg','ister'#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_Not a directive or local symbol $1'#000+
-  'E_Using a defi','ned name as a local label'#000+
+  'E_Not a directive or loc','al symbol $1'#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 selected'#000+
-  'E_As','m: Opcode $1 not in table'#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 jum','p is out of range $1'#000+
+  'E_Asm: $1 value exceeds',' bounds $2'#000+
+  'E_Asm: Short jump is out of range $1'#000+
   'W_Source operating system redefined'#000+
   'I_Assembling (pipe) $1'#000+
   'E_Can'#039't create assember file $1'#000+
   'W_Assembler $1 not found, switching to external assembling'#000+
   'T_Using assembler: $1'#000+
-  'W_Error while assembling exitcode $1'#000+
-  'W_Can'#039't ca','ll the assembler, error $1 switching to external assem'+
-  'bling'#000+
+  'W_Error while assemb','ling exitcode $1'#000+
+  'W_Can'#039't call the assembler, error $1 switching to external assembl'+
+  'ing'#000+
   'I_Assembling $1'#000+
   'I_Assembling smartlink $1'#000+
   'W_Linker $1 not found, switching to external linking'#000+
   'T_Using linker: $1'#000+
-  'W_Object $1 not found, Linking may fail !'#000+
-  'W_Library $1 not found, ','Linking may fail !'#000+
+  'W_Object $1 not found, Linking may fail',' !'#000+
+  'W_Library $1 not found, Linking may fail !'#000+
   'W_Error while linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
   'W_binder not found, switching to external binding'#000+
   'W_ar not found, switching to external ar'#000+
-  'E_Dynamic Libraries not supported'#000+
-  'I_Clos','ing script $1'#000+
+  'E_Dynamic Lib','raries not supported'#000+
+  'I_Closing script $1'#000+
   'W_resource compiler not found, switching to external mode'#000+
   'I_Compiling resource $1'#000+
   'F_Can'#039't post process executable $1'#000+
   'F_Can'#039't open executable $1'#000+
   'X_Size of Code: $1 bytes'#000+
-  'X_Size of initialized data: $1 bytes'#000+
-  'X_Size of uninitiali','zed data: $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 commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
@@ -440,7 +441,7 @@ const msgtxt : array[0..000097,1..240] of char=(
   'U_PPU Crc: $1'#000+
   'U_PPU Time: $1'#000+
   'U_PPU File too short'#000+
-  'U_PPU Invalid Header (no PPU at the begi','n)'#000+
+  'U_PPU Invalid',' Header (no PPU at the begin)'#000+
   'U_PPU Invalid Version $1'#000+
   'U_PPU is compiled for an other processor'#000+
   'U_PPU is compiled for an other target'#000+
@@ -449,46 +450,46 @@ const msgtxt : array[0..000097,1..240] of char=(
   'F_Can'#039't Write PPU-File'#000+
   'F_reading PPU-File'#000+
   'F_unexpected end of PPU-File'#000+
-  'F_Invalid PPU-File entry: $1'#000+
-  'F_P','PU Dbx count problem'#000+
+  'F_Inv','alid PPU-File entry: $1'#000+
+  'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
   'F_Circular unit reference between $1 and $2'#000+
   'F_Can'#039't compile unit $1, no sources available'#000+
   'F_Can'#039't find unit $1'#000+
-  'W_Compiling the system unit requires the -Us switch'#000+
-  'F_There were $1',' errors compiling module, stopping'#000+
+  'W_Compiling the system unit requires the',' -Us switch'#000+
+  'F_There were $1 errors compiling module, stopping'#000+
   'U_Load from $1 ($2) unit $3'#000+
   'U_Recompiling $1, checksum changed for $2'#000+
   'U_Recompiling $1, source found only'#000+
   'U_Recompiling unit, static lib is older than ppufile'#000+
-  'U_Recompiling unit, shared lib is older than p','pufile'#000+
+  'U_Recompiling unit,',' shared lib is older than ppufile'#000+
   'U_Recompiling unit, obj and asm are older than ppufile'#000+
   'U_Recompiling unit, obj is older than asm'#000+
   'U_Parsing interface of $1'#000+
   'U_Parsing implementation of $1'#000+
   'U_Second load for unit $1'#000+
-  'U_PPU Check file $1 time $2'#000+
-  '$1 [options] <inputfile> ','[options]'#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+
   '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_T','oo many config files nested'#000+
   'F_Unable to open file $1'#000+
   'N_Reading further options from $1'#000+
   'W_Target is already set to: $1'#000+
   'W_Shared libs not supported on DOS platform, reverting to static'#000+
   'F_too many IF(N)DEFs'#000+
   'F_too many ENDIFs'#000+
-  'F_open conditional at the end of the file'#000+
-  'W_D','ebug information generation is not supported by this executable'#000+
+  'F_open conditional',' at the end of the file'#000+
+  'W_Debug information generation is not supported by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
   'E_You are using the obsolete switch $1'#000+
   'E_You are using the obsolete switch $1, please use $2'#000+
-  'N_Switching assembler to default source writing assemb','ler'#000+
+  'N_Switching assembler to de','fault source writing assembler'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
   'Copyright (c) 1993-98 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
@@ -496,26 +497,26 @@ const msgtxt : array[0..000097,1..240] of char=(
   'Compiler Date  : $FPCDATE'#000+
   'Compiler Target: $FPCTARGET'#000+
   #000+
-  'This program comes under the GNU Gener','al Public Licence'#000+
+  'This progra','m comes under the GNU General Public Licence'#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+
-  '**1a_the compiler doesn'#039't del','ete the generated assembler file'#000+
+  '**','1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
   '**2ar_list register allocation/release info in assembler file'#000+
   '**2at_list temp allocation/release info in assembler file'#000+
-  '**1b_generate browser info'#000+
-  '**2bl_generate',' local symbol info'#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+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
   '**2Ci_IO-checking'#000+
   '**2Cn_omit linking stage'#000+
-  '**2Co_check overflow of integer operation','s'#000+
+  '**2Co_check ov','erflow of integer operations'#000+
   '**2Cr_range checking'#000+
   '**2Cs<n>_set stack size to <n>'#000+
   '**2Ct_stack checking'#000+
@@ -523,21 +524,21 @@ const msgtxt : array[0..000097,1..240] of char=(
   '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+
+  '*O2Dd<x>_set description to <x>',#000+
   '*O2Dw_PM application'#000+
-  '**1e<','x>_set path to executable'#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+
   '**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+
+  '**2FE<x>_set exe/unit output pa','th 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+
   '**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,
+  '**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+
@@ -546,81 +547,82 @@ const msgtxt : array[0..000097,1..240] of char=(
   '**1i_information'#000+
   '**2iD_return compiler date'#000+
   '**2iV_return compiler version'#000+
-  '**2iSO_return compiler OS'#000+
-  '**2iSP_retu','rn compiler processor'#000+
+  '**2iSO_ret','urn compiler OS'#000+
+  '**2iSP_return compiler processor'#000+
   '**2iTO_return target OS'#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 p','roduced to <x>'#000+
+  '**1o<x>_change t','he 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 options:'#000+
   '**2S2_switch some Delphi 2 extensions on'#000+
-  '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
-  '**2Sd_tries',' to be Delphi compatible'#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 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 compatibl','e'#000+
+  '**2So_trie','s 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 call assembler and linker (only with -a)'#000+
-  '**1u<x>_undefines the symbol <x>'#000+
+  '**1u<x>_undefines the symb','ol <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*_w : Show warnings               u : Show unit info'#000+
-  '*','*2*_n : Show notes                  t : Show tried/used files'#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 info           p : Show compiled procedures'#000+
-  '**2*_l : Show linenumbers            c : Show condi','tionals'#000+
+  '**2*_l : Show linenumber','s            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*_    declarations if an error    x : Executable info (Win32 o','nly'+
+  ')'#000+
   '**2*_    occurs'#000+
-  '**1X_e','xecutable options:'#000+
+  '**1X_executable options:'#000+
   '*L2Xc_link with the c library'#000+
   '**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
   '**2Xs_strip all symbols from executable'#000+
   '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
-  '**0*_Processor specific options',':'#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*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*2Anasmobj_obj file us','ing 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*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 Int','el style assembler'#000+
+  '3*2Ratt_read AT&T style a','ssembler'#000+
+  '3*2Rintel_read Intel style assembler'#000+
   '3*2Rdirect_copy assembler text directly 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 unc','ertain optimizations (see docs)'#000+
+  '3*2Or_keep certain variables in registers (still',' BUGGY!!!)'#000+
+  '3*2Ou_enable uncertain optimizations (see docs)'#000+
   '3*2O1_level 1 optimizations (quick optimizations)'#000+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
   '3*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op<x>_target processor:'#000+
-  '3*3Op1_set target processor to ','386/486'#000+
+  '3*3O','p1_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*1T<x>_Target operating system:'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
-  '3*2TGO32V2_version 2 of DJ Delorie DOS ext','ender'#000+
+  '3*2TGO32V2_vers','ion 2 of DJ Delorie DOS extender'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
   '3*2TWin32_Windows 32 Bit'#000+
@@ -628,16 +630,16 @@ const msgtxt : array[0..000097,1..240] of char=(
   '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*2Amot_Standard Motorola assembler',#000+
   '6*1O_optimizations:'#000+
-  '6*2Oa_','turn on the optimizer'#000+
+  '6*2Oa_turn on the optimizer'#000+
   '6*2Og_generate smaller code'#000+
   '6*2OG_generate faster code (default)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
   '6*2O2_set target processor to a MC68020+'#000+
   '6*1R<x>_assembler reading style:'#000+
-  '6*2RMOT_read motorola style assembler'#000+
-  '6','*1T<x>_Target operating system:'#000+
+  '6*2RMOT_read',' motorola style assembler'#000+
+  '6*1T<x>_Target operating system:'#000+
   '6*2TAMIGA_Commodore Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
   '6*2TMACOS_Macintosh m68k'#000+

+ 7 - 1
compiler/symdef.inc

@@ -2660,6 +2660,7 @@ Const local_symtable_index : longint = $8001;
          b : byte;
 {$endif tp}
       begin
+{$ifndef Delphi}
 {$ifdef tp}
          if use_big then
            begin
@@ -2671,6 +2672,7 @@ Const local_symtable_index : longint = $8001;
            end
          else
 {$endif}
+{$endif Delphi}
           mangledname:=strpas(_mangledname);
          if count then
            is_used:=true;
@@ -3465,7 +3467,11 @@ Const local_symtable_index : longint = $8001;
 
 {
   $Log$
-  Revision 1.131  1999-07-06 21:48:27  florian
+  Revision 1.132  1999-07-18 14:47:32  florian
+    * bug 487 fixed, (inc(<property>) isn't allowed)
+    * more fixes to compile with Delphi
+
+  Revision 1.131  1999/07/06 21:48:27  florian
     * a lot bug fixes:
        - po_external isn't any longer necessary for procedure compatibility
        - m_tp_procvar is in -Sd now available

+ 18 - 1
compiler/symtable.pas

@@ -28,7 +28,9 @@ unit symtable;
 
     uses
 {$ifdef TP}
+{$ifndef Delphi}
        objects,
+{$endif Delphi}
 {$endif}
        strings,cobjects,
        globtype,globals,tokens,systems,verbose,
@@ -449,11 +451,13 @@ implementation
      asmoutput : paasmoutput;
 {$endif GDB}
 {$ifdef TP}
+{$ifndef Delphi}
    {$ifndef dpmi}
        symbolstream : temsstream;  { stream which is used to store some info }
    {$else}
        symbolstream : tmemorystream;
    {$endif}
+{$endif Delphi}
 {$endif}
 
    {to dispose the global symtable of a unit }
@@ -525,7 +529,9 @@ implementation
 
    procedure setstring(var p : pchar;const s : string);
      begin
+{$ifndef Delphi}
 {$ifdef TP}
+
        if use_big then
         begin
           p:=pchar(symbolstream.getsize);
@@ -534,6 +540,7 @@ implementation
         end
        else
 {$endif TP}
+{$endif Delphi}
         p:=strpnew(s);
      end;
 
@@ -2242,6 +2249,7 @@ implementation
                            Init/Done Symtable
 ****************************************************************************}
 
+{$ifndef Delphi}
 {$ifdef tp}
    procedure do_streamerror;
      begin
@@ -2252,9 +2260,11 @@ implementation
        halt(1);
      end;
 {$endif TP}
+{$endif Delphi}
 
    procedure InitSymtable;
      begin
+{$ifndef Delphi}
 {$ifdef TP}
      { Allocate stream }
         if use_big then
@@ -2272,6 +2282,7 @@ implementation
            symbolstream.writestr(@inputfile);
          end;
 {$endif tp}
+{$endif Delphi}
       { Reset symbolstack }
         registerdef:=false;
         read_member:=false;
@@ -2300,17 +2311,23 @@ implementation
         dispose_global:=true;
         while assigned(symtablestack) do
           dellexlevel;  }
+{$ifndef Delphi}
 {$ifdef TP}
       { close the stream }
         if use_big then
          symbolstream.done;
 {$endif}
+{$endif Delphi}
      end;
 
 end.
 {
   $Log$
-  Revision 1.24  1999-07-03 00:30:01  peter
+  Revision 1.25  1999-07-18 14:47:34  florian
+    * bug 487 fixed, (inc(<property>) isn't allowed)
+    * more fixes to compile with Delphi
+
+  Revision 1.24  1999/07/03 00:30:01  peter
     * new link writing to the ppu, one .ppu is needed for all link types,
       static (.o) is now always created also when smartlinking is used
 

+ 7 - 3
compiler/tcinl.pas

@@ -544,8 +544,8 @@ implementation
                       if codegenerror then
                        exit;
                       { first param must be var }
-                      if is_constnode(p^.left^.left) then
-                        CGMessage(type_e_variable_id_expected);
+                      if p^.left^.left^.location.loc<>LOC_REFERENCE then
+                        CGMessage(type_e_argument_must_be_lvalue);
                       { check type }
                       if (p^.left^.resulttype^.deftype in [enumdef,pointerdef]) or
                          is_ordinal(p^.left^.resulttype) then
@@ -1123,7 +1123,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.41  1999-07-05 20:25:40  peter
+  Revision 1.42  1999-07-18 14:47:35  florian
+    * bug 487 fixed, (inc(<property>) isn't allowed)
+    * more fixes to compile with Delphi
+
+  Revision 1.41  1999/07/05 20:25:40  peter
     * merged
 
   Revision 1.40  1999/07/05 20:13:18  peter

+ 8 - 2
compiler/tpexcept.pas

@@ -26,7 +26,9 @@ interface
 {$ifndef LINUX}
   {$S-}
 {$endif}
-
+{$ifdef Delphi}
+{$undef TP}
+{$endif Delphi}
 
 type
    jmp_buf = record
@@ -350,7 +352,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.6  1999-05-04 21:45:08  florian
+  Revision 1.7  1999-07-18 14:47:36  florian
+    * bug 487 fixed, (inc(<property>) isn't allowed)
+    * more fixes to compile with Delphi
+
+  Revision 1.6  1999/05/04 21:45:08  florian
     * changes to compile it with Delphi 4.0
 
   Revision 1.5  1998/10/28 18:26:23  pierre