From b16c40d4016add28873e84c6a8fcc828ca68b76b Mon Sep 17 00:00:00 2001
From: zegervdv <zegervdv@me.com>
Date: Sun, 27 Dec 2020 09:25:14 +0100
Subject: [PATCH 1/4] Support verilog hex syntax with arbitrary precision

---
 plugin/nextval.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/nextval.vim b/plugin/nextval.vim
index 5e42e25..f6c8711 100644
--- a/plugin/nextval.vim
+++ b/plugin/nextval.vim
@@ -117,7 +117,7 @@ nnoremap <SID>nextvalInc :call <SID>nextval('+')<CR>
 nnoremap <unique> <script> <Plug>nextvalDec <SID>nextvalDec
 nnoremap <SID>nextvalDec :call <SID>nextval('-')<CR>
 
-let s:re_hex = "\\(8'h\\|#16r\\|16#\\|16r\\|" " more pre-chars
+let s:re_hex = "\\(\\d\*'h\\|#16r\\|16#\\|16r\\|" " more pre-chars
 let s:re_hex = s:re_hex . 'x"\|#x\|0[xh]\|\\[xuU]\|[XH]' . "'\\|" " 2 pre-chars
 let s:re_hex = s:re_hex . '[#\$hH]\|' " 1 pre-char
 let s:re_hex = s:re_hex . '\|\)' " no pre-chars

From 84815afc013bfa122d7bcf0ea2b56f7604ad52cb Mon Sep 17 00:00:00 2001
From: zegervdv <zegervdv@me.com>
Date: Sun, 27 Dec 2020 09:28:42 +0100
Subject: [PATCH 2/4] Add support for decimal verilog values

---
 plugin/nextval.vim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin/nextval.vim b/plugin/nextval.vim
index f6c8711..035e78b 100644
--- a/plugin/nextval.vim
+++ b/plugin/nextval.vim
@@ -128,6 +128,8 @@ let s:re_num = '\([''"]\?\)\(-\?[0-9]*\.[0-9]\+\)\([^0-9]\+\)\?'
 
 let s:re_bool = '\([''"]\)\?\(true\|false\|yes\|no\|on\|off\c\)\([''"]\)\?'
 
+let s:re_int = "\\(\\d\*'d\\|[^0-9]\*\\)\\([0-9]\\+\\)\\([^0-9]\*\\)"
+
 function s:nextval_exec(word, operator)
 	let word=a:word
 
@@ -150,9 +152,9 @@ function s:nextval_exec(word, operator)
 		let word_prefix = word_parts[1]
 		let word = word_parts[2]
 		let word_suffix = word_parts[3]
-	elseif matchstr(word,'\([^0-9]*\)\([0-9]\+\)\([^0-9]*\)') == word " increment/decrement integer surrounded by text (i.e. abc12)
+	elseif matchstr(word, s:re_int) == word " increment/decrement integer surrounded by text (i.e. abc12)
 		let b:nextval_type = 'int'
-		let word_parts = matchlist(word,'\([^0-9]*\)\([0-9]\+\)\([^0-9]*\)')
+		let word_parts = matchlist(word,s:re_int)
 		let word_prefix = word_parts[1]
 		let word = word_parts[2]
 		let word_suffix = word_parts[3]

From a0186b3c5cc8403478127624d2f4cd8bed74f78b Mon Sep 17 00:00:00 2001
From: zegervdv <zegervdv@me.com>
Date: Sun, 27 Dec 2020 09:29:31 +0100
Subject: [PATCH 3/4] Add count to increment/decrement

---
 plugin/nextval.vim     | 34 +++++++++++++++++-----------------
 tests/nextval_test.vim | 16 ++++++++--------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/plugin/nextval.vim b/plugin/nextval.vim
index 035e78b..749a13d 100644
--- a/plugin/nextval.vim
+++ b/plugin/nextval.vim
@@ -112,10 +112,10 @@ if !hasmapto('<Plug>nextvalDec')
 	nmap <silent> <unique> <C-x> <Plug>nextvalDec
 endif
 " map <Plug> to internal function
-nnoremap <unique> <script> <Plug>nextvalInc <SID>nextvalInc
-nnoremap <SID>nextvalInc :call <SID>nextval('+')<CR>
-nnoremap <unique> <script> <Plug>nextvalDec <SID>nextvalDec
-nnoremap <SID>nextvalDec :call <SID>nextval('-')<CR>
+nnoremap <silent> <unique> <script> <Plug>nextvalInc <SID>nextvalInc
+nnoremap <SID>nextvalInc :<C-U>call <SID>nextval('+', v:count1)<CR>
+nnoremap <silent> <unique> <script> <Plug>nextvalDec <SID>nextvalDec
+nnoremap <SID>nextvalDec :<C-U>call <SID>nextval('-', v:count1)<CR>
 
 let s:re_hex = "\\(\\d\*'h\\|#16r\\|16#\\|16r\\|" " more pre-chars
 let s:re_hex = s:re_hex . 'x"\|#x\|0[xh]\|\\[xuU]\|[XH]' . "'\\|" " 2 pre-chars
@@ -130,7 +130,7 @@ let s:re_bool = '\([''"]\)\?\(true\|false\|yes\|no\|on\|off\c\)\([''"]\)\?'
 
 let s:re_int = "\\(\\d\*'d\\|[^0-9]\*\\)\\([0-9]\\+\\)\\([^0-9]\*\\)"
 
-function s:nextval_exec(word, operator)
+function s:nextval_exec(word, operator, count)
 	let word=a:word
 
 	" determine type of word (int/hex)
@@ -166,11 +166,11 @@ function s:nextval_exec(word, operator)
 
 	let newword=''
 	if b:nextval_type == 'int'
-		let newword = <SID>nextint(word,a:operator)
+		let newword = <SID>nextint(word,a:operator, a:count)
 	elseif b:nextval_type == 'num'
-		let newword = <SID>nextnum(word,a:operator)
+		let newword = <SID>nextnum(word,a:operator, a:count)
 	elseif b:nextval_type == 'hex'
-		let newword = <SID>nexthex(word,a:operator)
+		let newword = <SID>nexthex(word,a:operator, a:count)
 	elseif b:nextval_type == 'bool'
 		let newword = <SID>nextbool(word)
 	endif
@@ -190,7 +190,7 @@ function s:nextval_reset()
 endfunction
 
 " main
-function s:nextval(operator)
+function s:nextval(operator, count)
 	if !exists('b:nextval_column')
 		call s:nextval_reset()
 	endif
@@ -222,7 +222,7 @@ function s:nextval(operator)
 		let b:nextval_type = ''
 	endif
 
-	let newword=s:nextval_exec(word, a:operator)
+	let newword=s:nextval_exec(word, a:operator, a:count)
 
 	if exists('newword') && len(newword)>0
 		setlocal paste
@@ -269,18 +269,18 @@ function s:nextbool(value)
 	endfor
 endfunction
 
-function s:nextint(value,operator)
-	return a:operator == '+' ? str2nr(a:value)+1 : str2nr(a:value)-1
+function s:nextint(value,operator,count)
+  return a:operator == '+' ? str2nr(a:value)+a:count : str2nr(a:value)-a:count
 endfunction
 
 " change numeric value (n; ,n; n,n)
-function s:nextnum(value,operator)
+function s:nextnum(value,operator,count)
 	let dotpos = match(a:value,'\.')
 	let fractdigits = len(a:value)-dotpos-1
 	if a:operator == '+'
-		let result = str2float(a:value)+(1/pow(10,fractdigits))
+		let result = str2float(a:value)+(a:count/pow(10,fractdigits))
 	else
-		let result = str2float(a:value)-(1/pow(10,fractdigits))
+		let result = str2float(a:value)-(a:count/pow(10,fractdigits))
 	endif
 	let newnum = printf('%.' . fractdigits . 'f',result)
 	if dotpos == 0 && result < 1 && result > 0
@@ -290,13 +290,13 @@ function s:nextnum(value,operator)
 endfunction
 
 " change hex value (#X; 0xX; X)
-function s:nexthex(value,operator)
+function s:nexthex(value,operator,count)
 	let m = matchlist(a:value,s:re_hex)
 	let prefix = m[1]
 	let value = m[2]
 	let suffix = m[3]
 	let len = len(value)
-	let newval = a:operator == '+' ? str2nr(value,16)+1 : str2nr(value,16)-1
+	let newval = a:operator == '+' ? str2nr(value,16)+a:count : str2nr(value,16)-a:count
 	if strpart(value,0,1) != '0' " || ... todo ?! when will a use have fixed digits?! ... fmod(len,2)
 		let len = 1
 	endif
diff --git a/tests/nextval_test.vim b/tests/nextval_test.vim
index 2c4952b..885e9ff 100644
--- a/tests/nextval_test.vim
+++ b/tests/nextval_test.vim
@@ -54,8 +54,8 @@ function Test_nextval_num()
 \		['0.0', '-0.1', '0.1']
 \	]
 	for val in values
-		let r_inc=s:nextnum(val[0], '+')
-		let r_dec=s:nextnum(val[0], '-')
+		let r_inc=s:nextnum(val[0], '+', 1)
+		let r_dec=s:nextnum(val[0], '-', 1)
 		call Vest_assert_equal(r_dec, val[1], "decrementing ".val[0]." returned {%result}; {%assert} expexted")
 		call Vest_assert_equal(r_inc, val[2], "incrementing ".val[0]." returned {%result}; {%assert} expexted")
 	endfor
@@ -69,8 +69,8 @@ function Test_nextval_int()
 \		['0', '-1', '1']
 \	]
 	for val in values
-		let r_inc=s:nextint(val[0], '+')
-		let r_dec=s:nextint(val[0], '-')
+		let r_inc=s:nextint(val[0], '+', 1)
+		let r_dec=s:nextint(val[0], '-', 1)
 		call Vest_assert_equal(r_dec, val[1], "decrementing ".val[0]." returned {%result}; {%assert} expected")
 		call Vest_assert_equal(r_inc, val[2], "incrementing ".val[0]." returned {%result}; {%assert} expected")
 	endfor
@@ -104,8 +104,8 @@ function Test_nextval_hex()
 \		["X'5A3'", "X'5A2'", "X'5A4'"]
 \	]
 	for val in values
-		let r_inc=s:nexthex(val[0], '+')
-		let r_dec=s:nexthex(val[0], '-')
+		let r_inc=s:nexthex(val[0], '+', 1)
+		let r_dec=s:nexthex(val[0], '-', 1)
 		call Vest_assert_equal(r_dec, val[1], "decrementing ".val[0]." returned {%result}; {%assert} expected")
 		call Vest_assert_equal(r_inc, val[2], "incrementing ".val[0]." returned {%result}; {%assert} expected")
 	endfor
@@ -143,8 +143,8 @@ function Test_nextval_exec()
 \	]
 	for val in tests
 		call s:nextval_reset()
-		let v_inc=s:nextval_exec(val[0], '+')
-		let v_dec=s:nextval_exec(val[0], '-')
+		let v_inc=s:nextval_exec(val[0], '+', 1)
+		let v_dec=s:nextval_exec(val[0], '-', 1)
 		call Vest_assert_equal(v_inc, val[2], "incrementing ".val[0]." returned {%result}; {%assert} expected")
 		call Vest_assert_equal(v_dec, val[1], "decrementing ".val[0]." returned {%result}; {%assert} expected")
 	endfor

From 93d1f823ee3e759f34402fc7c20de833f6ca1465 Mon Sep 17 00:00:00 2001
From: zegervdv <zegervdv@me.com>
Date: Sun, 27 Dec 2020 09:29:50 +0100
Subject: [PATCH 4/4] Add optional repeat.vim support

---
 plugin/nextval.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin/nextval.vim b/plugin/nextval.vim
index 749a13d..17c8651 100644
--- a/plugin/nextval.vim
+++ b/plugin/nextval.vim
@@ -234,6 +234,7 @@ function s:nextval(operator, count)
 		"execute ':w'
 	endif
 	call s:cleanup()
+  silent! call repeat#set("\<Plug>nextval" . (a:operator == '+' ? "Inc" : "Dec"), a:count)
 	return
 endfunction