Quellcode durchsuchen

* (hopefully) more consistent message when the compiler is stopped during showing the help screen, resolves #39455

florian vor 1 Jahr
Ursprung
Commit
51f5726343
5 geänderte Dateien mit 463 neuen und 455 gelöschten Zeilen
  1. 5 1
      compiler/compiler.pas
  2. 2 0
      compiler/msg/errore.msg
  3. 3 2
      compiler/msgidx.inc
  4. 450 452
      compiler/msgtxt.inc
  5. 3 0
      compiler/ncal.pas

+ 5 - 1
compiler/compiler.pas

@@ -269,6 +269,7 @@ var
   m : tppumodule;
 
 begin
+  m:=nil;
   try
     try
        ExceptionMask:=GetExceptionMask;
@@ -349,7 +350,10 @@ begin
           { in case of 50 errors, this could cause another exception,
             suppress this exception
           }
-          Message(general_f_compilation_aborted);
+          if assigned(m) then
+            Message(general_f_compilation_aborted)
+          else
+            Message(general_f_compiler_aborted);
         except
           on ECompilerAbort do
             ;

+ 2 - 0
compiler/msg/errore.msg

@@ -147,6 +147,8 @@ general_i_reduced_filesearch=01028_I_Reduced file search: Not searching for uppe
 % When the \var{-Ft} switch is used, this line informs you that the compiler
 % will not look for uppercased filenames or 8.3 conforming filenames.
 % \end{description}
+general_f_compiler_aborted=01029_F_Compiler stopped
+% Compilation was aborted.
 #
 # Scanner
 #

+ 3 - 2
compiler/msgidx.inc

@@ -28,6 +28,7 @@ const
   general_e_exception_raised=01026;
   general_t_unitscope=01027;
   general_i_reduced_filesearch=01028;
+  general_f_compiler_aborted=01029;
   scan_f_end_of_file=02000;
   scan_f_string_exceeds_line=02001;
   scan_f_illegal_char=02002;
@@ -1178,9 +1179,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 92776;
+  MsgTxtSize = 92801;
 
   MsgIdxMax : array[1..20] of longint=(
-    29,114,372,134,102,63,148,38,224,71,
+    30,114,372,134,102,63,148,38,224,71,
     69,20,30,1,1,1,1,1,1,1
   );

Datei-Diff unterdrückt, da er zu groß ist
+ 450 - 452
compiler/msgtxt.inc


+ 3 - 0
compiler/ncal.pas

@@ -3897,6 +3897,7 @@ implementation
         converted_result_data : ttempcreatenode;
         calltype: tdispcalltype;
         invokesym : tsym;
+        myparasym: tparavarsym;
       begin
          result:=nil;
          candidates:=nil;
@@ -4171,6 +4172,7 @@ implementation
                   addsymref(tprocdef(tprocdef(procdefinition).genericdef).procsym);
               end;
 
+            printnode(self);
             { add needed default parameters }
             if (paralength<procdefinition.maxparacount) then
              begin
@@ -4186,6 +4188,7 @@ implementation
                 end;
                while (paraidx<procdefinition.paras.count) and (vo_is_hidden_para in tparavarsym(procdefinition.paras[paraidx]).varoptions) do
                  inc(paraidx);
+               myparasym:=tparavarsym(procdefinition.paras[paraidx]);
                while (paraidx<procdefinition.paras.count) do
                 begin
                   if not assigned(tparavarsym(procdefinition.paras[paraidx]).defaultconstsym) then

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.