Skip to content

Improve verilog support, counts and repeat #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zegervdv wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Improve verilog support, counts and repeat #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b16c40d
Support verilog hex syntax with arbitrary precision
zegervdv Dec 27, 2020
84815af
Add support for decimal verilog values
zegervdv Dec 27, 2020
a0186b3
Add count to increment/decrement
zegervdv Dec 27, 2020
93d1f82
Add optional repeat.vim support
zegervdv Dec 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 23 additions & 20 deletions plugin/nextval.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@ 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 = "\\(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
Expand All @@ -128,7 +128,9 @@ let s:re_num = '\([''"]\?\)\(-\?[0-9]*\.[0-9]\+\)\([^0-9]\+\)\?'

let s:re_bool = '\([''"]\)\?\(true\|false\|yes\|no\|on\|off\c\)\([''"]\)\?'

function s:nextval_exec(word, operator)
let s:re_int = "\\(\\d\*'d\\|[^0-9]\*\\)\\([0-9]\\+\\)\\([^0-9]\*\\)"

function s:nextval_exec(word, operator, count)
let word=a:word

" determine type of word (int/hex)
Expand All @@ -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]
Expand All @@ -164,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
Expand All @@ -188,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
Expand Down Expand Up @@ -220,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
Expand All @@ -232,6 +234,7 @@ function s:nextval(operator)
"execute ':w'
endif
call s:cleanup()
silent! call repeat#set("\<Plug>nextval" . (a:operator == '+' ? "Inc" : "Dec"), a:count)
return
endfunction

Expand Down Expand Up @@ -267,18 +270,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
Expand All @@ -288,13 +291,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
Expand Down
16 changes: 8 additions & 8 deletions tests/nextval_test.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down