vim-patch:8.2.0886: cannot use octal numbers in scriptversion 4

Problem:    Cannot use octal numbers in scriptversion 4.
Solution:   Add the "0o" notation. (Ken Takata, closes vim/vim#5304)
https://github.com/vim/vim/commit/c17e66c5c0acd5038f1eb3d7b3049b64bb6ea30b

:scriptversion is N/A.

Cherry-pick latest str2nr() doc changes from v8.1.2035.
Cherry-pick various mentions of the 0o prefix from:
 - v8.2.2324
 - https://github.com/vim/vim/commit/2346a6378483c9871016f9fc821ec5cbea638f13
 - https://github.com/vim/vim/commit/11e3c5ba820325b69cb56f70e13c21d7b8808d33
 - https://github.com/vim/vim/commit/82be4849eed0b8fbee45bc8da99b685ec89af59a

Patch used ascii_isbdigit() by mistake, which was fixed in v8.2.2309.

Make STR2NR_OOCT work the same as STR2NR_OCT when forcing.
In Vim, STR2NR_FORCE | STR2NR_OOCT isn't handled, and doesn't actually
force anything. Rather than abort(), make it work as STR2NR_OCT.

This means STR2NR_FORCE | STR2NR_OCT works the same as
STR2NR_FORCE | STR2NR_OOCT and STR2NR_FORCE | STR2NR_OCT | STR2NR_OOCT.

1 files changed, 102 insertions, 1 deletions

diff --git a/test/unit/charset/vim_str2nr_spec.lua b/test/unit/charset/vim_str2nr_spec.lua
index ebcceca7ae..5fc3b83a13 100644
--- a/test/unit/charset/vim_str2nr_spec.lua
+++ b/test/unit/charset/vim_str2nr_spec.lua
@@ -86,10 +86,13 @@ describe('vim_str2nr()', function()
     test_vim_str2nr('', lib.STR2NR_ALL, {len = 0, num = 0, unum = 0, pre = 0}, 0)
     test_vim_str2nr('', lib.STR2NR_BIN, {len = 0, num = 0, unum = 0, pre = 0}, 0)
     test_vim_str2nr('', lib.STR2NR_OCT, {len = 0, num = 0, unum = 0, pre = 0}, 0)
+    test_vim_str2nr('', lib.STR2NR_OOCT, {len = 0, num = 0, unum = 0, pre = 0}, 0)
     test_vim_str2nr('', lib.STR2NR_HEX, {len = 0, num = 0, unum = 0, pre = 0}, 0)
     test_vim_str2nr('', lib.STR2NR_FORCE + lib.STR2NR_DEC, {len = 0, num = 0, unum = 0, pre = 0}, 0)
     test_vim_str2nr('', lib.STR2NR_FORCE + lib.STR2NR_BIN, {len = 0, num = 0, unum = 0, pre = 0}, 0)
     test_vim_str2nr('', lib.STR2NR_FORCE + lib.STR2NR_OCT, {len = 0, num = 0, unum = 0, pre = 0}, 0)
+    test_vim_str2nr('', lib.STR2NR_FORCE + lib.STR2NR_OOCT, {len = 0, num = 0, unum = 0, pre = 0}, 0)
+    test_vim_str2nr('', lib.STR2NR_FORCE + lib.STR2NR_OCT + lib.STR2NR_OOCT, {len = 0, num = 0, unum = 0, pre = 0}, 0)
     test_vim_str2nr('', lib.STR2NR_FORCE + lib.STR2NR_HEX, {len = 0, num = 0, unum = 0, pre = 0}, 0)
   end)
   itp('works with decimal numbers', function()
@@ -98,9 +101,11 @@ describe('vim_str2nr()', function()
       lib.STR2NR_BIN,
       lib.STR2NR_OCT,
       lib.STR2NR_HEX,
+      lib.STR2NR_OOCT,
       lib.STR2NR_BIN + lib.STR2NR_OCT,
       lib.STR2NR_BIN + lib.STR2NR_HEX,
       lib.STR2NR_OCT + lib.STR2NR_HEX,
+      lib.STR2NR_OOCT + lib.STR2NR_HEX,
       lib.STR2NR_ALL,
       lib.STR2NR_FORCE + lib.STR2NR_DEC,
     }) do
@@ -212,13 +217,16 @@ describe('vim_str2nr()', function()
       end
     end
   end)
-  itp('works with octal numbers', function()
+  itp('works with octal numbers (0 prefix)', function()
     for _, flags in ipairs({
       lib.STR2NR_OCT,
       lib.STR2NR_OCT + lib.STR2NR_BIN,
       lib.STR2NR_OCT + lib.STR2NR_HEX,
+      lib.STR2NR_OCT + lib.STR2NR_OOCT,
       lib.STR2NR_ALL,
       lib.STR2NR_FORCE + lib.STR2NR_OCT,
+      lib.STR2NR_FORCE + lib.STR2NR_OOCT,
+      lib.STR2NR_FORCE + lib.STR2NR_OCT + lib.STR2NR_OOCT,
     }) do
       local oct
       if flags > lib.STR2NR_FORCE then
@@ -267,6 +275,99 @@ describe('vim_str2nr()', function()
       end
     end
   end)
+  itp('works with octal numbers (0o or 0O prefix)', function()
+    for _, flags in ipairs({
+      lib.STR2NR_OOCT,
+      lib.STR2NR_OOCT + lib.STR2NR_BIN,
+      lib.STR2NR_OOCT + lib.STR2NR_HEX,
+      lib.STR2NR_OCT + lib.STR2NR_OOCT,
+      lib.STR2NR_OCT + lib.STR2NR_OOCT + lib.STR2NR_BIN,
+      lib.STR2NR_OCT + lib.STR2NR_OOCT + lib.STR2NR_HEX,
+      lib.STR2NR_ALL,
+      lib.STR2NR_FORCE + lib.STR2NR_OCT,
+      lib.STR2NR_FORCE + lib.STR2NR_OOCT,
+      lib.STR2NR_FORCE + lib.STR2NR_OCT + lib.STR2NR_OOCT,
+    }) do
+      local oct
+      local OCT
+      if flags > lib.STR2NR_FORCE then
+        oct = 0
+        OCT = 0
+      else
+        oct = ('o'):byte()
+        OCT = ('O'):byte()
+      end
+
+      test_vim_str2nr( '0o054',  flags, {len = 5, num =  44, unum = 44, pre = oct}, 0)
+      test_vim_str2nr( '0o054',  flags, {len = 1, num =   0, unum =  0, pre = 0  }, 1)
+      test_vim_str2nr( '0o054',  flags, {len = 0}, 2)
+      test_vim_str2nr( '0o054',  flags, {len = 3, num =   0, unum =  0, pre = oct}, 3)
+      test_vim_str2nr( '0o054',  flags, {len = 4, num =   5, unum =  5, pre = oct}, 4)
+      test_vim_str2nr( '0o054',  flags, {len = 5, num =  44, unum = 44, pre = oct}, 5)
+      test_vim_str2nr( '0o0548', flags, {len = 5, num =  44, unum = 44, pre = oct}, 5)
+      test_vim_str2nr( '0o054',  flags, {len = 5, num =  44, unum = 44, pre = oct}, 6)
+
+      test_vim_str2nr( '0o054x', flags, {len = 0}, 6)
+      test_vim_str2nr( '0o054x', flags, {len = 0}, 0)
+      test_vim_str2nr( '0o054x', flags, {len = 5, num =  44, unum = 44, pre = oct}, 6, false)
+      test_vim_str2nr( '0o054x', flags, {len = 5, num =  44, unum = 44, pre = oct}, 0, false)
+
+      test_vim_str2nr('-0o054',  flags, {len = 6, num = -44, unum = 44, pre = oct}, 0)
+      test_vim_str2nr('-0o054',  flags, {len = 1, num =   0, unum =  0, pre = 0  }, 1)
+      test_vim_str2nr('-0o054',  flags, {len = 2, num =   0, unum =  0, pre = 0  }, 2)
+      test_vim_str2nr('-0o054',  flags, {len = 0}, 3)
+      test_vim_str2nr('-0o054',  flags, {len = 4, num =   0, unum =  0, pre = oct}, 4)
+      test_vim_str2nr('-0o054',  flags, {len = 5, num =  -5, unum =  5, pre = oct}, 5)
+      test_vim_str2nr('-0o054',  flags, {len = 6, num = -44, unum = 44, pre = oct}, 6)
+      test_vim_str2nr('-0o0548', flags, {len = 6, num = -44, unum = 44, pre = oct}, 6)
+      test_vim_str2nr('-0o054',  flags, {len = 6, num = -44, unum = 44, pre = oct}, 7)
+
+      test_vim_str2nr('-0o054x', flags, {len = 0}, 7)
+      test_vim_str2nr('-0o054x', flags, {len = 0}, 0)
+      test_vim_str2nr('-0o054x', flags, {len = 6, num = -44, unum = 44, pre = oct}, 7, false)
+      test_vim_str2nr('-0o054x', flags, {len = 6, num = -44, unum = 44, pre = oct}, 0, false)
+
+      test_vim_str2nr( '0O054',  flags, {len = 5, num =  44, unum = 44, pre = OCT}, 0)
+      test_vim_str2nr( '0O054',  flags, {len = 1, num =   0, unum =  0, pre = 0  }, 1)
+      test_vim_str2nr( '0O054',  flags, {len = 0}, 2)
+      test_vim_str2nr( '0O054',  flags, {len = 3, num =   0, unum =  0, pre = OCT}, 3)
+      test_vim_str2nr( '0O054',  flags, {len = 4, num =   5, unum =  5, pre = OCT}, 4)
+      test_vim_str2nr( '0O054',  flags, {len = 5, num =  44, unum = 44, pre = OCT}, 5)
+      test_vim_str2nr( '0O0548', flags, {len = 5, num =  44, unum = 44, pre = OCT}, 5)
+      test_vim_str2nr( '0O054',  flags, {len = 5, num =  44, unum = 44, pre = OCT}, 6)
+
+      test_vim_str2nr( '0O054x', flags, {len = 0}, 6)
+      test_vim_str2nr( '0O054x', flags, {len = 0}, 0)
+      test_vim_str2nr( '0O054x', flags, {len = 5, num =  44, unum = 44, pre = OCT}, 6, false)
+      test_vim_str2nr( '0O054x', flags, {len = 5, num =  44, unum = 44, pre = OCT}, 0, false)
+
+      test_vim_str2nr('-0O054',  flags, {len = 6, num = -44, unum = 44, pre = OCT}, 0)
+      test_vim_str2nr('-0O054',  flags, {len = 1, num =   0, unum =  0, pre = 0  }, 1)
+      test_vim_str2nr('-0O054',  flags, {len = 2, num =   0, unum =  0, pre = 0  }, 2)
+      test_vim_str2nr('-0O054',  flags, {len = 0}, 3)
+      test_vim_str2nr('-0O054',  flags, {len = 4, num =   0, unum =  0, pre = OCT}, 4)
+      test_vim_str2nr('-0O054',  flags, {len = 5, num =  -5, unum =  5, pre = OCT}, 5)
+      test_vim_str2nr('-0O054',  flags, {len = 6, num = -44, unum = 44, pre = OCT}, 6)
+      test_vim_str2nr('-0O0548', flags, {len = 6, num = -44, unum = 44, pre = OCT}, 6)
+      test_vim_str2nr('-0O054',  flags, {len = 6, num = -44, unum = 44, pre = OCT}, 7)
+
+      test_vim_str2nr('-0O054x', flags, {len = 0}, 7)
+      test_vim_str2nr('-0O054x', flags, {len = 0}, 0)
+      test_vim_str2nr('-0O054x', flags, {len = 6, num = -44, unum = 44, pre = OCT}, 7, false)
+      test_vim_str2nr('-0O054x', flags, {len = 6, num = -44, unum = 44, pre = OCT}, 0, false)
+
+      if flags > lib.STR2NR_FORCE then
+        test_vim_str2nr('-0548', flags, {len = 0}, 5)
+        test_vim_str2nr('-0548', flags, {len = 0}, 0)
+        test_vim_str2nr('-0548', flags, {len = 4, num = -44, unum = 44, pre = 0}, 5, false)
+        test_vim_str2nr('-0548', flags, {len = 4, num = -44, unum = 44, pre = 0}, 0, false)
+        test_vim_str2nr('-055', flags, {len = 4, num = -45, unum = 45, pre = 0}, 0)
+      else
+        test_vim_str2nr('-0548', flags, {len = 5, num = -548, unum = 548, pre = 0}, 5)
+        test_vim_str2nr('-0548', flags, {len = 5, num = -548, unum = 548, pre = 0}, 0)
+      end
+    end
+  end)
   itp('works with hexadecimal numbers', function()
     for _, flags in ipairs({
       lib.STR2NR_HEX,