Browse Source

+ added a warning if HeapMax<HeapMin is specified with the $M directive

git-svn-id: trunk@28042 -
nickysn 11 years ago
parent
commit
db011dfb7a
4 changed files with 533 additions and 530 deletions
  1. 4 1
      compiler/msg/errore.msg
  2. 3 2
      compiler/msgidx.inc
  3. 523 526
      compiler/msgtxt.inc
  4. 3 1
      compiler/scandir.pas

+ 4 - 1
compiler/msg/errore.msg

@@ -136,7 +136,7 @@ general_f_oserror=01025_F_Operating system error: $1
 #
 # Scanner
 #
-# 02096 is the last used one
+# 02097 is the last used one
 #
 % \section{Scanner messages.}
 % This section lists the messages that the scanner emits. The scanner takes
@@ -401,6 +401,9 @@ scan_w_invalid_stacksize=02096_W_The specified stack size is not within the vali
 % platforms and 1024 - 65520 on 16-bit platforms. Additionally, for Turbo Pascal 7
 % compatibility reasons, specifying a stack size of 65521 on 16-bit platforms
 % actually sets the stack size to 65520.
+scan_w_heapmax_lessthan_heapmin=02097_W_The specified HeapMax value is smaller than the HeapMin value. Setting HeapMax ignored.
+% The HeapMax value (if specified) must be greater than or equal to the HeapMin
+% value. Otherwise, the HeapMax value is ignored.
 % \end{description}
 #
 # Parser

+ 3 - 2
compiler/msgidx.inc

@@ -118,6 +118,7 @@ const
   scan_e_illegal_peoptflag=02094;
   scan_e_unsupported_switch=02095;
   scan_w_invalid_stacksize=02096;
+  scan_w_heapmax_lessthan_heapmin=02097;
   parser_e_syntax_error=03000;
   parser_e_dont_nest_interrupt=03004;
   parser_w_proc_directive_ignored=03005;
@@ -989,9 +990,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 71526;
+  MsgTxtSize = 71622;
 
   MsgIdxMax : array[1..20] of longint=(
-    26,97,338,122,89,57,126,27,202,64,
+    26,98,338,122,89,57,126,27,202,64,
     57,20,1,1,1,1,1,1,1,1
   );

File diff suppressed because it is too large
+ 523 - 526
compiler/msgtxt.inc


+ 3 - 1
compiler/scandir.pas

@@ -730,7 +730,9 @@ unit scandir;
                 current_scanner.skipspace;
                 l:=current_scanner.readval;
                 if l>=heapsize then
-                  maxheapsize:=l;
+                  maxheapsize:=l
+                else
+                  Message(scan_w_heapmax_lessthan_heapmin);
               end;
           end;
       end;

Some files were not shown because too many files changed in this diff