* merged @result fix from Pierre

compiler/compiler.pas

@@ -88,7 +88,8 @@ uses
   dos,
 {$endif Delphi}
   verbose,comphook,systems,
-  cutils,cobjects,globals,options,parser,symtable,link,import,export,tokens;
+  cutils,cobjects,globals,options,fmodule,parser,symtable,
+  link,import,export,tokens;
 
 function Compile(const cmd:string):longint;
 
@@ -182,6 +183,10 @@ begin
   inittokens;
   InitSymtable;
   CompilerInited:=true;
+{ this is needed here for the IDE
+  in case of compilation failure
+  at the previous compile }
+  current_module:=nil;
 { read the arguments }
   read_arguments(cmd);
 { inits which depend on arguments }
@@ -303,7 +308,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.6  2000-09-24 15:06:14  peter
+  Revision 1.7  2000-10-08 10:26:33  peter
+    * merged @result fix from Pierre
+
+  Revision 1.6  2000/09/24 15:06:14  peter
     * use defines.inc
 
   Revision 1.5  2000/08/27 16:11:50  peter

compiler/errore.msg

@@ -48,6 +48,8 @@
 #
 # General
 #
+# 01016 is the last used one
+#
 # BeginOfTeX
 % \section{General compiler messages}
 % This section gives the compiler messages which are not fatal, but which
@@ -115,6 +117,8 @@ general_i_hint=01016_I_Hint:
 #
 # Scanner
 #
+# 02057 is the last used one
+#
 % \section{Scanner messages.}
 % This section lists the messages that the scanner emits. The scanner takes
 % care of the lexical structure of the pascal file, i.e. it tries to find
@@ -1309,6 +1313,8 @@ cg_e_control_flow_outside_finally=06040_E_Control flow statements aren't allowed
 #
 # Assembler reader
 #
+# 07085 is the last used one
+#
 asmr_d_start_reading=07000_D_Starting $1 styled assembler parsing
 % This informs you that an assembler block is being parsed
 asmr_d_finish_reading=07001_D_Finished $1 styled assembler parsing
@@ -1389,6 +1395,8 @@ asmr_h_direct_global_to_mangled=07039_H_$1 translated to $2
 asmr_w_direct_global_is_overloaded_func=07040_W_$1 is associated to an overloaded function
 asmr_e_cannot_use_SELF_outside_a_method=07041_E_Cannot use SELF outside a method
 asmr_e_cannot_use_OLDEBP_outside_nested_procedure=07042_E_Cannot use OLDEBP outside a nested procedure
+asmr_e_cannot_use_RESULT_here=07084_E_Cannot use RESULT in this function
+asmr_h_RESULT_is_reg=07085_H_RESULT is register $1
 asmr_e_void_function=07043_W_Procedures can't return any value in asm code
 asmr_e_SEG_not_supported=07044_E_SEG not supported
 asmr_e_size_suffix_and_dest_dont_match=07045_E_Size suffix and destination or source size do not match
@@ -1441,6 +1449,8 @@ asmr_e_unable_to_determine_reference_size=07083_E_No size specified and unable t
 #
 # Assembler/binary writers
 #
+# 08013 is the last used one
+#
 asmw_f_too_many_asm_files=08000_F_Too many assembler files
 asmw_f_assembler_output_not_supported=08001_F_Selected assembler output not supported
 asmw_f_comp_not_supported=08002_F_Comp not supported
@@ -1460,6 +1470,8 @@ asmw_e_undefined_label=08013_E_Asm: Undefined label $1
 #
 # Executing linker/assembler
 #
+# 09034 is the last used one
+#
 # BeginOfTeX
 %
 % \section{Errors of assembling/linking stage}
@@ -1517,6 +1529,8 @@ execinfo_x_stackcommit=09034_X_Stack space commited: $1 bytes
 #
 # Unit loading
 #
+# 10039 is the last used one
+#
 # BeginOfTeX
 % \section{Unit loading messages.}
 % This section lists all messages that can occur when the compiler is
@@ -1641,6 +1655,8 @@ unit_h_cond_set_in_last_compile=10039_H_Conditional $1 was set at startup in las
 #
 #  Options
 #
+# 11025 is the last used one
+#
 option_usage=11000_$1 [options] <inputfile> [options]
 # BeginOfTeX
 %

compiler/msgidx.inc

@@ -398,6 +398,8 @@ const
   asmr_w_direct_global_is_overloaded_func=07040;
   asmr_e_cannot_use_SELF_outside_a_method=07041;
   asmr_e_cannot_use_OLDEBP_outside_nested_procedure=07042;
+  asmr_e_cannot_use_RESULT_here=07084;
+  asmr_h_RESULT_is_reg=07085;
   asmr_e_void_function=07043;
   asmr_e_SEG_not_supported=07044;
   asmr_e_size_suffix_and_dest_dont_match=07045;
@@ -555,9 +557,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 31005;
+  MsgTxtSize = 31078;
 
   MsgIdxMax : array[1..20] of longint=(
-    17,58,165,34,41,41,84,14,35,40,
-    26,1,1,1,1,1,1,1,1,1
+    17,58,165,34,41,41,86,14,35,40,
+    26,1,1,1,1,1,1,1,1,16777217
   );

compiler/msgtxt.inc

@@ -433,332 +433,333 @@ const msgtxt : array[0..000129,1..240] of char=(
   '07040_W_$1 is associated to an overl','oaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
+  '07084_E_Cannot use RESULT in this function'#000+
+  '07085_H_RESULT is register $1'#000+
   '07043_W_Procedures can'#039't return any value in asm code'#000+
-  '07044_E_SEG not supported'#000+
-  '07045_E_Size suffix and destination or source size ','do not match'#000+
+  '0704','4_E_SEG not supported'#000+
+  '07045_E_Size suffix and destination or source size do not match'#000+
   '07046_W_Size suffix and destination or source size do not match'#000+
   '07047_E_Assembler syntax error'#000+
   '07048_E_Invalid combination of opcode and operands'#000+
-  '07049_E_Assemler syntax error in operand'#000+
-  '07050_E_Assemler syntax error in constan','t'#000+
+  '07049_E_','Assemler syntax error in operand'#000+
+  '07050_E_Assemler syntax error in constant'#000+
   '07051_E_Invalid String expression'#000+
   '07052_bit constant created for address'#000+
   '07053_E_Unrecognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#000+
-  '07055_E_Invalid combination of prefix and opcode: $1'#000+
-  '07056_E_Invalid combination of override and opc','ode: $1'#000+
+  '07055_E_Invalid combination',' of prefix and opcode: $1'#000+
+  '07056_E_Invalid combination of override and opcode: $1'#000+
   '07057_E_Too many operands on line'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
   '07061_E_Undefined local symbol $1'#000+
-  '07062_E_Unknown label identifier $1'#000+
+  '07062_E_Unknown ','label identifier $1'#000+
   '07063_E_Invalid register name'#000+
-  '07064_E_Invalid floatin','g point register name'#000+
+  '07064_E_Invalid floating point register name'#000+
   '07065_E_NOR not supported'#000+
   '07066_W_Modulo not supported'#000+
   '07067_E_Invalid floating point constant $1'#000+
   '07068_E_Invalid floating point expression'#000+
-  '07069_E_Wrong symbol type'#000+
-  '07070_E_Cannot index a local var or parameter with a',' register'#000+
+  '07069','_E_Wrong symbol type'#000+
+  '07070_E_Cannot index a local var or parameter with a register'#000+
   '07071_E_Invalid segment override expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
-  '07074_No type of variable specified'#000+
+  '07074_No type of variable specif','ied'#000+
   '07075_E_assembler code not returned to text section'#000+
-  '07076_E_Not a dir','ective or local symbol $1'#000+
+  '07076_E_Not a directive or local symbol $1'#000+
   '07077_E_Using a defined name as a local label'#000+
   '07078_E_Dollar token is used without an identifier'#000+
   '07079_W_32bit constant created for address'#000+
-  '07080_N_.align is target specific, use .balign or .p2align'#000+
-  '07081_E_Can'#039't a','ccess fields directly for parameters'#000+
+  '0','7080_N_.align is target specific, use .balign or .p2align'#000+
+  '07081_E_Can'#039't access fields directly for parameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
   '07083_E_No size specified and unable to determine the size of the oper'+
-  'ands'#000+
+  'ands',#000+
   '08000_F_Too many assembler files'#000+
-  '08001_F_Selected assembler output not s','upported'#000+
+  '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
   '08003_F_Direct not support for binary writers'#000+
   '08004_E_Allocating of data is only allowed in bss section'#000+
-  '08005_F_No binary writer selected'#000+
+  '08005_F_No binary writer se','lected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
-  '08007_E_Asm: $1 invalid combin','ation of opcode and operands'#000+
+  '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
   '08008_E_Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
-  '08011_E_Asm: $1 value exceeds bounds $2'#000+
-  '08012_E_Asm: Short jump is out of range $1',#000+
+  '08011_E_A','sm: $1 value exceeds bounds $2'#000+
+  '08012_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assember file: $1'#000+
-  '09003_E_Can'#039't create object file: $1'#000+
+  '09003_E_Can'#039't create obj','ect file: $1'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
-  '09005_W_Assembler $1 n','ot found, switching to external assembling'#000+
+  '09005_W_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_W_Error while assembling exitcode $1'#000+
-  '09008_W_Can'#039't call the assembler, error $1 switching to external a'+
-  'ssembling'#000+
+  '09008_W_Can'#039't call the assembler, error $1 switching ','to external'+
+  ' assembling'#000+
   '09009_I_Assembling $1'#000+
-  '09010_I_Assembling smartlink',' $1'#000+
+  '09010_I_Assembling smartlink $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
   '09012_W_Library $1 not found, Linking may fail !'#000+
   '09013_W_Error while linking'#000+
-  '09014_W_Can'#039't call the linker, switching to external linking'#000+
+  '09014_W_Can'#039't call the linker, switchi','ng to external linking'#000+
   '09015_I_Linking $1'#000+
-  '09016_W_Util $1 not found, swit','ching to external linking'#000+
+  '09016_W_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
   '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
-  '09020_I_Closing script $1'#000+
-  '09021_W_resource compiler not found, switching to external mo','de'#000+
+  '09020_I_Closin','g script $1'#000+
+  '09021_W_resource compiler not found, switching to external mode'#000+
   '09022_I_Compiling resource $1'#000+
   '09023_T_unit $1 can'#039't be static linked, switching to smart linking'+
   #000+
   '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
-  #000+
+  #000,
   '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
   'g'#000+
-  '09026','_E_unit $1 can'#039't be smart or static linked'#000+
+  '09026_E_unit $1 can'#039't be smart or static linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
   '09028_F_Can'#039't post process executable $1'#000+
   '09029_F_Can'#039't open executable $1'#000+
-  '09030_X_Size of Code: $1 bytes'#000+
-  '09031_X_Size of initialized data: $1 bytes'#000,
+  '0','9030_X_Size of Code: $1 bytes'#000+
+  '09031_X_Size of initialized data: $1 bytes'#000+
   '09032_X_Size of uninitialized data: $1 bytes'#000+
   '09033_X_Stack space reserved: $1 bytes'#000+
   '09034_X_Stack space commited: $1 bytes'#000+
   '10000_T_Unitsearch: $1'#000+
-  '10001_T_PPU Loading $1'#000+
+  '10001_T_PPU Loading $','1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
-  '10005_U_','PPU Time: $1'#000+
+  '10005_U_PPU Time: $1'#000+
   '10006_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
-  '10009_U_PPU is compiled for an other processor'#000+
+  '10009_U_PPU is compiled for an other processor'#000,
   '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
-  '10012_','U_Writing $1'#000+
+  '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
   '10016_F_Invalid PPU-File entry: $1'#000+
-  '10017_F_PPU Dbx count problem'#000+
+  '10017_F_PPU Dbx count pr','oblem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_F_Circul','ar unit reference between $1 and $2'#000+
+  '10020_F_Circular unit reference between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
   '10022_F_Can'#039't find unit $1'#000+
   '10023_W_Unit $1 was not found but $2 exists'#000+
-  '10024_F_Unit $1 searched but $2 found'#000+
-  '10025_W_Compiling the system unit requires ','the -Us switch'#000+
+  '10024_F_','Unit $1 searched but $2 found'#000+
+  '10025_W_Compiling the system unit requires the -Us switch'#000+
   '10026_F_There were $1 errors compiling module, stopping'#000+
   '10027_U_Load from $1 ($2) unit $3'#000+
   '10028_U_Recompiling $1, checksum changed for $2'#000+
-  '10029_U_Recompiling $1, source found only'#000+
-  '10030_U_Recompiling unit, static lib is older',' than ppufile'#000+
+  '10029_U_Recomp','iling $1, source found only'#000+
+  '10030_U_Recompiling unit, static lib is older than ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
   '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
-  '10033_U_Recompiling unit, obj is older than asm'#000+
+  '10033_U_Recompiling unit, obj is ','older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
-  '10035_U_Parsing implementa','tion of $1'#000+
+  '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
   '10038_H_Conditional $1 was not set at startup in last compilation of $'+
   '2'#000+
-  '10039_H_Conditional $1 was set at startup in last compilation of $2'#000+
-  '11000_$1 [options] <inp','utfile> [options]'#000+
+  '10039_H_Conditiona','l $1 was set at startup in last compilation of $2'#000+
+  '11000_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
   '11003_E_nested response files are not supported'#000+
-  '11004_F_No source file name in command line'#000+
+  '11004_F_No sourc','e file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
-  '11006','_E_Illegal parameter: $1'#000+
+  '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
   '11010_N_Reading further options from $1'#000+
-  '11011_W_Target is already set to: $1'#000+
-  '11012_W_Shared libs not supported on DOS ','platform, reverting to stat'+
-  'ic'#000+
+  '11011','_W_Target is already set to: $1'#000+
+  '11012_W_Shared libs not supported on DOS platform, reverting to static'+
+  #000+
   '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
   '11015_F_open conditional at the end of the file'#000+
-  '11016_W_Debug information generation is not supported by this executab'+
-  'le'#000+
+  '11016_W_Debug information generation i','s not supported by this execut'+
+  'able'#000+
   '11017_H_Try recompiling with -dGDB'#000+
-  '110','18_E_You are using the obsolete switch $1'#000+
+  '11018_E_You are using the obsolete switch $1'#000+
   '11019_E_You are using the obsolete switch $1, please use $2'#000+
   '11020_N_Switching assembler to default source writing assembler'#000+
-  '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
-  '11022_W','_"$1" assembler use forced'#000+
+  '1','1021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
+  '11022_W_"$1" assembler use forced'#000+
   '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+
   'Copyright (c) 1993-2000 by Florian Klaempfl'#000+
-  '11024_Free Pascal Compiler version $FPCVER'#010+
+  '11024_Free Pascal Compiler ','version $FPCVER'#010+
   #010+
   'Compiler Date  : $FPCDATE'#010+
   'Compiler Target: $FPCTARGET'#010+
   #010+
-  'T','his program comes under the GNU General Public Licence'#010+
+  'This program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.FPC'#010+
   #010+
   'Report bugs,suggestions etc to:'#010+
   '                 [email protected]'#000+
-  '11025_**0*_put + after a boolean switch option to enable it, - to disa'+
-  'ble i','t'#010+
+  '11','025_**0*_put + after a boolean switch option to enable it, - to di'+
+  'sable it'#010+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#010+
   '**2al_list sourcecode lines in assembler file'#010+
-  '**2ar_list register allocation/release info in assembler file'#010+
+  '**2ar_list register allocation/release info in assembler ','file'#010+
   '**2at_list temp allocation/release info in assembler file'#010+
-  '**1b_gener','ate browser info'#010+
+  '**1b_generate browser info'#010+
   '**2bl_generate local symbol info'#010+
   '**1B_build all modules'#010+
   '**1C<x>_code generation options:'#010+
   '**2CD_create also dynamic library (not supported)'#010+
-  '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
+  '**2Ch<n>_<n','> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
-  '**2Cn_omit lin','king stage'#010+
+  '**2Cn_omit linking stage'#010+
   '**2Co_check overflow of integer operations'#010+
   '**2Cr_range checking'#010+
   '**2Cs<n>_set stack size to <n>'#010+
   '**2Ct_stack checking'#010+
   '**2CX_create also smartlinked library'#010+
-  '**1d<x>_defines the symbol <x>'#010+
+  '**','1d<x>_defines the symbol <x>'#010+
   '*O1D_generate a DEF file'#010+
-  '*O2Dd<x>_set descri','ption to <x>'#010+
+  '*O2Dd<x>_set description to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_set path to executable'#010+
   '**1E_same as -Cn'#010+
   '**1F<x>_set file names and paths:'#010+
-  '**2FD<x>_sets the directory where to search for compiler utilities'#010+
+  '**2FD<x>_sets the directory where to search for com','piler utilities'#010+
   '**2Fe<x>_redirect error output to <x>'#010+
-  '**2FE<x>_set exe/un','it output path to <x>'#010+
+  '**2FE<x>_set exe/unit output path to <x>'#010+
   '**2Fi<x>_adds <x> to include path'#010+
   '**2Fl<x>_adds <x> to library path'#010+
   '*L2FL<x>_uses <x> as dynamic linker'#010+
   '**2Fo<x>_adds <x> to object path'#010+
-  '**2Fr<x>_load error message file <x>'#010+
+  '**2Fr<x>','_load error message file <x>'#010+
   '**2Fu<x>_adds <x> to unit path'#010+
-  '**2FU<x>_set ','unit output path to <x>, overrides -FE'#010+
+  '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
   '*g1g_generate debugger information:'#010+
   '*g2gg_use gsym'#010+
   '*g2gd_use dbx'#010+
   '*g2gh_use heap trace unit (for memory leak debugging)'#010+
-  '*g2gl_use line info unit to show more info for backtraces'#010+
-  '*g2gc_generate checks fo','r pointers'#010+
+  '*g2gl_use',' line info unit to show more info for backtraces'#010+
+  '*g2gc_generate checks for pointers'#010+
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
   '**2iV_return compiler version'#010+
   '**2iSO_return compiler OS'#010+
   '**2iSP_return compiler processor'#010+
-  '**2iTO_return target OS'#010+
+  '**2iTO_return target OS',#010+
   '**2iTP_return target processor'#010+
   '**1I<x>_adds <x> to include path'#010+
-  '**1k<x>_','Pass <x> to the linker'#010+
+  '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#010+
   '**1n_don'#039't read the default config file'#010+
   '**1o<x>_change the name of the executable produced to <x>'#010+
-  '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
-  '*L1P_use pipes instead of creating temporar','y assembler files'#010+
+  '**1pg_generate profile code fo','r gprof (defines FPC_PROFILE)'#010+
+  '*L1P_use pipes instead of creating temporary assembler files'#010+
   '**1S<x>_syntax options:'#010+
   '**2S2_switch some Delphi 2 extensions on'#010+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
-  '**2Sd_tries to be Delphi compatible'#010+
-  '**2Se<x>_compiler stops after the <x> err','ors (default is 1)'#010+
+  '**2S','d_tries to be Delphi compatible'#010+
+  '**2Se<x>_compiler stops after the <x> errors (default is 1)'#010+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
   '**2Si_support C++ styled INLINE'#010+
   '**2Sm_support macros like C (global)'#010+
-  '**2So_tries to be TP/BP 7.0 compatible'#010+
+  '**2So_tries to be TP/BP 7.0 co','mpatible'#010+
   '**2Sp_tries to be gpc compatible'#010+
-  '**2Ss_constructor name must be ','init (destructor must be done)'#010+
+  '**2Ss_constructor name must be init (destructor must be done)'#010+
   '**2St_allow static keyword in objects'#010+
   '**1s_don'#039't call assembler and linker (only with -a)'#010+
   '**1u<x>_undefines the symbol <x>'#010+
-  '**1U_unit options:'#010+
+  '**1U_unit opt','ions:'#010+
   '**2Un_don'#039't check the unit name'#010+
   '**2Us_compile a system unit'#010+
-  '**1v<x>','_Be verbose. <x> is a combination of the following letters:'#010+
+  '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
   '**2*_e : Show errors (default)       d : Show debug info'#010+
-  '**2*_w : Show warnings               u : Show unit info'#010+
+  '**2*_w : Show warnings               u : Show unit',' info'#010+
   '**2*_n : Show notes                  t : Show tried/used files'#010+
-  '**2*','_h : Show hints                  m : Show defined macros'#010+
+  '**2*_h : Show hints                  m : Show defined macros'#010+
   '**2*_i : Show general info           p : Show compiled procedures'#010+
-  '**2*_l : Show linenumbers            c : Show conditionals'#010+
-  '**2*_a : Show everything             0 : Show nothing (exc','ept errors'+
-  ')'#010+
+  '**2*_l : Show linenumbers            c : Sho','w conditionals'#010+
+  '**2*_a : Show everything             0 : Show nothing (except errors)'#010+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#010+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#010+
-  '**2*_    occurs'#010+
+  '**2*_    occurs',#010+
   '**1X_executable options:'#010+
   '*L2Xc_link with the c library'#010+
-  '**2Xs_strip all s','ymbols from executable'#010+
+  '**2Xs_strip all symbols from executable'#010+
   '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
   '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#010+
-  '**2XX_try to link smart            (defines FPC_LINK_SMART)'#010+
+  '**2XX_try to link sma','rt            (defines FPC_LINK_SMART)'#010+
   '**0*_Processor specific options:'#010+
-  '3','*1A<x>_output format:'#010+
+  '3*1A<x>_output format:'#010+
   '3*2Aas_assemble using GNU AS'#010+
   '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#010+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
-  '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
+  '3*2Anasmelf_elf32 (Lin','ux) file using Nasm'#010+
   '3*2Anasmobj_obj file using Nasm'#010+
-  '3*2Amasm_obj file usi','ng Masm (Microsoft)'#010+
+  '3*2Amasm_obj file using Masm (Microsoft)'#010+
   '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Acoff_coff (Go32v2) using internal writer'#010+
   '3*2Apecoff_pecoff (Win32) using internal writer'#010+
-  '3*1R<x>_assembler reading style:'#010+
+  '3*1R<x>_assembl','er reading style:'#010+
   '3*2Ratt_read AT&T style assembler'#010+
-  '3*2Rintel_read Intel ','style assembler'#010+
+  '3*2Rintel_read Intel style assembler'#010+
   '3*2Rdirect_copy assembler text directly to assembler file'#010+
   '3*1O<x>_optimizations:'#010+
   '3*2Og_generate smaller code'#010+
   '3*2OG_generate faster code (default)'#010+
-  '3*2Or_keep certain variables in registers'#010+
-  '3*2Ou_enable uncertain optimizations',' (see docs)'#010+
+  '3*2Or','_keep certain variables in registers'#010+
+  '3*2Ou_enable uncertain optimizations (see docs)'#010+
   '3*2O1_level 1 optimizations (quick optimizations)'#010+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
   '3*2O3_level 3 optimizations (same as -O2u)'#010+
-  '3*2Op<x>_target processor:'#010+
+  '3*2Op','<x>_target processor:'#010+
   '3*3Op1_set target processor to 386/486'#010+
-  '3*3Op2_set t','arget processor to Pentium/PentiumMMX (tm)'#010+
+  '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
   '3*1T<x>_Target operating system:'#010+
-  '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#010+
+  '3*2TGO32V1_version 1 of DJ Delorie DO','S extender'#010+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+
-  '3*2TLINUX_Linu','x'#010+
+  '3*2TLINUX_Linux'#010+
   '3*2Tnetware_Novell Netware Module (experimental)'#010+
   '3*2TOS2_OS/2 2.x'#010+
   '3*2TWin32_Windows 32 Bit'#010+
   '3*1W<x>_Win32 target options'#010+
-  '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
+  '3*2WB<x>_Set Image base to Hexadecimal <x> va','lue'#010+
   '3*2WC_Specify console type application'#010+
-  '3*2WD_Use DEFFILE to export fu','nctions of DLL or EXE'#010+
+  '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
   '3*2WG_Specify graphic type application'#010+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
-  '6*1A<x>_output format'#010+
+  '6*1A<x>_out','put format'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
-  '6*2Agas_GNU Motorola assembler',#010+
+  '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   '6*1O_optimizations:'#010+
   '6*2Oa_turn on the optimizer'#010+
   '6*2Og_generate smaller code'#010+
-  '6*2OG_generate faster code (default)'#010+
+  '6*2OG_generate faster cod','e (default)'#010+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
-  '6*2O2_set target proc','essor to a MC68020+'#010+
+  '6*2O2_set target processor to a MC68020+'#010+
   '6*1R<x>_assembler reading style:'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '6*1T<x>_Target operating system:'#010+
   '6*2TAMIGA_Commodore Amiga'#010+
-  '6*2TATARI_Atari ST/STe/TT'#010+
+  '6*2TATARI_Atari S','T/STe/TT'#010+
   '6*2TMACOS_Macintosh m68k'#010+
   '6*2TLINUX_Linux-68k'#010+
   '**1*_'#010+
-  '**1?_shows th','is help'#010+
+  '**1?_shows this help'#010+
   '**1h_shows this help without waiting'#000
 );

compiler/ra386.pas

@@ -40,6 +40,7 @@ type
   P386Operand=^T386Operand;
   T386Operand=object(TOperand)
     Procedure SetCorrectSize(opcode:tasmop);virtual;
+    Function SetupResult : boolean;virtual;
   end;
 
   P386Instruction=^T386Instruction;
@@ -57,7 +58,12 @@ type
 implementation
 
 uses
-  globtype,systems,globals,verbose,cpuasm;
+{$ifdef NEWCG}
+  cgbase,
+{$else}
+  hcodegen,
+{$endif}
+  globtype,systems,types,globals,verbose,cpuasm;
 
 
 {*****************************************************************************
@@ -168,6 +174,36 @@ begin
     end;
 end;
 
+Function T386Operand.SetupResult:boolean;
+var
+  Res : boolean;
+Begin
+  Res:=TOperand.setupResult;
+  { replace by ref by register if not place was
+    reserved on stack }
+  if res and (procinfo^.return_offset=0) then
+   begin
+     opr.typ:=OPR_REGISTER;
+     if is_fpu(procinfo^.returntype.def) then
+       opr.reg:=R_ST0
+     else if ret_in_acc(procinfo^.returntype.def) then
+       case procinfo^.returntype.def^.size of
+       1 : opr.reg:=R_AL;
+       2 : opr.reg:=R_AX;
+       3,4 : opr.reg:=R_EAX;
+       else
+         begin
+           Message(asmr_e_cannot_use_RESULT_here);
+           exit;
+         end;
+       end;
+     Message1(asmr_h_RESULT_is_reg,reg2str(opr.reg));
+   end;
+  SetupResult:=res;
+end;
+
+
+
 {*****************************************************************************
                               T386Instruction
 *****************************************************************************}
@@ -456,7 +492,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.6  2000-09-24 21:33:47  peter
+  Revision 1.7  2000-10-08 10:26:33  peter
+    * merged @result fix from Pierre
+
+  Revision 1.6  2000/09/24 21:33:47  peter
     * message updates merges
 
   Revision 1.5  2000/09/24 15:06:25  peter

compiler/rautils.pas

@@ -91,7 +91,7 @@ type
     Procedure BuildOperand;virtual;
     Procedure SetSize(_size:longint;force:boolean);
     Procedure SetCorrectSize(opcode:tasmop);virtual;
-    Function  SetupResult:boolean;
+    Function  SetupResult:boolean;virtual;
     Function  SetupSelf:boolean;
     Function  SetupOldEBP:boolean;
     Function  SetupVar(const hs:string;GetOffset : boolean): Boolean;
@@ -734,6 +734,12 @@ Begin
   if assigned(procinfo^.returntype.def) and
      (procinfo^.returntype.def<>pdef(voiddef)) then
    begin
+     if (m_tp in aktmodeswitches) or
+        (m_delphi in aktmodeswitches) then
+       begin
+         Message(asmr_e_cannot_use_RESULT_here);
+         exit;
+       end;
      opr.ref.offset:=procinfo^.return_offset;
      opr.ref.base:= procinfo^.framepointer;
      { always assume that the result is valid. }
@@ -1542,7 +1548,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.6  2000-09-24 21:19:51  peter
+  Revision 1.7  2000-10-08 10:26:33  peter
+    * merged @result fix from Pierre
+
+  Revision 1.6  2000/09/24 21:19:51  peter
     * delphi compile fixes
 
   Revision 1.5  2000/09/24 15:06:26  peter
@@ -1558,4 +1567,4 @@ end.
   Revision 1.2  2000/07/13 11:32:48  michael
   + removed logs
 
-}
+}