فهرست منبع

* -vu shows unit info, -vt shows tried/used files

peter 27 سال پیش
والد
کامیت
0fc61cdfc1
10فایلهای تغییر یافته به همراه267 افزوده شده و 224 حذف شده
  1. 5 2
      compiler/assemble.pas
  2. 10 7
      compiler/compiler.pas
  3. 35 20
      compiler/files.pas
  4. 5 5
      compiler/link.pas
  5. 31 21
      compiler/msgidx.inc
  6. 148 138
      compiler/msgtxt.inc
  7. 17 24
      compiler/pmodules.pas
  8. 5 2
      compiler/scandir.inc
  9. 6 3
      compiler/scanner.pas
  10. 5 2
      compiler/symppu.inc

+ 5 - 2
compiler/assemble.pas

@@ -139,7 +139,7 @@ begin
         aktglobalswitches:=aktglobalswitches+[cs_asm_extern];
       end;
      if asfound then
-      Message1(exec_u_using_assembler,LastASBin);
+      Message1(exec_t_using_assembler,LastASBin);
    end;
   FindAssembler:=LastASBin;
 end;
@@ -458,7 +458,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.23  1998-10-07 04:27:37  carl
+  Revision 1.24  1998-10-08 23:28:50  peter
+    * -vu shows unit info, -vt shows tried/used files
+
+  Revision 1.23  1998/10/07 04:27:37  carl
     + MPW support
 
   Revision 1.22  1998/09/16 16:41:39  peter

+ 10 - 7
compiler/compiler.pas

@@ -177,14 +177,14 @@ begin
   InitCompiler(cmd);
 
 { show some info }
-  Message1(general_u_compilername,FixFileName(paramstr(0)));
+  Message1(general_t_compilername,FixFileName(paramstr(0)));
   Message1(general_d_sourceos,source_os.name);
   Message1(general_i_targetos,target_os.name);
-  Message1(general_u_exepath,exepath);
-  Message1(general_u_unitpath,unitsearchpath);
-  Message1(general_u_includepath,includesearchpath);
-  Message1(general_u_librarypath,Linker.librarysearchpath);
-  Message1(general_u_objectpath,objectsearchpath);
+  Message1(general_t_exepath,exepath);
+  Message1(general_t_unitpath,unitsearchpath);
+  Message1(general_t_includepath,includesearchpath);
+  Message1(general_t_librarypath,Linker.librarysearchpath);
+  Message1(general_t_objectpath,objectsearchpath);
 {$ifdef TP}
   Comment(V_Info,'Memory: '+tostr(MemAvail)+' Bytes Free');
 {$endif}
@@ -230,7 +230,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.10  1998-10-08 17:17:18  pierre
+  Revision 1.11  1998-10-08 23:28:51  peter
+    * -vu shows unit info, -vt shows tried/used files
+
+  Revision 1.10  1998/10/08 17:17:18  pierre
     * current_module old scanner tagged as invalid if unit is recompiled
     + added ppheap for better info on tracegetmem of heaptrc
       (adds line column and file index)

+ 35 - 20
compiler/files.pas

@@ -195,9 +195,9 @@ unit files;
   implementation
 
   uses
-    dos,verbose,systems,scanner
+    dos,verbose,systems
 {$ifndef VER0_99_8}
-    ,symtable
+    ,symtable,scanner
 {$endif}
     ;
 
@@ -623,55 +623,55 @@ unit files;
          asmfiletime : longint;
       begin
         openppu:=false;
+        Message1(unit_t_ppu_loading,ppufilename^);
       { Get ppufile time (also check if the file exists) }
         ppufiletime:=getnamedfiletime(ppufilename^);
         if ppufiletime=-1 then
          exit;
       { Open the ppufile }
-        Message1(unit_u_ppu_loading,ppufilename^);
+        Message1(unit_u_ppu_name,ppufilename^);
         ppufile:=new(pppufile,init(ppufilename^));
         if not ppufile^.open then
          begin
            dispose(ppufile,done);
-           Message(unit_d_ppu_file_too_short);
+           Message(unit_u_ppu_file_too_short);
            exit;
          end;
       { check for a valid PPU file }
         if not ppufile^.CheckPPUId then
          begin
            dispose(ppufile,done);
-           Message(unit_d_ppu_invalid_header);
+           Message(unit_u_ppu_invalid_header);
            exit;
          end;
       { check for allowed PPU versions }
         if not (ppufile^.GetPPUVersion in [15]) then
          begin
            dispose(ppufile,done);
-           Message1(unit_d_ppu_invalid_version,tostr(ppufile^.GetPPUVersion));
+           Message1(unit_u_ppu_invalid_version,tostr(ppufile^.GetPPUVersion));
            exit;
          end;
       { check the target processor }
         if ttargetcpu(ppufile^.header.cpu)<>target_cpu then
          begin
            dispose(ppufile,done);
-           Comment(V_Debug,'unit is compiled for an other processor');
+           Message(unit_u_ppu_invalid_processor);
            exit;
          end;
       { check target }
         if ttarget(ppufile^.header.target)<>target_info.target then
          begin
            dispose(ppufile,done);
-           Comment(V_Debug,'unit is compiled for an other target');
+           Message(unit_u_ppu_invalid_target);
            exit;
          end;
-  {!!!!!!!!!!!!!!!!!!! }
       { Load values to be access easier }
         flags:=ppufile^.header.flags;
         crc:=ppufile^.header.checksum;
       { Show Debug info }
-        Message1(unit_d_ppu_time,filetimestring(ppufiletime));
-        Message1(unit_d_ppu_flags,tostr(flags));
-        Message1(unit_d_ppu_crc,tostr(ppufile^.header.checksum));
+        Message1(unit_u_ppu_time,filetimestring(ppufiletime));
+        Message1(unit_u_ppu_flags,tostr(flags));
+        Message1(unit_u_ppu_crc,tostr(ppufile^.header.checksum));
       { check the object and assembler file to see if we need only to
         assemble, only if it's not in a library }
         do_compile:=false;
@@ -682,14 +682,22 @@ unit files;
             begin
               objfiletime:=getnamedfiletime(staticlibfilename^);
               if (ppufiletime<0) or (objfiletime<0) or (ppufiletime>objfiletime) then
-                do_compile:=true;
+                begin
+                  Message(unit_u_recompile_staticlib_is_older);
+                  do_compile:=true;
+                  exit;
+                end;
             end
            else
             if (flags and uf_shared_linked)<>0 then
              begin
                objfiletime:=getnamedfiletime(sharedlibfilename^);
                if (ppufiletime<0) or (objfiletime<0) or (ppufiletime>objfiletime) then
-                do_compile:=true;
+                begin
+                  Message(unit_u_recompile_sharedlib_is_older);
+                  do_compile:=true;
+                  exit;
+                end;
              end
            else
             begin
@@ -701,16 +709,18 @@ unit files;
                  asmfileTime:=GetNamedFileTime(asmfilename^);
                  if (asmfiletime<0) or (ppufiletime>asmfiletime) then
                   begin
-                    Message(unit_d_obj_and_asm_are_older_than_ppu);
+                    Message(unit_u_recompile_obj_and_asm_older);
                     do_compile:=true;
-                    { we should try to get the source file }
                     exit;
                   end
                  else
                   begin
-                    Message(unit_d_obj_is_older_than_asm);
+                    Message(unit_u_recompile_obj_older_than_asm);
                     if not(cs_asm_extern in aktglobalswitches) then
-                     exit;
+                     begin
+                       do_compile:=true;
+                       exit;
+                     end;
                   end;
                end;
             end;
@@ -799,9 +809,9 @@ unit files;
 
     procedure tmodule.reset;
       begin
+{$ifndef VER0_99_8}
         if assigned(scanner) then
           pscannerfile(scanner)^.invalid:=true;
-{$ifndef VER0_99_8}
         if assigned(globalsymtable) then
           begin
             dispose(punitsymtable(globalsymtable),done);
@@ -927,8 +937,10 @@ unit files;
          dispose(ppufile,done);
         if assigned(imports) then
          dispose(imports,done);
+{$ifndef VER0_99_8}
         if assigned(scanner) then
           pscannerfile(scanner)^.invalid:=true;
+{$endif}
         if assigned(sourcefiles) then
          dispose(sourcefiles,done);
         used_units.done;
@@ -994,7 +1006,10 @@ unit files;
 end.
 {
   $Log$
-  Revision 1.54  1998-10-08 17:17:19  pierre
+  Revision 1.55  1998-10-08 23:28:54  peter
+    * -vu shows unit info, -vt shows tried/used files
+
+  Revision 1.54  1998/10/08 17:17:19  pierre
     * current_module old scanner tagged as invalid if unit is recompiled
     + added ppheap for better info on tracegetmem of heaptrc
       (adds line column and file index)

+ 5 - 5
compiler/link.pas

@@ -106,7 +106,6 @@ begin
   if FileExists(DynamicLinker) then
    Glibc2:=true
   else
-
    DynamicLinker:='/lib/ld-linux.so.1';
   LibrarySearchPath:='/lib;/usr/lib';
 {$else}
@@ -154,7 +153,7 @@ begin
         aktglobalswitches:=aktglobalswitches+[cs_link_extern];
       end;
      if ldfound then
-      Message1(exec_u_using_linker,LastLDBin);
+      Message1(exec_t_using_linker,LastLDBin);
    end;
   FindLinker:=LastLDBin;
 end;
@@ -209,11 +208,9 @@ begin
   if Copy(s,1,length(target_os.libprefix))=target_os.libprefix then
    Delete(s,1,length(target_os.libprefix));
 { remove extension if any }
-
   if Copy(s,length(s)-length(target_os.sharedlibext)+1,length(target_os.sharedlibext))=target_os.sharedlibext then
    Delete(s,length(s)-length(target_os.sharedlibext)+1,length(target_os.sharedlibext)+1);
 { ready to be inserted }
-
   SharedLibFiles.Insert (S);
 end;
 
@@ -505,7 +502,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.27  1998-10-06 17:16:52  pierre
+  Revision 1.28  1998-10-08 23:28:56  peter
+    * -vu shows unit info, -vt shows tried/used files
+
+  Revision 1.27  1998/10/06 17:16:52  pierre
     * some memory leaks fixed (thanks to Peter for heaptrc !)
 
   Revision 1.26  1998/09/29 15:23:05  peter

+ 31 - 21
compiler/msgidx.inc

@@ -1,19 +1,19 @@
 type tmsgconst=(
-  general_u_compilername,
+  general_t_compilername,
   general_d_sourceos,
   general_i_targetos,
-  general_u_exepath,
-  general_u_unitpath,
-  general_u_includepath,
-  general_u_librarypath,
-  general_u_objectpath,
+  general_t_exepath,
+  general_t_unitpath,
+  general_t_includepath,
+  general_t_librarypath,
+  general_t_objectpath,
   general_i_abslines_compiled,
   general_f_no_memory_left,
   scan_f_end_of_file,
   scan_f_string_exceeds_line,
   scan_f_illegal_char,
   scan_f_syn_expected,
-  scan_u_start_include_file,
+  scan_t_start_include_file,
   scan_w_comment_level,
   scan_n_far_directive_ignored,
   scan_n_stack_check_global_under_linux,
@@ -52,7 +52,7 @@ type tmsgconst=(
   scan_i_press_enter,
   scan_w_unsupported_switch,
   scan_w_illegal_directive,
-  scan_d_back_in,
+  scan_t_back_in,
   scan_w_unsupported_asmmode_specifier,
   scan_e_wrong_switch_toggle,
   parser_e_syntax_error,
@@ -167,6 +167,7 @@ type tmsgconst=(
   parser_e_property_default_value_must_const,
   parser_e_cant_publish_that,
   parser_e_cant_publish_that_property,
+  parser_w_empty_import_name,
   type_e_mismatch,
   type_e_integer_expr_expected,
   type_e_ordinal_expr_expected,
@@ -389,12 +390,12 @@ type tmsgconst=(
   exec_i_assembling_pipe,
   exec_d_cant_create_asmfile,
   exec_w_assembler_not_found,
-  exec_u_using_assembler,
+  exec_t_using_assembler,
   exec_w_error_while_assembling,
   exec_w_cant_call_assembler,
   exec_i_assembling,
   exec_w_linker_not_found,
-  exec_u_using_linker,
+  exec_t_using_linker,
   exec_w_objfile_not_found,
   exec_w_libfile_not_found,
   exec_w_error_while_linking,
@@ -404,17 +405,18 @@ type tmsgconst=(
   exec_w_ar_not_found,
   exec_e_dll_not_supported,
   exec_i_closing_script,
-  unit_u_ppu_loading,
-  unit_d_ppu_time,
-  unit_d_ppu_file_too_short,
-  unit_d_ppu_invalid_header,
-  unit_d_ppu_invalid_version,
-  unit_d_ppu_flags,
-  unit_d_ppu_crc,
-  unit_t_ppu_source,
-  unit_d_obj_and_asm_are_older_than_ppu,
-  unit_d_obj_is_older_than_asm,
   unit_t_unitsearch,
+  unit_t_ppu_loading,
+  unit_u_ppu_name,
+  unit_u_ppu_flags,
+  unit_u_ppu_crc,
+  unit_u_ppu_time,
+  unit_u_ppu_file_too_short,
+  unit_u_ppu_invalid_header,
+  unit_u_ppu_invalid_version,
+  unit_u_ppu_invalid_processor,
+  unit_u_ppu_invalid_target,
+  unit_u_ppu_source,
   unit_u_ppu_write,
   unit_f_ppu_cannot_write,
   unit_f_ppu_read_error,
@@ -427,7 +429,15 @@ type tmsgconst=(
   unit_f_cant_compile_unit,
   unit_w_switch_us_missed,
   unit_f_errors_in_unit,
-  unit_t_load_unit,
+  unit_u_load_unit,
+  unit_u_recompile_crc_change,
+  unit_u_recompile_staticlib_is_older,
+  unit_u_recompile_sharedlib_is_older,
+  unit_u_recompile_obj_and_asm_older,
+  unit_u_recompile_obj_older_than_asm,
+  unit_u_start_parse_interface,
+  unit_u_start_parse_implementation,
+  unit_u_second_compile,
   option_usage,
   option_only_one_source_support,
   option_def_only_for_os2,

+ 148 - 138
compiler/msgtxt.inc

@@ -1,19 +1,19 @@
-const msgtxt : array[0..00088,1..240] of char=(+
-  'U_Compiler: $1'#000+
+const msgtxt : array[0..00090,1..240] of char=(+
+  'T_Compiler: $1'#000+
   'D_Source OS: $1'#000+
   'I_Target OS: $1'#000+
-  'U_Using executable path: $1'#000+
-  'U_Using unit path: $1'#000+
-  'U_Using include path: $1'#000+
-  'U_Using library path: $1'#000+
-  'U_Using object path: $1'#000+
+  'T_Using executable path: $1'#000+
+  'T_Using unit path: $1'#000+
+  'T_Using include path: $1'#000+
+  'T_Using library path: $1'#000+
+  'T_Using object path: $1'#000+
   'I_$1 Lines compiled, $2 sec'#000+
   'F_No memory left'#000+
   'F_Unexpected end of file',#000+
   'F_String exceeds line'#000+
   'F_illegal character'#000+
   'F_Syntax error $1 expected'#000+
-  'U_Start reading includefile $1'#000+
+  'T_Start reading includefile $1'#000+
   'W_Comment level $1 found'#000+
   'N_$F directive (FAR) ignored'#000+
   'N_Stack check is global under linux'#000+
@@ -52,7 +52,7 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'I_Press <return> to continue'#000+
   'W_Unsupported switch $1'#000+
   'W_Illegal compiler directive $1'#000+
-  'D_Back in $1'#000+
+  'T_Back in $1'#000+
   'W_Unsupported assembler style specified $1'#000+
   'E_Wrong switch toggle, use ON/OFF or +/-'#000+
   'E_Parser - Syntax Error'#000+
@@ -173,195 +173,196 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'E_The default value of a property must be constant'#000+
   'E_Symbol can'#039't be published, can be',' only a class'#000+
   'E_That kind of property can'#039't be published'#000+
+  'W_Empty import name specified'#000+
   'E_Type mismatch'#000+
   'E_Integer expression expected'#000+
   'E_Ordinal expression expected'#000+
   'E_Type identifier expected'#000+
   'E_Variable identifier expected'#000+
-  'E_pointer type expected'#000+
+  'E_pointer type expe','cted'#000+
   'E_class type expected'#000+
-  'E_V','ariable or type indentifier expected'#000+
+  'E_Variable or type indentifier expected'#000+
   'E_Can'#039't evaluate constant expression'#000+
   'E_Set elements are not compatible'#000+
   'W_Automatic type conversion from floating type to COMP which is an int'+
   'eger type'#000+
-  'W_Using / will give a floating point result'#000+
-  'H_use DI','V instead to get an integer result'#000+
+  'W_Using / will give a ','floating point result'#000+
+  'H_use DIV instead to get an integer result'#000+
   'E_string types doesn'#039't match, because of $V+ mode'#000+
   'E_succ or pred on enums with assignments not possible'#000+
   'E_Can'#039't read or write variables of this type'#000+
-  'E_Type conflict between set elements'#000+
-  'E_Integer or real e','xpression expected'#000+
+  'E_Type conflict between se','t elements'#000+
+  'E_Integer or real expression expected'#000+
   'E_Identifier not found $1'#000+
   'F_Internal Error in SymTableStack()'#000+
   'E_Duplicate identifier $1'#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_Ty','pe identifier not defined'#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+
   'F_record or class type expected'#000+
-  'E_Instances of classes or objects with',' an abtsract method are not al'+
+  'E_Instan','ces of classes or objects with an abtsract method are not al'+
   'lowed'#000+
   'E_Label not defined $1'#000+
   'E_Illegal label declaration'#000+
   'E_GOTO und LABEL are not supported (use command line switch -Sg)'#000+
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
-  'E_label already defined'#000+
-  'E_illegal type decl','aration of set elements'#000+
+  'E_label alrea','dy defined'#000+
+  'E_illegal type declaration of set elements'#000+
   'E_Forward class definition not resolved $1'#000+
   'H_Parameter not used $1'#000+
   'N_Local variable not used $1'#000+
   'E_Set type expected'#000+
   'W_Function result does not seem to be set'#000+
   'E_Unknown field identifier'#000+
-  'W_Local variable $1 does not se','em to be initialized'#000+
+  'W','_Local variable $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+
   'E_CONTINUE not allowed'#000+
   'E_Expression too complicated - FPU stack overflow'#000+
   'E_Illegal expression'#000+
-  'E_Invalid integer'#000+
+  'E_Invalid integer'#000,+
   'E_Illegal qualifier'#000+
-  'E_High ran','ge limit < low range limit'#000+
+  'E_High range limit < low range limit'#000+
   'E_Illegal counter variable'#000+
   'E_Can'#039't determine which overloaded function to call'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
-  'E_File types must be var parameters'#000+
-  'E_The use of a far pointer isn',#039't allowed there'#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_Inefficient code'#000+
-  'W_unreachable code'#000+
-  'E_procedure call ','with stackframe ESP/SP'#000+
+  'W_unre','achable 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 defined twice'#000+
   'F_Extended cg68k not supported'#000+
-  'F_32-bit unsigned not supported i','n MC68000 mode'#000+
+  'F_3','2-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 omited'#000+
   'E_Unable to inline object methods'#000+
   'E_Unable to inline procvar calls'#000+
-  'E_No code for inline procedure s','tored'#000+
+  'E_','No code for inline procedure stored'#000+
   'F_Divide by zero in asm evaluator'#000+
   'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
   'F_Invalid numeric format in asm evaluator'#000+
   'F_Invalid Operator in asm evaluator'#000+
   'F_Unknown error in asm evaluator'#000+
-  'W_Invalid numeric value'#000+
-  'E_escape s','equence ignored: $1'#000+
+  'W_In','valid numeric value'#000+
+  'E_escape sequence ignored: $1'#000+
   'E_Asm syntax error - Prefix not found'#000+
   'E_Asm syntax error - Trying to add more than one prefix'#000+
   'E_Asm syntax error - Opcode not found'#000+
   'E_Invalid symbol reference'#000+
-  'W_Calling an overload function in an asm'#000+
-  'E_Constant value out',' of bounds'#000+
+  'W_Calling an overload function ','in an asm'#000+
+  'E_Constant value out of bounds'#000+
   'E_Non-label pattern contains @'#000+
   'E_Invalid Operand: $1'#000+
   'W_Override operator not supported'#000+
   'E_Error in binary constant: $1'#000+
   'E_Error in octal constant: $1'#000+
   'E_Error in hexadecimal constant: $1'#000+
-  'E_Error in integer constant: $1'#000+
-  'E_Invalid lab','eled opcode'#000+
+  'E_Error in inte','ger constant: $1'#000+
+  'E_Invalid labeled opcode'#000+
   'F_Internal error in Findtype()'#000+
   'E_Invalid size for MOVSX/MOVZX'#000+
   'E_16-bit base in 32-bit segment'#000+
   'E_16-bit index in 32-bit segment'#000+
   'E_Invalid Opcode'#000+
   'E_Constant reference not allowed'#000+
-  'W_Fwait can cause emulation problems with emu387'#000+
-  'E_','Invalid combination of opcode and operands'#000+
+  'W_Fwait can cause emu','lation problems with emu387'#000+
+  'E_Invalid combination of opcode and operands'#000+
   'W_Opcode $1 not in table, operands not checked'#000+
   'F_Internal Error in ConcatOpcode()'#000+
   'E_Invalid size in reference'#000+
   'E_Invalid middle sized operand'#000+
-  'E_Invalid three operand opcode'#000+
-  'E_Assembler syntax error'#000,+
+  'E_Invalid three operand op','code'#000+
+  'E_Assembler syntax error'#000+
   'E_Invalid operand type'#000+
   'E_Segment overrides not supported'#000+
   'E_Invalid constant symbol $1'#000+
   'F_Internal Errror converting binary'#000+
   'F_Internal Errror converting hexadecimal'#000+
   'F_Internal Errror converting octal'#000+
-  'E_Invalid constant expression'#000+
-  'E_Unknown id','entifier: $1'#000+
+  'E_Invalid co','nstant expression'#000+
+  'E_Unknown identifier: $1'#000+
   'E_Trying to define an index register more than once'#000+
   'E_Invalid field specifier'#000+
   'F_Internal Error in BuildScaling()'#000+
   'E_Invalid scaling factor'#000+
   'E_Invalid scaling value'#000+
-  'E_Scaling value only allowed with index'#000+
-  'E_Invalid assembler synta','x. No ref with brackets)'#000+
+  'E_Scaling value only allowed with i','ndex'#000+
+  'E_Invalid assembler syntax. No ref with brackets)'#000+
   'E_Expressions of the form [sreg:reg...] are currently not supported'#000+
   'E_Trying to define a segment register twice'#000+
   'E_Trying to define a base register twice'#000+
-  'E_Trying to use a negative index register'#000+
-  'E_Asm syntax error -',' error in reference'#000+
+  'E_Trying to use a negative index',' register'#000+
+  'E_Asm syntax error - error in reference'#000+
   'E_Local symbols not allowed as references'#000+
   'E_Invalid operand in bracket expression'#000+
   'E_Invalid symbol name: $1'#000+
   'E_Invalid Reference syntax'#000+
   'E_Invalid string as opcode operand: $1'#000+
-  'W_@CODE and @DATA not supported'#000+
-  'E_Null label r','eferences are not allowed'#000+
+  'W_@CODE and @DAT','A not supported'#000+
+  'E_Null label references are not allowed'#000+
   'W_Calling of an overloaded function in direct assembler'#000+
   'E_Cannot use SELF outside a method'#000+
   'E_Asm syntax error - Should start with bracket'#000+
   'E_Asm syntax error - register: $1'#000+
-  'E_SEG and OFFSET not supported'#000+
-  'E_Asm synta','x error - in opcode operand'#000+
+  'E_SEG and OF','FSET not supported'#000+
+  'E_Asm syntax error - in opcode operand'#000+
   'E_Invalid String expression'#000+
   'E_Constant expression out of bounds'#000+
   'F_Internal Error in BuildConstant()'#000+
   'W_A repeat prefix and a segment override on <= i386 may result in erro'+
-  'rs if an interrupt occurs'#000+
-  'E_Invalid or mis','sing opcode'#000+
+  'rs if an int','errupt occurs'#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+
   'E_Duplicate local symbol: $1'#000+
   'E_Unknown label identifer: $1'#000+
-  'E_Assemble node syntax error'#000+
-  'E_Undefined loca','l symbol: $1'#000+
+  'E_Assemble node',' syntax error'#000+
+  'E_Undefined local symbol: $1'#000+
   'D_Starting intel styled assembler parsing...'#000+
   'D_Finished intel styled assembler parsing...'#000+
   'E_Not a directive or local symbol: $1'#000+
   'E_/ at beginning of line not allowed'#000+
   'E_NOR not supported'#000+
-  'E_Invalid floating point register name'#000+
-  'W_M','odulo not supported'#000+
+  'E_Invalid fl','oating point register name'#000+
+  'W_Modulo not supported'#000+
   'E_Invalid floating point constant: $1'#000+
   'E_Size suffix and destination register do not match'#000+
   'E_Internal error in ConcatLabeledInstr()'#000+
   'W_Floating point binary representation ignored'#000+
-  'W_Floating point hexadecimal representatio','n ignored'#000+
+  'W_Floating p','oint hexadecimal representation ignored'#000+
   'W_Floating point octal representation ignored'#000+
   'E_Invalid real constant expression'#000+
   'E_Parenthesis are not allowed'#000+
   'E_Invalid Reference'#000+
   'E_Cannot use __SELF outside a method'#000+
-  'E_Cannot use __OLDEBP outside a nested procedure'#000+
-  'W_Identifier ','$1 supposed external'#000+
+  'E_Cannot use __OLDEBP outside a ','nested procedure'#000+
+  'W_Identifier $1 supposed external'#000+
   'E_Invalid segment override expression'#000+
   'E_Strings not allowed as constants'#000+
   'D_Starting AT&T styled assembler parsing...'#000+
   'D_Finished AT&T styled assembler parsing...'#000+
-  'E_Switching sections is not allowed in an assembler block'#000,+
+  'E_Switching sections is not ','allowed in an assembler block'#000+
   'E_Invalid global definition'#000+
   'E_Line separator expected'#000+
   'W_globl not supported'#000+
@@ -369,234 +370,243 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'W_lcomm not supported'#000+
   'W_comm not supported'#000+
   'E_Invalid local common definition'#000+
-  'E_Invalid global common definition'#000+
-  'E_local symbol: $1 not found i','nside asm statement'#000+
+  'E_Invalid global common definition'#000,+
+  'E_local symbol: $1 not found inside asm statement'#000+
   'E_assembler code not returned to text'#000+
   'F_internal error in BuildReference()'#000+
   'E_invalid opcode size'#000+
   'W_NEAR ignored'#000+
   'W_FAR ignored'#000+
   'D_Creating inline asm lookup tables'#000+
-  'W_Using a defined name as a local label'#000+
-  'F_internal error i','n HandleExtend()'#000+
+  'W_Using a defined name as a ','local label'#000+
+  'F_internal error in HandleExtend()'#000+
   'E_Invalid character: <'#000+
   'E_Invalid character: >'#000+
   'E_Unsupported opcode'#000+
   'E_Increment and Decrement mode not allowed together'#000+
   'E_Invalid Register list in movem/fmovem'#000+
-  'E_Invalid Register list for opcode'#000+
-  'E_68020+ mode required to ass','emble'#000+
+  'E_Invalid Register list for opcode',#000+
+  'E_68020+ mode required to assemble'#000+
   'D_Starting Motorola styled assembler parsing...'#000+
   'D_Finished Motorola styled assembler parsing...'#000+
   'W_XDEF not supported'#000+
   'W_Functions with void return value can'#039't return any value in asm c'+
   'ode'#000+
-  'E_Invalid suffix for intel assembler'#000+
-  'E_Extended',' not supported in this mode'#000+
+  'E_Invalid suffix ','for intel assembler'#000+
+  'E_Extended not supported in this mode'#000+
   'E_Comp not supported in this mode'#000+
   'W_You need GNU as version >= 2.81 to compile this MMX code'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
-  'E_Unsupported symbol type for operand'#000+
-  'I_Assembling',' (pipe) $1'#000+
+  'E_Unsupported symbol',' type for operand'#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+
-  'U_Using assembler: $1'#000+
+  'T_Using assembler: $1'#000+
   'W_Error while assembling exitcode $1'#000+
-  'W_Can'#039't call the assembler, error $1 switching to external assembl'+
-  'ing'#000+
-  'I_Assembl','ing $1'#000+
+  'W_Can'#039't call the assembler, error $1 switching to',' external assem'+
+  'bling'#000+
+  'I_Assembling $1'#000+
   'W_Linker $1 not found, switching to external linking'#000+
-  'U_Using linker: $1'#000+
+  'T_Using linker: $1'#000+
   'W_Object $1 not found, Linking may fail !'#000+
   'W_Library $1 not found, Linking may fail !'#000+
   'W_Error while linking'#000+
-  'W_Can'#039't call the linker, switching to external linking',#000+
+  'W_Can'#039't call the linker,',' switching to external linking'#000+
   'I_Linking $1'#000+
   'W_binder not found, switching to external binding'#000+
   'W_ar not found, switching to external ar'#000+
   'E_Dynamic Libraries not supported'#000+
   'I_Closing script $1'#000+
-  'U_PPU Loading $1'#000+
-  'D_PPU Time: $1'#000+
-  'D_PPU File too short'#000+
-  'D_PPU Invalid Header (no PPU',' at the begin)'#000+
-  'D_PPU Invalid Version $1'#000+
-  'D_PPU Flags: $1'#000+
-  'D_PPU Crc: $1'#000+
-  'T_PPU Source: $1'#000+
-  'D_objectfile and assemblerfile are older than ppufile'#000+
-  'D_objectfile is older than assemblerfile'#000+
   'T_Unitsearch: $1'#000+
-  'U_Writing $1'#000+
+  'T_PPU Loading $1'#000+
+  'U_PPU Name: $1'#000+
+  'U_','PPU Flags: $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 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_rea','ding PPU-File'#000+
+  'F_reading PPU-File'#000+
   'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
   'F_Circular unit reference between $1 and $2'#000+
-  'F_Can'#039't compile unit $1, no sources available'#000+
-  'W_Compiling t','he system unit requires the -Us switch'#000+
+  'F_Can'#039't compile unit $1, no so','urces available'#000+
+  'W_Compiling the system unit requires the -Us switch'#000+
   'F_There were $1 errors compiling module, stopping'#000+
-  'T_From $1 ($2) load unit $3'#000+
-  '$1 [options] <inputfile> [options]'#000+
+  'U_Load from $1 ($2) unit $3'#000+
+  'U_Recompiling $1, checksum changed for $2'#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_Parsing interface of $1'#000+
+  'U_Parsing implementation of $1'#000+
+  'U_Second compile for unit $1'#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 respon','se files are not supported'#000+
+  'E_nested response files are not supported'#000+
   'F_No source file name in command line'#000+
   'E_Illegal parameter: $1'#000+
   'H_-? writes help pages'#000+
-  'F_Too many config files nested'#000+
+  'F_Too ma','ny 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_Share','d libs not supported on DOS platform, reverting to static'#000+
+  'W_Shared libs not supported on DOS platform, reverting to static'#000+
   'F_too many IF(N)DEFs'#000+
   'F_too many ENDIFs'#000+
-  'F_open conditional at the end of the file'#000+
+  'F_open conditional at t','he end of the file'#000+
   'W_Debug information generation is not supported by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
-  'Free ','Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
+  'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
   'Copyright (c) 1993-98 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+
+  'This program 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+
+  '                [email protected]','gary.net'#000+
   '**0*_+ switch option on, - off'#000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
-  '**2al_list sourcec','ode lines in assembler file'#000+
+  '**2al_list sourcecode lines in assembler file'#000+
   '*t1b_use EMS'#000+
   '**1B_build all modules'#000+
   '**1C_code generation options'#000+
-  '3*2CD_create dynamic library'#000+
+  '3*2CD_create dynamic librar','y'#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+
+  '**2Co_check overflow of integer operations'#000+
   '**2Cr_range checking'#000+
   '**2Cs<n>_set stack size to <n>'#000+
   '**2Ct_stack checking'#000+
-  '3*2CS_create static library'#000+
+  '3*2CS_create static library',#000+
   '3*2Cx_use smartlinking'#000+
   '**1d<x>_defines the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
-  '*O2Dw_PM',' application'#000+
+  '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F_set file names and paths'#000+
-  '**2Fe<x>_redirect error output to <x>'#000+
+  '**2Fe<x>_redirect error outpu','t to <x>'#000+
   '**2FE<x>_set exe/unit output path to <x>'#000+
   '*L2Fg<x>_same as -Fl'#000+
   '**2Fi<x>_adds <x> to include path'#000+
-  '**2Fl<x>_adds <','x> to library 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+
+  '**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 informati','on'#000+
+  '*g1g_generate debugger information'#000+
   '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
   '**1i_information'#000+
   '**1I<x>_adds <x> to include path'#000+
   '**1k<x>_Pass <x> to the linker'#000+
-  '**1l_write logo'#000+
+  '**1l_wr','ite 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_generat','e profile code for gprof'#000+
+  '**1pg_generate profile code for gprof'#000+
   '*L1P_use pipes instead of creating temporary assembler files'#000+
   '**1S_syntax options'#000+
-  '**2S2_switch some Delphi 2 extensions on'#000+
+  '**2S2_switch s','ome Delphi 2 extensions on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#000+
-  '**2Se_c','ompiler stops after the first error'#000+
+  '**2Se_compiler stops after the first error'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Si_support C++ stlyed INLINE'#000+
-  '**2Sm_support macros like C (global)'#000+
+  '**2Sm_support macros like',' C (global)'#000+
   '**2So_tries to be TP/BP 7.0 compatible'#000+
   '**2Sp_tries to be gpc compatible'#000+
-  '**2Ss_constructor name must be init ','(destructor must be done)'#000+
+  '**2Ss_constructor name must be init (destructor must be done)'#000+
   '**2St_allow static keyword in objects'#000+
-  '**2Sv_allow variable directives (cvar,external,public,export)'#000+
+  '**2Sv_allow variable directives (cvar,external,public,ex','port)'#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+
   '**2Up<x>_same as -Fu<x>'#000+
   '**2Us_compile a system unit'#000+
-  '**1v<x>_Be verbose. <x> is a combination of the following letters :'#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 : S','how used files'#000+
-  '**2*_n : Show notes                  t : Show tried files'#000+
-  '**2*_h : Show hints                  m : Show defined macros'#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 : Sh','ow defined macros'#000+
   '**2*_i : Show general info           p : Show compiled procedures'#000+
-  '**2*_l : Show linenumbers            c :',' Show conditionals'#000+
+  '**2*_l : Show linenumbers            c : Show conditionals'#000+
   '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
-  '**2*_b : Show all procedure'#000+
+  '**2*_b : Show all procedure',#000+
   '**2*_    declarations if an error'#000+
   '**2*_    occurs'#000+
   '**1X_executable options'#000+
   '*L2Xc_link with the c library'#000+
-  '**2XD_link with dyn','amic libraries (defines FPC_LINK_DYNAMIC)'#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+
+  '**2XS_link with static libraries (','defines FPC_LINK_STATIC)'#000+
   '**0*_Processor specific options:'#000+
   '3*1A<x>_output format'#000+
   '3*2Ao_coff file using GNU AS'#000+
-  '3*2Anasmcoff_co','ff file using Nasm'#000+
+  '3*2Anasmcoff_coff file using Nasm'#000+
   '3*2Anasmelf_elf32 (linux) file using Nasm'#000+
   '3*2Anasmobj_obj file using Nasm'#000+
-  '3*2Amasm_obj using Masm (Mircosoft)'#000+
+  '3*2Amasm_obj using Masm',' (Mircosoft)'#000+
   '3*2Atasm_obj using Tasm (Borland)'#000+
   '3*1R<x>_assembler reading style'#000+
   '3*2Ratt_read AT&T style assembler'#000+
-  '3*2Rintel_r','ead Intel 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*2Og_generate smaller code'#000+
+  '3*2Og_gene','rate smaller code'#000+
   '3*2OG_generate faster code (default)'#000+
   '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
-  '3*2Ou_enab','le uncertain optimizations (see docs)'#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_target processor'#000+
-  '3*3Op1_set target processor t','o 386/486'#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 (t','m)'#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 ex','tender'#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+
   '6*1A<x>_output format'#000+
-  '6*2Ao_Unix o-file using GNU AS'#000+
+  '6*2Ao_Unix o-file using GNU A','S'#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_t','urn 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*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*1','T<x>_Target operating system'#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+
-  '6*2TLINUX_Linux-68k'#000+
+  '6*2TLINUX_','Linux-68k'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+
   '**1h_shows this help without waiting'#000

+ 17 - 24
compiler/pmodules.pas

@@ -203,10 +203,10 @@ unit pmodules;
             { need to recompile the current unit ? }
               if loaded_unit^.crc<>pu^.checksum then
                begin
+                 Message2(unit_u_recompile_crc_change,current_module^.modulename^,pu^.name^);
                  current_module^.do_compile:=true;
                  dispose(current_module^.map);
                  current_module^.map:=nil;
-                 Comment(V_Warning,'recompiling, interface of '+pu^.name^+' (intfc) is changed');
                  exit;
                end;
             { setup the map entry for deref }
@@ -248,8 +248,8 @@ unit pmodules;
             { need to recompile the current unit ? }
               if loaded_unit^.crc<>pu^.checksum then
                begin
+                 Message2(unit_u_recompile_crc_change,current_module^.modulename^,pu^.name^);
                  current_module^.do_compile:=true;
-                 Comment(V_Warning,'recompiling, interface of '+pu^.name^+' (impl) is changed');
                  dispose(current_module^.map);
                  current_module^.map:=nil;
                  exit;
@@ -370,7 +370,7 @@ unit pmodules;
          old_current_module:=current_module;
          old_current_ppu:=current_ppu;
          { Info }
-         Message3(unit_t_load_unit,current_module^.modulename^,ImplIntf[current_module^.in_implementation],s);
+         Message3(unit_u_load_unit,current_module^.modulename^,ImplIntf[current_module^.in_implementation],s);
          { unit not found }
          st:=nil;
          { search all loaded units }
@@ -424,6 +424,7 @@ unit pmodules;
                current_module:=hp;
                current_module^.in_second_compile:=true;
                current_module^.do_compile:=true;
+               Message1(unit_u_second_compile,current_module^.modulename^);
              end
             else
           { generates a new unit info record }
@@ -667,6 +668,7 @@ unit pmodules;
          consume(_INTERFACE);
          { global switches are read, so further changes aren't allowed }
          current_module^.in_global:=false;
+         Message1(unit_u_start_parse_interface,current_module^.modulename^);
 
          { update status }
          status.currentmodule:=current_module^.modulename^;
@@ -760,6 +762,7 @@ unit pmodules;
          { Parse the implementation section }
          consume(_IMPLEMENTATION);
          current_module^.in_implementation:=true;
+         Message1(unit_u_start_parse_implementation,current_module^.modulename^);
 
          parse_only:=false;
 
@@ -781,7 +784,6 @@ unit pmodules;
          { Read the implementation units }
          parse_implementation_uses(unitst);
 
-         
          if current_module^.compiled then
            begin
               { this unit symtable is obsolete }
@@ -793,7 +795,7 @@ unit pmodules;
               dispose(st,done);
               exit;
            end;
-           
+
          { All units are read, now give them a number }
          numberunits;
 
@@ -881,21 +883,6 @@ unit pmodules;
           end;
 {$endif GDB}
 
-         { deletes all symtables generated in the implementation part
-           This could not ever happen, the static symtable is never
-           inserted in the symtablestack (PFV)
-          while symtablestack^.symtabletype<>globalsymtable do
-           if cs_local_browser in aktmoduleswitches then
-             symtablestack:=symtablestack^.next
-           else
-             dellexlevel; }
-
-         { remove static symtable here to save some mem ;) }
-{$ifndef UseBrowser}
-         dispose(st,done);
-{$endif UseBrowser}
-         current_module^.localsymtable:=nil;
-
          { tests, if all (interface) forwards are resolved }
          symtablestack^.check_forwards;
 
@@ -938,13 +925,16 @@ unit pmodules;
            end;
 {$endif GDB}
 
+         { remove static symtable (=refsymtable) here to save some mem }
+{$ifndef UseBrowser}
+         dispose(st,done);
+{$endif UseBrowser}
+         current_module^.localsymtable:=nil;
+
          { generate imports }
          if current_module^.uses_imports then
           importlib^.generatelib;
 
-{$ifndef UseBrowser}
-         dispose(refsymtable,done);
-{$endif UseBrowser}
          { finish asmlist by adding segment starts }
          insertsegment;
 
@@ -1086,7 +1076,10 @@ unit pmodules;
 end.
 {
   $Log$
-  Revision 1.62  1998-10-08 17:17:25  pierre
+  Revision 1.63  1998-10-08 23:29:01  peter
+    * -vu shows unit info, -vt shows tried/used files
+
+  Revision 1.62  1998/10/08 17:17:25  pierre
     * current_module old scanner tagged as invalid if unit is recompiled
     + added ppheap for better info on tracegetmem of heaptrc
       (adds line column and file index)

+ 5 - 2
compiler/scandir.inc

@@ -562,7 +562,7 @@ const
            current_scanner^.addfile(hp);
            if not current_scanner^.openinputfile then
             Message1(scan_f_cannot_open_includefile,hs);
-           Message1(scan_u_start_include_file,current_scanner^.inputfile^.path^+current_scanner^.inputfile^.name^);
+           Message1(scan_t_start_include_file,current_scanner^.inputfile^.path^+current_scanner^.inputfile^.name^);
            current_scanner^.reload;
          { register for refs }
            current_module^.sourcefiles^.register_file(hp);
@@ -944,7 +944,10 @@ const
 
 {
   $Log$
-  Revision 1.36  1998-10-08 17:17:29  pierre
+  Revision 1.37  1998-10-08 23:29:04  peter
+    * -vu shows unit info, -vt shows tried/used files
+
+  Revision 1.36  1998/10/08 17:17:29  pierre
     * current_module old scanner tagged as invalid if unit is recompiled
     + added ppheap for better info on tracegetmem of heaptrc
       (adds line column and file index)

+ 6 - 3
compiler/scanner.pas

@@ -138,7 +138,7 @@ implementation
     const
       { use any special name that is an invalid file name to avoid problems }
       macro_special_name = '__##&&Macro&&##__';
-      
+
     procedure create_tokenidx;
     { create an index with the first and last token for every possible token
       length, so a search only will be done in that small part }
@@ -382,7 +382,7 @@ implementation
                 nextfile;
                 tempopeninputfile;
               { status }
-                Message1(scan_d_back_in,name^);
+                Message1(scan_t_back_in,name^);
               end;
            { load next char }
              c:=inputpointer^;
@@ -1449,7 +1449,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.58  1998-10-08 17:17:30  pierre
+  Revision 1.59  1998-10-08 23:29:05  peter
+    * -vu shows unit info, -vt shows tried/used files
+
+  Revision 1.58  1998/10/08 17:17:30  pierre
     * current_module old scanner tagged as invalid if unit is recompiled
     + added ppheap for better info on tracegetmem of heaptrc
       (adds line column and file index)

+ 5 - 2
compiler/symppu.inc

@@ -385,7 +385,7 @@
               current_module^.sourcefiles^.register_file(hp);
 {$endif UseBrowser}
             end;
-           Message1(unit_t_ppu_source,hs+temp);
+           Message1(unit_u_ppu_source,hs+temp);
          end;
       { main source is always the last }
         stringdispose(current_module^.mainsource);
@@ -443,7 +443,10 @@
 
 {
   $Log$
-  Revision 1.18  1998-09-28 16:57:27  pierre
+  Revision 1.19  1998-10-08 23:29:07  peter
+    * -vu shows unit info, -vt shows tried/used files
+
+  Revision 1.18  1998/09/28 16:57:27  pierre
     * changed all length(p^.value_str^) into str_length(p)
       to get it work with and without ansistrings
     * changed sourcefiles field of tmodule to a pointer