patch 8.2.2388: no easy way to get the maximum or mininum number value

Problem:    No easy way to get the maximum or mininum number value.
Solution:   Add v:numbermax and v:numbermin.

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 217e69dc0825172f2e59e825cd467f277bd11b7c..dd5bc939d3338e8554f02ed648dbe53059aa5839 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*     For Vim version 8.2.  Last change: 2021 Jan 17
+*eval.txt*     For Vim version 8.2.  Last change: 2021 Jan 21
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -2082,6 +2082,12 @@ v:null           An empty String. Used to put "null" in JSON.  See
                That is so that eval() can parse the string back to the same
                value.  Read-only.
 
+                                       *v:numbermax* *numbermax-variable*
+v:numbermax    Maximum value of a number.
+
+                                       *v:numbermix* *numbermix-variable*
+v:numbermin    Minimum value of a number (negative)
+
                                        *v:numbersize* *numbersize-variable*
 v:numbersize   Number of bits in a Number.  This is normally 64, but on some
                systems it may be 32.

diff --git a/src/evalvars.c b/src/evalvars.c
index 179953178695494b8ca6bb3d3c38043bd4570dfd..dfc8e63f5a7aac27802b933c48468d28a9e2fbdc 100644 (file)
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -122,6 +122,8 @@ static struct vimvar
     {VV_NAME("true",            VAR_BOOL), VV_RO},
     {VV_NAME("none",            VAR_SPECIAL), VV_RO},
     {VV_NAME("null",            VAR_SPECIAL), VV_RO},
+    {VV_NAME("numbermax",       VAR_NUMBER), VV_RO},
+    {VV_NAME("numbermin",       VAR_NUMBER), VV_RO},
     {VV_NAME("numbersize",      VAR_NUMBER), VV_RO},
     {VV_NAME("vim_did_enter",   VAR_NUMBER), VV_RO},
     {VV_NAME("testing",                 VAR_NUMBER), 0},
@@ -228,6 +230,8 @@ evalvars_init(void)
     set_vim_var_nr(VV_TRUE, VVAL_TRUE);
     set_vim_var_nr(VV_NONE, VVAL_NONE);
     set_vim_var_nr(VV_NULL, VVAL_NULL);
+    set_vim_var_nr(VV_NUMBERMAX, VARNUM_MAX);
+    set_vim_var_nr(VV_NUMBERMIN, VARNUM_MIN);
     set_vim_var_nr(VV_NUMBERSIZE, sizeof(varnumber_T) * 8);
 
     set_vim_var_nr(VV_TYPE_NUMBER,  VAR_TYPE_NUMBER);

diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim
index e5f521c85c7c2d6b349e5dc8e6d86da71a7f3721..52e8df92422aa2bb5c1d46b14f8ba78ef77dbb84 100644 (file)
--- a/src/testdir/test_eval_stuff.vim
+++ b/src/testdir/test_eval_stuff.vim
@@ -256,10 +256,13 @@ func Test_execute_cmd_with_null()
   endif
 endfunc
 
-func Test_numbersize()
-  " This will fail on systems without 64 bit int support or when not configured
-  " correctly.
+func Test_number_max_min_size()
+  " This will fail on systems without 64 bit number support or when not
+  " configured correctly.
   call assert_equal(64, v:numbersize)
+
+  call assert_true(v:numbermin < -9999999)
+  call assert_true(v:numbermax > 9999999)
 endfunc
 
 func Assert_reg(name, type, value, valuestr, expr, exprstr)

diff --git a/src/version.c b/src/version.c
index c911ed4608735da7e1e6b3529bf6d8bc56a9a367..6d99990cd3879c33e40f87d8170f0bda2ef0ea89 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2388,
 /**/
     2387,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 7ba728a3702ece302a8a9f10b97b7e7b46176701..de2482e8b8bcc7d05d82a103a9cc24e975803675 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1975,32 +1975,34 @@ typedef int sock_T;
 #define VV_TRUE                69
 #define VV_NONE                70
 #define VV_NULL                71
-#define VV_NUMBERSIZE  72
-#define VV_VIM_DID_ENTER 73
-#define VV_TESTING     74
-#define VV_TYPE_NUMBER 75
-#define VV_TYPE_STRING 76
-#define VV_TYPE_FUNC   77
-#define VV_TYPE_LIST   78
-#define VV_TYPE_DICT   79
-#define VV_TYPE_FLOAT  80
-#define VV_TYPE_BOOL   81
-#define VV_TYPE_NONE   82
-#define VV_TYPE_JOB    83
-#define VV_TYPE_CHANNEL        84
-#define VV_TYPE_BLOB   85
-#define VV_TERMRFGRESP 86
-#define VV_TERMRBGRESP 87
-#define VV_TERMU7RESP  88
-#define VV_TERMSTYLERESP 89
-#define VV_TERMBLINKRESP 90
-#define VV_EVENT       91
-#define VV_VERSIONLONG 92
-#define VV_ECHOSPACE   93
-#define VV_ARGV                94
-#define VV_COLLATE      95
-#define VV_EXITING     96
-#define VV_LEN         97      // number of v: vars
+#define VV_NUMBERMAX   72
+#define VV_NUMBERMIN   73
+#define VV_NUMBERSIZE  74
+#define VV_VIM_DID_ENTER 75
+#define VV_TESTING     76
+#define VV_TYPE_NUMBER 77
+#define VV_TYPE_STRING 78
+#define VV_TYPE_FUNC   79
+#define VV_TYPE_LIST   80
+#define VV_TYPE_DICT   81
+#define VV_TYPE_FLOAT  82
+#define VV_TYPE_BOOL   83
+#define VV_TYPE_NONE   84
+#define VV_TYPE_JOB    85
+#define VV_TYPE_CHANNEL        86
+#define VV_TYPE_BLOB   87
+#define VV_TERMRFGRESP 88
+#define VV_TERMRBGRESP 89
+#define VV_TERMU7RESP  90
+#define VV_TERMSTYLERESP 91
+#define VV_TERMBLINKRESP 92
+#define VV_EVENT       93
+#define VV_VERSIONLONG 94
+#define VV_ECHOSPACE   95
+#define VV_ARGV                96
+#define VV_COLLATE      97
+#define VV_EXITING     98
+#define VV_LEN         99      // number of v: vars
 
 // used for v_number in VAR_BOOL and VAR_SPECIAL
 #define VVAL_FALSE     0L      // VAR_BOOL