From b8f2d8948c2fe0abd7644664b117760d63888e99 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Wed, 4 Jul 2018 01:18:13 +1200
Subject: Rewrite Perl version-number bump Vim funcs

---
 vim/autoload/perl.vim | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/vim/autoload/perl.vim b/vim/autoload/perl.vim
index ca9b2990..5349eb49 100644
--- a/vim/autoload/perl.vim
+++ b/vim/autoload/perl.vim
@@ -1,20 +1,32 @@
-" Quick-and-dirty version number bumper
+" Version number specifier format
+let g:perl#verpat = '\m\C^'
+      \ . '\(our\s\+\$VERSION\s*=\D*\)'
+      \ . '\(\d\+\)\.\(\d\+\)'
+      \ . '\(.*\)'
+
+" Version number bumper
 function! perl#BumpVersion(major) abort
   let l:view = winsaveview()
-  let l:search = @/
-  let l:li = search('\C^our \$VERSION\s*=')
+  let l:li = search(g:perl#verpat)
   if !l:li
     echomsg 'No version number declaration found'
     return
   endif
+  let l:matches = matchlist(getline(l:li), g:perl#verpat)
+  let [l:lvalue, l:major, l:minor, l:rest]
+        \ = matchlist(getline(l:li), g:perl#verpat)[1:4]
+  if a:major
+    let l:major = perl#Incf(l:major)
+  else
+    let l:minor = perl#Incf(l:minor)
+  endif
+  let l:version = l:major.'.'.l:minor
+  call setline(l:li, l:lvalue.l:version.l:rest)
   if a:major
-    silent execute "normal! /[0-9]\<CR>\<C-A>"
-    echomsg 'Major version bumped: '.getline('.')
+    echomsg 'Bumped major $VERSION: '.l:version
   else
-    silent execute "normal! $?[0-9]\<CR>\<C-A>"
-    echomsg 'Minor version bumped: '.getline('.')
+    echomsg 'Bumped minor $VERSION: '.l:version
   endif
-  let @/ = l:search
   call winrestview(l:view)
 endfunction
 
@@ -22,7 +34,12 @@ endfunction
 function! perl#BumpVersionMinor() abort
   call perl#BumpVersion(0)
 endfunction
-
 function! perl#BumpVersionMajor() abort
   call perl#BumpVersion(1)
 endfunction
+
+" Helper function to format a number without decreasing its digit count
+function! perl#Incf(num) abort
+  let l:inc = a:num + 1
+  return repeat('0', strlen(a:num) - strlen(l:inc)).l:inc
+endfunction
-- 
cgit v1.2.3