Allow reverse action (and count) in lambda substitutions

Resolves #86

Author: Amerlyq

autoload/switch.vim

@@ -35,7 +35,7 @@ function! switch#Switch(...)
     endfor
 
     if !min_match.IsNull()
-      call min_match.Replace()
+      call min_match.Replace(options)
       return 1
     else
       return 0
@@ -46,12 +46,12 @@ function! switch#Switch(...)
 endfunction
 
 function! switch#OpfuncForward(type)
-  silent call switch#Switch()
+  silent call switch#Switch({'count': v:count})
   return ''
 endfunction
 
 function! switch#OpfuncReverse(type)
-  silent call switch#Switch({'reverse': 1})
+  silent call switch#Switch({'reverse': 1, 'count': v:count})
   return ''
 endfunction
 

autoload/switch/mapping.vim

@@ -98,7 +98,7 @@ endfunction
 " Replaces the pattern from the match data with its Replacement. Takes care of
 " both simple replacements and nested ones.
 "
-function! switch#mapping#Replace(match) dict
+function! switch#mapping#Replace(match, options) dict
   let pattern     = a:match.pattern
   let Replacement = self.definitions[pattern]
   let oldsearch   = @/
@@ -128,7 +128,9 @@ function! switch#mapping#Replace(match) dict
     let g:Switch_replacer = Replacement
     let submatch_expression = join(map(range(0, 9), '"submatch(".v:val.")"'), ',')
 
-    let Replacement = '\=call(g:Switch_replacer, [['.submatch_expression.']])'
+    let rev = get(a:options, 'reverse')
+    let cnt = get(a:options, 'count')
+    let Replacement = '\=call(g:Switch_replacer, [['.submatch_expression.'],'.rev.','.cnt.'])'
     exe 's/'.pattern.'/'.Replacement.'/'
 
     unlet g:Switch_replacer

autoload/switch/match.vim

@@ -43,8 +43,8 @@ function! switch#match#IsBetter(other) dict
   endif
 endfunction
 
-function! switch#match#Replace() dict
-  call self.mapping.Replace(self)
+function! switch#match#Replace(...) dict
+  call self.mapping.Replace(self, get(a:,1))
 endfunction
 
 function! switch#match#IsNull() dict

plugin/switch.vim

@@ -251,8 +251,8 @@ function! s:SwitchReverse()
   silent! call repeat#set(":SwitchReverse\<cr>")
 endfunction
 
-nnoremap <silent> <Plug>(Switch)        :set opfunc=switch#OpfuncForward<cr>g@l
-nnoremap <silent> <Plug>(SwitchReverse) :set opfunc=switch#OpfuncReverse<cr>g@l
+nnoremap <silent><expr>  <Plug>(Switch)         execute("set opfunc=switch#OpfuncForward").'g@l'
+nnoremap <silent><expr>  <Plug>(SwitchReverse)  execute("set opfunc=switch#OpfuncReverse").'g@l'
 
 command! -nargs=* SwitchExtend call s:SwitchExtend(<args>)
 fun! s:SwitchExtend(...)