ex_cmds: port cmd_addr_T and ADDR_NONE (#13492)

Patch 8.1.1241 is too hard to port in 1 commit.
https://github.com/neovim/neovim/pull/13079 is too hard to review
and seems to be blocked.

Use 'int' type for some  addr variables to suppress 'switch/case' warnings.

1 files changed, 541 insertions, 551 deletions

diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index d62b00fee1..380237c822 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -29,394 +29,384 @@ local FILES      = bit.bor(XFILE, EXTRA)
 local WORD1      = bit.bor(EXTRA, NOSPC)
 local FILE1      = bit.bor(FILES, NOSPC)
 
-local ADDR_LINES            =  0    -- buffer line numbers
-local ADDR_WINDOWS          =  1    -- window number
-local ADDR_ARGUMENTS        =  2    -- argument number
-local ADDR_LOADED_BUFFERS   =  3    -- buffer number of loaded buffer
-local ADDR_BUFFERS          =  4    -- buffer number
-local ADDR_TABS             =  5    -- tab page number
-local ADDR_TABS_RELATIVE    =  6    -- Tab page that only relative
-local ADDR_QUICKFIX         =  7    -- quickfix list entry number
-local ADDR_OTHER            =  99   -- something else
-
 -- The following table is described in ex_cmds_defs.h file.
 return {
   {
     command='append',
     flags=bit.bor(BANG, RANGE, ZEROR, TRLBAR, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_append',
   },
   {
     command='abbreviate',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_abbreviate',
   },
   {
     command='abclear',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_abclear',
   },
   {
     command='aboveleft',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='all',
     flags=bit.bor(BANG, RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_all',
   },
   {
     command='amenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='anoremenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='args',
     flags=bit.bor(BANG, FILES, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_args',
   },
   {
     command='argadd',
     flags=bit.bor(BANG, RANGE, NOTADR, ZEROR, FILES, TRLBAR),
-    addr_type=ADDR_ARGUMENTS,
+    addr_type='ADDR_ARGUMENTS',
     func='ex_argadd',
   },
   {
     command='argdelete',
     flags=bit.bor(BANG, RANGE, NOTADR, FILES, TRLBAR),
-    addr_type=ADDR_ARGUMENTS,
+    addr_type='ADDR_ARGUMENTS',
     func='ex_argdelete',
   },
   {
     command='argdo',
     flags=bit.bor(BANG, NEEDARG, EXTRA, NOTRLCOM, RANGE, NOTADR, DFLALL),
-    addr_type=ADDR_ARGUMENTS,
+    addr_type='ADDR_ARGUMENTS',
     func='ex_listdo',
   },
   {
     command='argedit',
     flags=bit.bor(BANG, NEEDARG, RANGE, NOTADR, ZEROR, FILES, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_ARGUMENTS,
+    addr_type='ADDR_ARGUMENTS',
     func='ex_argedit',
   },
   {
     command='argglobal',
     flags=bit.bor(BANG, FILES, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_args',
   },
   {
     command='arglocal',
     flags=bit.bor(BANG, FILES, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_args',
   },
   {
     command='argument',
     flags=bit.bor(BANG, RANGE, NOTADR, COUNT, EXTRA, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_ARGUMENTS,
+    addr_type='ADDR_ARGUMENTS',
     func='ex_argument',
   },
   {
     command='ascii',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='do_ascii',
   },
   {
     command='autocmd',
     flags=bit.bor(BANG, EXTRA, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_autocmd',
   },
   {
     command='augroup',
     flags=bit.bor(BANG, WORD1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_autocmd',
   },
   {
     command='aunmenu',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='buffer',
     flags=bit.bor(BANG, RANGE, NOTADR, BUFNAME, BUFUNL, COUNT, EXTRA, EDITCMD, TRLBAR),
-    addr_type=ADDR_BUFFERS,
+    addr_type='ADDR_BUFFERS',
     func='ex_buffer',
   },
   {
     command='bNext',
     flags=bit.bor(BANG, RANGE, NOTADR, COUNT, EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_bprevious',
   },
   {
     command='ball',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_buffer_all',
   },
   {
     command='badd',
     flags=bit.bor(NEEDARG, FILE1, EDITCMD, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_edit',
   },
   {
     command='bdelete',
     flags=bit.bor(BANG, RANGE, NOTADR, BUFNAME, COUNT, EXTRA, TRLBAR),
-    addr_type=ADDR_BUFFERS,
+    addr_type='ADDR_BUFFERS',
     func='ex_bunload',
   },
   {
     command='behave',
     flags=bit.bor(NEEDARG, WORD1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_behave',
   },
   {
     command='belowright',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='bfirst',
     flags=bit.bor(BANG, RANGE, NOTADR, EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_brewind',
   },
   {
     command='blast',
     flags=bit.bor(BANG, RANGE, NOTADR, EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_blast',
   },
   {
     command='bmodified',
     flags=bit.bor(BANG, RANGE, NOTADR, COUNT, EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_bmodified',
   },
   {
     command='bnext',
     flags=bit.bor(BANG, RANGE, NOTADR, COUNT, EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_bnext',
   },
   {
     command='botright',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='bprevious',
     flags=bit.bor(BANG, RANGE, NOTADR, COUNT, EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_bprevious',
   },
   {
     command='brewind',
     flags=bit.bor(BANG, RANGE, NOTADR, EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_brewind',
   },
   {
     command='break',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_break',
   },
   {
     command='breakadd',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_breakadd',
   },
   {
     command='breakdel',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_breakdel',
   },
   {
     command='breaklist',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_breaklist',
   },
   {
     command='browse',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='buffers',
     flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='buflist_list',
   },
   {
     command='bufdo',
     flags=bit.bor(BANG, NEEDARG, EXTRA, NOTRLCOM, RANGE, NOTADR, DFLALL),
-    addr_type=ADDR_BUFFERS,
+    addr_type='ADDR_BUFFERS',
     func='ex_listdo',
   },
   {
     command='bunload',
     flags=bit.bor(BANG, RANGE, NOTADR, BUFNAME, COUNT, EXTRA, TRLBAR),
-    addr_type=ADDR_LOADED_BUFFERS,
+    addr_type='ADDR_LOADED_BUFFERS',
     func='ex_bunload',
   },
   {
     command='bwipeout',
     flags=bit.bor(BANG, RANGE, NOTADR, BUFNAME, BUFUNL, COUNT, EXTRA, TRLBAR),
-    addr_type=ADDR_BUFFERS,
+    addr_type='ADDR_BUFFERS',
     func='ex_bunload',
   },
   {
     command='change',
     flags=bit.bor(BANG, WHOLEFOLD, RANGE, COUNT, TRLBAR, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_change',
   },
   {
     command='cNext',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cnext',
   },
   {
     command='cNfile',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cnext',
   },
   {
     command='cabbrev',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_abbreviate',
   },
   {
     command='cabclear',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_abclear',
   },
   {
     command='cabove',
     flags=bit.bor(RANGE, TRLBAR),
-    addr_type=ADDR_OTHER ,
+    addr_type='ADDR_OTHER ',
     func='ex_cbelow',
   },
   {
     command='caddbuffer',
     flags=bit.bor(RANGE, NOTADR, WORD1, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cbuffer',
   },
   {
     command='caddexpr',
     flags=bit.bor(NEEDARG, WORD1, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cexpr',
   },
   {
     command='caddfile',
     flags=bit.bor(TRLBAR, FILE1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cfile',
   },
   {
     command='call',
     flags=bit.bor(RANGE, NEEDARG, EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_call',
   },
   {
     command='catch',
     flags=bit.bor(EXTRA, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_catch',
   },
   {
     command='cbuffer',
     flags=bit.bor(BANG, RANGE, NOTADR, WORD1, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cbuffer',
   },
   {
     command='cbelow',
     flags=bit.bor(RANGE, TRLBAR),
-    addr_type=ADDR_OTHER ,
+    addr_type='ADDR_OTHER ',
     func='ex_cbelow',
   },
   {
     command='cbottom',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cbottom',
   },
   {
     command='cc',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cc',
   },
   {
     command='cclose',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cclose',
   },
   {
     command='cd',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cd',
   },
   {
     command='cdo',
     flags=bit.bor(BANG, NEEDARG, EXTRA, NOTRLCOM, RANGE, NOTADR, DFLALL),
-    addr_type=ADDR_QUICKFIX,
+    addr_type='ADDR_QUICKFIX',
     func='ex_listdo',
   },
   {
     command='center',
     flags=bit.bor(TRLBAR, RANGE, WHOLEFOLD, EXTRA, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_align',
   },
   {
     command='cexpr',
     flags=bit.bor(NEEDARG, WORD1, NOTRLCOM, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cexpr',
   },
   {
     command='cfile',
     flags=bit.bor(TRLBAR, FILE1, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cfile',
   },
   -- Even though 'cfdo' is alphabetically lower than 'cfile', it is after
@@ -424,979 +414,979 @@ return {
   {
     command='cfdo',
     flags=bit.bor(BANG, NEEDARG, EXTRA, NOTRLCOM, RANGE, NOTADR, DFLALL),
-    addr_type=ADDR_QUICKFIX,
+    addr_type='ADDR_QUICKFIX',
     func='ex_listdo',
   },
   {
     command='cfirst',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cc',
   },
   {
     command='cgetfile',
     flags=bit.bor(TRLBAR, FILE1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cfile',
   },
   {
     command='cgetbuffer',
     flags=bit.bor(RANGE, NOTADR, WORD1, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cbuffer',
   },
   {
     command='cgetexpr',
     flags=bit.bor(NEEDARG, WORD1, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cexpr',
   },
   {
     command='chdir',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cd',
   },
   {
     command='changes',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_changes',
   },
   {
     command='checkhealth',
     flags=bit.bor(EXTRA, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_checkhealth',
   },
   {
     command='checkpath',
     flags=bit.bor(TRLBAR, BANG, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_checkpath',
   },
   {
     command='checktime',
     flags=bit.bor(RANGE, NOTADR, BUFNAME, COUNT, EXTRA, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_checktime',
   },
   {
     command='chistory',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='qf_history',
   },
   {
     command='clist',
     flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='qf_list',
   },
   {
     command='clast',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cc',
   },
   {
     command='close',
     flags=bit.bor(BANG, RANGE, NOTADR, COUNT, TRLBAR, CMDWIN),
-    addr_type=ADDR_WINDOWS,
+    addr_type='ADDR_WINDOWS',
     func='ex_close',
   },
   {
     command='clearjumps',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_clearjumps',
   },
   {
     command='cmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='cmapclear',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mapclear',
   },
   {
     command='cmenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='cnext',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cnext',
   },
   {
     command='cnewer',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='qf_age',
   },
   {
     command='cnfile',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cnext',
   },
   {
     command='cnoremap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='cnoreabbrev',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_abbreviate',
   },
   {
     command='cnoremenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='copy',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, TRLBAR, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_copymove',
   },
   {
     command='colder',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='qf_age',
   },
   {
     command='colorscheme',
     flags=bit.bor(WORD1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_colorscheme',
   },
   {
     command='command',
     flags=bit.bor(EXTRA, BANG, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_command',
   },
   {
     command='comclear',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_comclear',
   },
   {
     command='compiler',
     flags=bit.bor(BANG, TRLBAR, WORD1, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_compiler',
   },
   {
     command='continue',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_continue',
   },
   {
     command='confirm',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='const',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_const',
   },
   {
     command='copen',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_copen',
   },
   {
     command='cprevious',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cnext',
   },
   {
     command='cpfile',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cnext',
   },
   {
     command='cquit',
     flags=bit.bor(RANGE, NOTADR, COUNT, ZEROR, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cquit',
   },
   {
     command='crewind',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cc',
   },
   {
     command='cscope',
     flags=bit.bor(EXTRA, NOTRLCOM, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cscope',
   },
   {
     command='cstag',
     flags=bit.bor(BANG, TRLBAR, WORD1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cstag',
   },
   {
     command='cunmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_unmap',
   },
   {
     command='cunabbrev',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_abbreviate',
   },
   {
     command='cunmenu',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='cwindow',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cwindow',
   },
   {
     command='delete',
     flags=bit.bor(RANGE, WHOLEFOLD, REGSTR, COUNT, TRLBAR, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_operators',
   },
   {
     command='delmarks',
     flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_delmarks',
   },
   {
     command='debug',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_debug',
   },
   {
     command='debuggreedy',
     flags=bit.bor(RANGE, NOTADR, ZEROR, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_debuggreedy',
   },
   {
     command='delcommand',
     flags=bit.bor(BANG, NEEDARG, WORD1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_delcommand',
   },
   {
     command='delfunction',
     flags=bit.bor(BANG, NEEDARG, WORD1, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_delfunction',
   },
   {
     command='display',
     flags=bit.bor(EXTRA, NOTRLCOM, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_display',
   },
   {
     command='diffupdate',
     flags=bit.bor(BANG, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_diffupdate',
   },
   {
     command='diffget',
     flags=bit.bor(RANGE, EXTRA, TRLBAR, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_diffgetput',
   },
   {
     command='diffoff',
     flags=bit.bor(BANG, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_diffoff',
   },
   {
     command='diffpatch',
     flags=bit.bor(EXTRA, FILE1, TRLBAR, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_diffpatch',
   },
   {
     command='diffput',
     flags=bit.bor(RANGE, EXTRA, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_diffgetput',
   },
   {
     command='diffsplit',
     flags=bit.bor(EXTRA, FILE1, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_diffsplit',
   },
   {
     command='diffthis',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_diffthis',
   },
   {
     command='digraphs',
     flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_digraphs',
   },
   {
     command='djump',
     flags=bit.bor(BANG, RANGE, DFLALL, WHOLEFOLD, EXTRA),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_findpat',
   },
   {
     command='dlist',
     flags=bit.bor(BANG, RANGE, DFLALL, WHOLEFOLD, EXTRA, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_findpat',
   },
   {
     command='doautocmd',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_doautocmd',
   },
   {
     command='doautoall',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_doautoall',
   },
   {
     command='drop',
     flags=bit.bor(FILES, EDITCMD, NEEDARG, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_drop',
   },
   {
     command='dsearch',
     flags=bit.bor(BANG, RANGE, DFLALL, WHOLEFOLD, EXTRA, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_findpat',
   },
   {
     command='dsplit',
     flags=bit.bor(BANG, RANGE, DFLALL, WHOLEFOLD, EXTRA),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_findpat',
   },
   {
     command='edit',
     flags=bit.bor(BANG, FILE1, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_edit',
   },
   {
     command='earlier',
     flags=bit.bor(TRLBAR, EXTRA, NOSPC, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_later',
   },
   {
     command='echo',
     flags=bit.bor(EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_echo',
   },
   {
     command='echoerr',
     flags=bit.bor(EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_execute',
   },
   {
     command='echohl',
     flags=bit.bor(EXTRA, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_echohl',
   },
   {
     command='echomsg',
     flags=bit.bor(EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_execute',
   },
   {
     command='echon',
     flags=bit.bor(EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_echo',
   },
   {
     command='else',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_else',
   },
   {
     command='elseif',
     flags=bit.bor(EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_else',
   },
   {
     command='emenu',
     flags=bit.bor(NEEDARG, EXTRA, TRLBAR, NOTRLCOM, RANGE, NOTADR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_emenu',
   },
   {
     command='endif',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_endif',
   },
   {
     command='endfunction',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_endfunction',
   },
   {
     command='endfor',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_endwhile',
   },
   {
     command='endtry',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_endtry',
   },
   {
     command='endwhile',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_endwhile',
   },
   {
     command='enew',
     flags=bit.bor(BANG, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_edit',
   },
   {
     command='ex',
     flags=bit.bor(BANG, FILE1, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_edit',
   },
   {
     command='execute',
     flags=bit.bor(EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_execute',
   },
   {
     command='exit',
     flags=bit.bor(RANGE, WHOLEFOLD, BANG, FILE1, ARGOPT, DFLALL, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_exit',
   },
   {
     command='exusage',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_exusage',
   },
   {
     command='file',
     flags=bit.bor(RANGE, NOTADR, ZEROR, BANG, FILE1, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_file',
   },
   {
     command='files',
     flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='buflist_list',
   },
   {
     command='filetype',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_filetype',
   },
   {
     command='filter',
     flags=bit.bor(BANG, NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='find',
     flags=bit.bor(RANGE, NOTADR, BANG, FILE1, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_find',
   },
   {
     command='finally',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_finally',
   },
   {
     command='finish',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_finish',
   },
   {
     command='first',
     flags=bit.bor(EXTRA, BANG, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_rewind',
   },
   {
     command='fold',
     flags=bit.bor(RANGE, WHOLEFOLD, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_fold',
   },
   {
     command='foldclose',
     flags=bit.bor(RANGE, BANG, WHOLEFOLD, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_foldopen',
   },
   {
     command='folddoopen',
     flags=bit.bor(RANGE, DFLALL, NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_folddo',
   },
   {
     command='folddoclosed',
     flags=bit.bor(RANGE, DFLALL, NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_folddo',
   },
   {
     command='foldopen',
     flags=bit.bor(RANGE, BANG, WHOLEFOLD, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_foldopen',
   },
   {
     command='for',
     flags=bit.bor(EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_while',
   },
   {
     command='function',
     flags=bit.bor(EXTRA, BANG, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_function',
   },
   {
     command='global',
     flags=bit.bor(RANGE, WHOLEFOLD, BANG, EXTRA, DFLALL, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_global',
   },
   {
     command='goto',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_goto',
   },
   {
     command='grep',
     flags=bit.bor(RANGE, NOTADR, BANG, NEEDARG, EXTRA, NOTRLCOM, TRLBAR, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_make',
   },
   {
     command='grepadd',
     flags=bit.bor(RANGE, NOTADR, BANG, NEEDARG, EXTRA, NOTRLCOM, TRLBAR, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_make',
   },
   {
     command='gui',
     flags=bit.bor(BANG, FILES, EDITCMD, ARGOPT, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_nogui',
   },
   {
     command='gvim',
     flags=bit.bor(BANG, FILES, EDITCMD, ARGOPT, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_nogui',
   },
   {
     command='help',
     flags=bit.bor(BANG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_help',
   },
   {
     command='helpclose',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_helpclose',
   },
   {
     command='helpgrep',
     flags=bit.bor(EXTRA, NOTRLCOM, NEEDARG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_helpgrep',
   },
   {
     command='helptags',
     flags=bit.bor(NEEDARG, FILES, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_helptags',
   },
   {
     command='hardcopy',
     flags=bit.bor(RANGE, COUNT, EXTRA, TRLBAR, DFLALL, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_hardcopy',
   },
   {
     command='highlight',
     flags=bit.bor(BANG, EXTRA, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_highlight',
   },
   {
     command='hide',
     flags=bit.bor(BANG, RANGE, NOTADR, COUNT, EXTRA, TRLBAR),
-    addr_type=ADDR_WINDOWS,
+    addr_type='ADDR_WINDOWS',
     func='ex_hide',
   },
   {
     command='history',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_history',
   },
   {
     command='insert',
     flags=bit.bor(BANG, RANGE, TRLBAR, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_append',
   },
   {
     command='iabbrev',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_abbreviate',
   },
   {
     command='iabclear',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_abclear',
   },
   {
     command='if',
     flags=bit.bor(EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_if',
   },
   {
     command='ijump',
     flags=bit.bor(BANG, RANGE, DFLALL, WHOLEFOLD, EXTRA),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_findpat',
   },
   {
     command='ilist',
     flags=bit.bor(BANG, RANGE, DFLALL, WHOLEFOLD, EXTRA, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_findpat',
   },
   {
     command='imap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='imapclear',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mapclear',
   },
   {
     command='imenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='inoremap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='inoreabbrev',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_abbreviate',
   },
   {
     command='inoremenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='intro',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_intro',
   },
   {
     command='isearch',
     flags=bit.bor(BANG, RANGE, DFLALL, WHOLEFOLD, EXTRA, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_findpat',
   },
   {
     command='isplit',
     flags=bit.bor(BANG, RANGE, DFLALL, WHOLEFOLD, EXTRA),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_findpat',
   },
   {
     command='iunmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_unmap',
   },
   {
     command='iunabbrev',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_abbreviate',
   },
   {
     command='iunmenu',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='join',
     flags=bit.bor(BANG, RANGE, WHOLEFOLD, COUNT, EXFLAGS, TRLBAR, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_join',
   },
   {
     command='jumps',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_jumps',
   },
   {
     command='k',
     flags=bit.bor(RANGE, WORD1, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mark',
   },
   {
     command='keepmarks',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='keepjumps',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='keeppatterns',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='keepalt',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='list',
     flags=bit.bor(RANGE, WHOLEFOLD, COUNT, EXFLAGS, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_print',
   },
   {
     command='lNext',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cnext',
   },
   {
     command='lNfile',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cnext',
   },
   {
     command='last',
     flags=bit.bor(EXTRA, BANG, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_last',
   },
   {
     command='labove',
     flags=bit.bor(RANGE, TRLBAR),
-    addr_type=ADDR_OTHER ,
+    addr_type='ADDR_OTHER ',
     func='ex_cbelow',
   },
   {
     command='language',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_language',
   },
   {
     command='laddexpr',
     flags=bit.bor(NEEDARG, WORD1, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cexpr',
   },
   {
     command='laddbuffer',
     flags=bit.bor(RANGE, NOTADR, WORD1, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cbuffer',
   },
   {
     command='laddfile',
     flags=bit.bor(TRLBAR, FILE1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cfile',
   },
   {
     command='later',
     flags=bit.bor(TRLBAR, EXTRA, NOSPC, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_later',
   },
   {
     command='lbuffer',
     flags=bit.bor(BANG, RANGE, NOTADR, WORD1, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cbuffer',
   },
   {
     command='lbelow',
     flags=bit.bor(RANGE, TRLBAR),
-    addr_type=ADDR_OTHER ,
+    addr_type='ADDR_OTHER ',
     func='ex_cbelow',
   },
   {
     command='lbottom',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cbottom',
   },
   {
     command='lcd',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cd',
   },
   {
     command='lchdir',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cd',
   },
   {
     command='lclose',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cclose',
   },
   {
     command='lcscope',
     flags=bit.bor(EXTRA, NOTRLCOM, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cscope',
   },
   {
     command='ldo',
     flags=bit.bor(BANG, NEEDARG, EXTRA, NOTRLCOM, RANGE, NOTADR, DFLALL),
-    addr_type=ADDR_QUICKFIX,
+    addr_type='ADDR_QUICKFIX',
     func='ex_listdo',
   },
   {
     command='left',
     flags=bit.bor(TRLBAR, RANGE, WHOLEFOLD, EXTRA, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_align',
   },
   {
     command='leftabove',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='let',
     flags=bit.bor(EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_let',
   },
   {
     command='lexpr',
     flags=bit.bor(NEEDARG, WORD1, NOTRLCOM, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cexpr',
   },
   {
     command='lfile',
     flags=bit.bor(TRLBAR, FILE1, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cfile',
   },
   -- Even though 'lfdo' is alphabetically lower than 'lfile', it is after
@@ -1404,1899 +1394,1899 @@ return {
   {
     command='lfdo',
     flags=bit.bor(BANG, NEEDARG, EXTRA, NOTRLCOM, RANGE, NOTADR, DFLALL),
-    addr_type=ADDR_QUICKFIX,
+    addr_type='ADDR_QUICKFIX',
     func='ex_listdo',
   },
   {
     command='lfirst',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cc',
   },
   {
     command='lgetfile',
     flags=bit.bor(TRLBAR, FILE1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cfile',
   },
   {
     command='lgetbuffer',
     flags=bit.bor(RANGE, NOTADR, WORD1, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cbuffer',
   },
   {
     command='lgetexpr',
     flags=bit.bor(NEEDARG, WORD1, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cexpr',
   },
   {
     command='lgrep',
     flags=bit.bor(RANGE, NOTADR, BANG, NEEDARG, EXTRA, NOTRLCOM, TRLBAR, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_make',
   },
   {
     command='lgrepadd',
     flags=bit.bor(RANGE, NOTADR, BANG, NEEDARG, EXTRA, NOTRLCOM, TRLBAR, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_make',
   },
   {
     command='lhelpgrep',
     flags=bit.bor(EXTRA, NOTRLCOM, NEEDARG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_helpgrep',
   },
   {
     command='lhistory',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='qf_history',
   },
   {
     command='ll',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cc',
   },
   {
     command='llast',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cc',
   },
   {
     command='llist',
     flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='qf_list',
   },
   {
     command='lmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='lmapclear',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mapclear',
   },
   {
     command='lmake',
     flags=bit.bor(BANG, EXTRA, NOTRLCOM, TRLBAR, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_make',
   },
   {
     command='lnoremap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='lnext',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cnext',
   },
   {
     command='lnewer',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='qf_age',
   },
   {
     command='lnfile',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cnext',
   },
   {
     command='loadview',
     flags=bit.bor(FILE1, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_loadview',
   },
   {
     command='loadkeymap',
     flags=bit.bor(CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_loadkeymap',
   },
   {
     command='lockmarks',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='lockvar',
     flags=bit.bor(BANG, EXTRA, NEEDARG, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_lockvar',
   },
   {
     command='lolder',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='qf_age',
   },
   {
     command='lopen',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_copen',
   },
   {
     command='lprevious',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cnext',
   },
   {
     command='lpfile',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cnext',
   },
   {
     command='lrewind',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cc',
   },
   {
     command='ltag',
     flags=bit.bor(NOTADR, TRLBAR, BANG, WORD1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_tag',
   },
   {
     command='lunmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_unmap',
   },
   {
     command='lua',
     flags=bit.bor(RANGE, EXTRA, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_lua',
   },
   {
     command='luado',
     flags=bit.bor(RANGE, DFLALL, EXTRA, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_luado',
   },
   {
     command='luafile',
     flags=bit.bor(RANGE, FILE1, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_luafile',
   },
   {
     command='lvimgrep',
     flags=bit.bor(RANGE, NOTADR, BANG, NEEDARG, EXTRA, NOTRLCOM, TRLBAR, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_vimgrep',
   },
   {
     command='lvimgrepadd',
     flags=bit.bor(RANGE, NOTADR, BANG, NEEDARG, EXTRA, NOTRLCOM, TRLBAR, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_vimgrep',
   },
   {
     command='lwindow',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cwindow',
   },
   {
     command='ls',
     flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='buflist_list',
   },
   {
     command='move',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, TRLBAR, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_copymove',
   },
   {
     command='mark',
     flags=bit.bor(RANGE, WORD1, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mark',
   },
   {
     command='make',
     flags=bit.bor(BANG, EXTRA, NOTRLCOM, TRLBAR, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_make',
   },
   {
     command='map',
     flags=bit.bor(BANG, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='mapclear',
     flags=bit.bor(EXTRA, BANG, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mapclear',
   },
   {
     command='marks',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_marks',
   },
   {
     command='match',
     flags=bit.bor(RANGE, NOTADR, EXTRA, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_match',
   },
   {
     command='menu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, BANG, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='menutranslate',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menutranslate',
   },
   {
     command='messages',
     flags=bit.bor(EXTRA, TRLBAR, RANGE, CMDWIN),
-    addr_type=ADDR_OTHER,
+    addr_type='ADDR_OTHER',
     func='ex_messages',
   },
   {
     command='mkexrc',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mkrc',
   },
   {
     command='mksession',
     flags=bit.bor(BANG, FILE1, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mkrc',
   },
   {
     command='mkspell',
     flags=bit.bor(BANG, NEEDARG, EXTRA, NOTRLCOM, TRLBAR, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mkspell',
   },
   {
     command='mkvimrc',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mkrc',
   },
   {
     command='mkview',
     flags=bit.bor(BANG, FILE1, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mkrc',
   },
   {
     command='mode',
     flags=bit.bor(WORD1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mode',
   },
   {
     command='mzscheme',
     flags=bit.bor(RANGE, EXTRA, DFLALL, NEEDARG, CMDWIN, SBOXOK),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_script_ni',
   },
   {
     command='mzfile',
     flags=bit.bor(RANGE, FILE1, NEEDARG, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ni',
   },
   {
     command='next',
     flags=bit.bor(RANGE, NOTADR, BANG, FILES, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_next',
   },
   {
     command='new',
     flags=bit.bor(BANG, FILE1, RANGE, NOTADR, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_splitview',
   },
   {
     command='nmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='nmapclear',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mapclear',
   },
   {
     command='nmenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='nnoremap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='nnoremenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='noremap',
     flags=bit.bor(BANG, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='noautocmd',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='nohlsearch',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_nohlsearch',
   },
   {
     command='noreabbrev',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_abbreviate',
   },
   {
     command='noremenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, BANG, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='noswapfile',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='normal',
     flags=bit.bor(RANGE, BANG, EXTRA, NEEDARG, NOTRLCOM, USECTRLV, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_normal',
   },
   {
     command='number',
     flags=bit.bor(RANGE, WHOLEFOLD, COUNT, EXFLAGS, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_print',
   },
   {
     command='nunmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_unmap',
   },
   {
     command='nunmenu',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='oldfiles',
     flags=bit.bor(BANG, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_oldfiles',
   },
   {
     command='omap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='omapclear',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mapclear',
   },
   {
     command='omenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='only',
     flags=bit.bor(BANG, NOTADR, RANGE, COUNT, TRLBAR),
-    addr_type=ADDR_WINDOWS,
+    addr_type='ADDR_WINDOWS',
     func='ex_only',
   },
   {
     command='onoremap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='onoremenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='options',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_options',
   },
   {
     command='ounmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_unmap',
   },
   {
     command='ounmenu',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='ownsyntax',
     flags=bit.bor(EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ownsyntax',
   },
   {
     command='print',
     flags=bit.bor(RANGE, WHOLEFOLD, COUNT, EXFLAGS, TRLBAR, CMDWIN, SBOXOK),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_print',
   },
   {
     command='packadd',
     flags=bit.bor(BANG, FILE1, NEEDARG, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_packadd',
   },
   {
     command='packloadall',
     flags=bit.bor(BANG, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_packloadall',
   },
   {
     command='pclose',
     flags=bit.bor(BANG, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_pclose',
   },
   {
     command='perl',
     flags=bit.bor(RANGE, EXTRA, DFLALL, NEEDARG, SBOXOK, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_perl',
   },
   {
     command='perldo',
     flags=bit.bor(RANGE, EXTRA, DFLALL, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_perldo',
   },
   {
     command='perlfile',
     flags=bit.bor(RANGE, FILE1, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_perlfile',
   },
   {
     command='pedit',
     flags=bit.bor(BANG, FILE1, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_pedit',
   },
   {
     command='pop',
     flags=bit.bor(RANGE, NOTADR, BANG, COUNT, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_tag',
   },
   {
     command='popup',
     flags=bit.bor(NEEDARG, EXTRA, BANG, TRLBAR, NOTRLCOM, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ni',
   },
   {
     command='ppop',
     flags=bit.bor(RANGE, NOTADR, BANG, COUNT, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ptag',
   },
   {
     command='preserve',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_preserve',
   },
   {
     command='previous',
     flags=bit.bor(EXTRA, RANGE, NOTADR, COUNT, BANG, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_previous',
   },
   {
     command='profile',
     flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_profile',
   },
   {
     command='profdel',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_breakdel',
   },
   {
     command='psearch',
     flags=bit.bor(BANG, RANGE, WHOLEFOLD, DFLALL, EXTRA),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_psearch',
   },
   {
     command='ptag',
     flags=bit.bor(RANGE, NOTADR, BANG, WORD1, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ptag',
   },
   {
     command='ptNext',
     flags=bit.bor(RANGE, NOTADR, BANG, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ptag',
   },
   {
     command='ptfirst',
     flags=bit.bor(RANGE, NOTADR, BANG, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ptag',
   },
   {
     command='ptjump',
     flags=bit.bor(BANG, TRLBAR, WORD1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ptag',
   },
   {
     command='ptlast',
     flags=bit.bor(BANG, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ptag',
   },
   {
     command='ptnext',
     flags=bit.bor(RANGE, NOTADR, BANG, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ptag',
   },
   {
     command='ptprevious',
     flags=bit.bor(RANGE, NOTADR, BANG, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ptag',
   },
   {
     command='ptrewind',
     flags=bit.bor(RANGE, NOTADR, BANG, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ptag',
   },
   {
     command='ptselect',
     flags=bit.bor(BANG, TRLBAR, WORD1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ptag',
   },
   {
     command='put',
     flags=bit.bor(RANGE, WHOLEFOLD, BANG, REGSTR, TRLBAR, ZEROR, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_put',
   },
   {
     command='pwd',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_pwd',
   },
   {
     command='python',
     flags=bit.bor(RANGE, EXTRA, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_python',
   },
   {
     command='pydo',
     flags=bit.bor(RANGE, DFLALL, EXTRA, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_pydo',
   },
   {
     command='pyfile',
     flags=bit.bor(RANGE, FILE1, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_pyfile',
   },
   {
     command='py3',
     flags=bit.bor(RANGE, EXTRA, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_python3',
   },
   {
     command='py3do',
     flags=bit.bor(RANGE, DFLALL, EXTRA, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_pydo3',
   },
   {
     command='python3',
     flags=bit.bor(RANGE, EXTRA, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_python3',
   },
   {
     command='py3file',
     flags=bit.bor(RANGE, FILE1, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_py3file',
   },
   {
     command='pyx',
     flags=bit.bor(RANGE, EXTRA, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_pyx',
   },
   {
     command='pyxdo',
     flags=bit.bor(RANGE, DFLALL, EXTRA, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_pyxdo',
   },
   {
     command='pythonx',
     flags=bit.bor(RANGE, EXTRA, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_pyx',
   },
   {
     command='pyxfile',
     flags=bit.bor(RANGE, FILE1, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_pyxfile',
   },
   {
     command='quit',
     flags=bit.bor(BANG, RANGE, COUNT, NOTADR, TRLBAR, CMDWIN),
-    addr_type=ADDR_WINDOWS,
+    addr_type='ADDR_WINDOWS',
     func='ex_quit',
   },
   {
     command='quitall',
     flags=bit.bor(BANG, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_quit_all',
   },
   {
     command='qall',
     flags=bit.bor(BANG, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_quit_all',
   },
   {
     command='read',
     flags=bit.bor(BANG, RANGE, WHOLEFOLD, FILE1, ARGOPT, TRLBAR, ZEROR, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_read',
   },
   {
     command='recover',
     flags=bit.bor(BANG, FILE1, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_recover',
   },
   {
     command='redo',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_redo',
   },
   {
     command='redir',
     flags=bit.bor(BANG, FILES, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_redir',
   },
   {
     command='redraw',
     flags=bit.bor(BANG, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_redraw',
   },
   {
     command='redrawstatus',
     flags=bit.bor(BANG, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_redrawstatus',
   },
   {
     command='redrawtabline',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_redrawtabline',
   },
   {
     command='registers',
     flags=bit.bor(EXTRA, NOTRLCOM, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_display',
   },
   {
     command='resize',
     flags=bit.bor(RANGE, NOTADR, TRLBAR, WORD1, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_resize',
   },
   {
     command='retab',
     flags=bit.bor(TRLBAR, RANGE, WHOLEFOLD, DFLALL, BANG, WORD1, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_retab',
   },
   {
     command='return',
     flags=bit.bor(EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_return',
   },
   {
     command='rewind',
     flags=bit.bor(EXTRA, BANG, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_rewind',
   },
   {
     command='right',
     flags=bit.bor(TRLBAR, RANGE, WHOLEFOLD, EXTRA, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_align',
   },
   {
     command='rightbelow',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='rshada',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_shada',
   },
   {
     command='runtime',
     flags=bit.bor(BANG, NEEDARG, FILES, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_runtime',
   },
   {
     command='rundo',
     flags=bit.bor(NEEDARG, FILE1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_rundo',
   },
   {
     command='ruby',
     flags=bit.bor(RANGE, EXTRA, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ruby',
   },
   {
     command='rubydo',
     flags=bit.bor(RANGE, DFLALL, EXTRA, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_rubydo',
   },
   {
     command='rubyfile',
     flags=bit.bor(RANGE, FILE1, NEEDARG, CMDWIN, RESTRICT),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_rubyfile',
   },
   {
     command='rviminfo',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_shada',
   },
   {
     command='substitute',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_substitute',
   },
   {
     command='sNext',
     flags=bit.bor(EXTRA, RANGE, NOTADR, COUNT, BANG, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_previous',
   },
   {
     command='sargument',
     flags=bit.bor(BANG, RANGE, NOTADR, COUNT, EXTRA, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_ARGUMENTS,
+    addr_type='ADDR_ARGUMENTS',
     func='ex_argument',
   },
   {
     command='sall',
     flags=bit.bor(BANG, RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_all',
   },
   {
     command='sandbox',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='saveas',
     flags=bit.bor(BANG, DFLALL, FILE1, ARGOPT, CMDWIN, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_write',
   },
   {
     command='sbuffer',
     flags=bit.bor(BANG, RANGE, NOTADR, BUFNAME, BUFUNL, COUNT, EXTRA, EDITCMD, TRLBAR),
-    addr_type=ADDR_BUFFERS,
+    addr_type='ADDR_BUFFERS',
     func='ex_buffer',
   },
   {
     command='sbNext',
     flags=bit.bor(RANGE, NOTADR, COUNT, EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_bprevious',
   },
   {
     command='sball',
     flags=bit.bor(RANGE, NOTADR, COUNT, EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_buffer_all',
   },
   {
     command='sbfirst',
     flags=bit.bor(EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_brewind',
   },
   {
     command='sblast',
     flags=bit.bor(EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_blast',
   },
   {
     command='sbmodified',
     flags=bit.bor(RANGE, NOTADR, COUNT, EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_bmodified',
   },
   {
     command='sbnext',
     flags=bit.bor(RANGE, NOTADR, COUNT, EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_bnext',
   },
   {
     command='sbprevious',
     flags=bit.bor(RANGE, NOTADR, COUNT, EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_bprevious',
   },
   {
     command='sbrewind',
     flags=bit.bor(EDITCMD, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_brewind',
   },
   {
     command='scriptnames',
     flags=bit.bor(BANG, RANGE, NOTADR, COUNT, TRLBAR, CMDWIN),
-    addr_type=ADDR_OTHER,
+    addr_type='ADDR_OTHER',
     func='ex_scriptnames',
   },
   {
     command='scriptencoding',
     flags=bit.bor(WORD1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_scriptencoding',
   },
   {
     command='scscope',
     flags=bit.bor(EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_scscope',
   },
   {
     command='set',
     flags=bit.bor(TRLBAR, EXTRA, CMDWIN, SBOXOK),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_set',
   },
   {
     command='setfiletype',
     flags=bit.bor(TRLBAR, EXTRA, NEEDARG, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_setfiletype',
   },
   {
     command='setglobal',
     flags=bit.bor(TRLBAR, EXTRA, CMDWIN, SBOXOK),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_set',
   },
   {
     command='setlocal',
     flags=bit.bor(TRLBAR, EXTRA, CMDWIN, SBOXOK),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_set',
   },
   {
     command='sfind',
     flags=bit.bor(BANG, FILE1, RANGE, NOTADR, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_splitview',
   },
   {
     command='sfirst',
     flags=bit.bor(EXTRA, BANG, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_rewind',
   },
   {
     command='simalt',
     flags=bit.bor(NEEDARG, WORD1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ni',
   },
   {
     command='sign',
     flags=bit.bor(NEEDARG, RANGE, NOTADR, EXTRA, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_sign',
   },
   {
     command='silent',
     flags=bit.bor(NEEDARG, EXTRA, BANG, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='sleep',
     flags=bit.bor(RANGE, NOTADR, COUNT, EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_sleep',
   },
   {
     command='slast',
     flags=bit.bor(EXTRA, BANG, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_last',
   },
   {
     command='smagic',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_submagic',
   },
   {
     command='smap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='smapclear',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mapclear',
   },
   {
     command='smenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='snext',
     flags=bit.bor(RANGE, NOTADR, BANG, FILES, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_next',
   },
   {
     command='snomagic',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_submagic',
   },
   {
     command='snoremap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='snoremenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='source',
     flags=bit.bor(BANG, FILE1, TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_source',
   },
   {
     command='sort',
     flags=bit.bor(RANGE, DFLALL, WHOLEFOLD, BANG, EXTRA, NOTRLCOM, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_sort',
   },
   {
     command='split',
     flags=bit.bor(BANG, FILE1, RANGE, NOTADR, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_splitview',
   },
   {
     command='spellgood',
     flags=bit.bor(BANG, RANGE, NOTADR, NEEDARG, EXTRA, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_spell',
   },
   {
     command='spelldump',
     flags=bit.bor(BANG, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_spelldump',
   },
   {
     command='spellinfo',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_spellinfo',
   },
   {
     command='spellrepall',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_spellrepall',
   },
   {
     command='spellundo',
     flags=bit.bor(BANG, RANGE, NOTADR, NEEDARG, EXTRA, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_spell',
   },
   {
     command='spellwrong',
     flags=bit.bor(BANG, RANGE, NOTADR, NEEDARG, EXTRA, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_spell',
   },
   {
     command='sprevious',
     flags=bit.bor(EXTRA, RANGE, NOTADR, COUNT, BANG, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_previous',
   },
   {
     command='srewind',
     flags=bit.bor(EXTRA, BANG, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_rewind',
   },
   {
     command='stop',
     flags=bit.bor(TRLBAR, BANG, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_stop',
   },
   {
     command='stag',
     flags=bit.bor(RANGE, NOTADR, BANG, WORD1, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_stag',
   },
   {
     command='startinsert',
     flags=bit.bor(BANG, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_startinsert',
   },
   {
     command='startgreplace',
     flags=bit.bor(BANG, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_startinsert',
   },
   {
     command='startreplace',
     flags=bit.bor(BANG, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_startinsert',
   },
   {
     command='stopinsert',
     flags=bit.bor(BANG, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_stopinsert',
   },
   {
     command='stjump',
     flags=bit.bor(BANG, TRLBAR, WORD1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_stag',
   },
   {
     command='stselect',
     flags=bit.bor(BANG, TRLBAR, WORD1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_stag',
   },
   {
     command='sunhide',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_buffer_all',
   },
   {
     command='sunmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_unmap',
   },
   {
     command='sunmenu',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='suspend',
     flags=bit.bor(TRLBAR, BANG, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_stop',
   },
   {
     command='sview',
     flags=bit.bor(BANG, FILE1, RANGE, NOTADR, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_splitview',
   },
   {
     command='swapname',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_swapname',
   },
   {
     command='syntax',
     flags=bit.bor(EXTRA, NOTRLCOM, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_syntax',
   },
   {
     command='syntime',
     flags=bit.bor(NEEDARG, WORD1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_syntime',
   },
   {
     command='syncbind',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_syncbind',
   },
   {
     command='t',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, TRLBAR, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_copymove',
   },
   {
     command='tcd',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cd',
   },
   {
     command='tchdir',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_cd',
   },
   {
     command='tNext',
     flags=bit.bor(RANGE, NOTADR, BANG, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_tag',
   },
   {
     command='tag',
     flags=bit.bor(RANGE, NOTADR, BANG, WORD1, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_tag',
   },
   {
     command='tags',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='do_tags',
   },
   {
     command='tab',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_wrongmodifier',
   },
   {
     command='tabclose',
     flags=bit.bor(BANG, RANGE, NOTADR, ZEROR, EXTRA, NOSPC, TRLBAR, CMDWIN),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_tabclose',
   },
   {
     command='tabdo',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM, RANGE, NOTADR, DFLALL),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_listdo',
   },
   {
     command='tabedit',
     flags=bit.bor(BANG, FILE1, RANGE, NOTADR, ZEROR, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_splitview',
   },
   {
     command='tabfind',
     flags=bit.bor(BANG, FILE1, RANGE, NOTADR, ZEROR, EDITCMD, ARGOPT, NEEDARG, TRLBAR),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_splitview',
   },
   {
     command='tabfirst',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_tabnext',
   },
   {
     command='tabmove',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, NOSPC, TRLBAR),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_tabmove',
   },
   {
     command='tablast',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_tabnext',
   },
   {
     command='tabnext',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, NOSPC, TRLBAR),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_tabnext',
   },
   {
     command='tabnew',
     flags=bit.bor(BANG, FILE1, RANGE, NOTADR, ZEROR, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_splitview',
   },
   {
     command='tabonly',
     flags=bit.bor(BANG, RANGE, NOTADR, ZEROR, EXTRA, NOSPC, TRLBAR, CMDWIN),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_tabonly',
   },
   {
     command='tabprevious',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, NOSPC, TRLBAR),
-    addr_type=ADDR_TABS_RELATIVE,
+    addr_type='ADDR_TABS_RELATIVE',
     func='ex_tabnext',
   },
   {
     command='tabNext',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, NOSPC, TRLBAR),
-    addr_type=ADDR_TABS_RELATIVE,
+    addr_type='ADDR_TABS_RELATIVE',
     func='ex_tabnext',
   },
   {
     command='tabrewind',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_tabnext',
   },
   {
     command='tabs',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_TABS,
+    addr_type='ADDR_TABS',
     func='ex_tabs',
   },
   {
     command='tcl',
     flags=bit.bor(RANGE,EXTRA,NEEDARG,CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_script_ni',
   },
   {
     command='tcldo',
     flags=bit.bor(RANGE,DFLALL,EXTRA,NEEDARG,CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ni',
   },
   {
     command='tclfile',
     flags=bit.bor(RANGE,FILE1,NEEDARG,CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ni',
   },
   {
     command='terminal',
     flags=bit.bor(BANG, FILES, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_terminal',
   },
   {
     command='tfirst',
     flags=bit.bor(RANGE, NOTADR, BANG, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_tag',
   },
   {
     command='throw',
     flags=bit.bor(EXTRA, NEEDARG, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_throw',
   },
   {
     command='tjump',
     flags=bit.bor(BANG, TRLBAR, WORD1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_tag',
   },
   {
     command='tlast',
     flags=bit.bor(BANG, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_tag',
   },
   {
     command='tmenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='tmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='tmapclear',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mapclear',
   },
   {
     command='tnext',
     flags=bit.bor(RANGE, NOTADR, BANG, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_tag',
   },
   {
     command='tnoremap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='topleft',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='tprevious',
     flags=bit.bor(RANGE, NOTADR, BANG, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_tag',
   },
   {
     command='trewind',
     flags=bit.bor(RANGE, NOTADR, BANG, TRLBAR, ZEROR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_tag',
   },
   {
     command='try',
     flags=bit.bor(TRLBAR, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_try',
   },
   {
     command='tselect',
     flags=bit.bor(BANG, TRLBAR, WORD1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_tag',
   },
   {
     command='tunmenu',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='tunmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_unmap',
   },
   {
     command='undo',
     flags=bit.bor(RANGE, NOTADR, COUNT, ZEROR, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_undo',
   },
   {
     command='undojoin',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_undojoin',
   },
   {
     command='undolist',
     flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_undolist',
   },
   {
     command='unabbreviate',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_abbreviate',
   },
   {
     command='unhide',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_buffer_all',
   },
   {
     command='unlet',
     flags=bit.bor(BANG, EXTRA, NEEDARG, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_unlet',
   },
   {
     command='unlockvar',
     flags=bit.bor(BANG, EXTRA, NEEDARG, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_lockvar',
   },
   {
     command='unmap',
     flags=bit.bor(BANG, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_unmap',
   },
   {
     command='unmenu',
     flags=bit.bor(BANG, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='unsilent',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='update',
     flags=bit.bor(RANGE, WHOLEFOLD, BANG, FILE1, ARGOPT, DFLALL, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_update',
   },
   {
     command='vglobal',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, DFLALL, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_global',
   },
   {
     command='version',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_version',
   },
   {
     command='verbose',
     flags=bit.bor(NEEDARG, RANGE, NOTADR, EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='vertical',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wrongmodifier',
   },
   {
     command='visual',
     flags=bit.bor(BANG, FILE1, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_edit',
   },
   {
     command='view',
     flags=bit.bor(BANG, FILE1, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_edit',
   },
   {
     command='vimgrep',
     flags=bit.bor(RANGE, NOTADR, BANG, NEEDARG, EXTRA, NOTRLCOM, TRLBAR, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_vimgrep',
   },
   {
     command='vimgrepadd',
     flags=bit.bor(RANGE, NOTADR, BANG, NEEDARG, EXTRA, NOTRLCOM, TRLBAR, XFILE),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_vimgrep',
   },
   {
     command='viusage',
     flags=bit.bor(TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_viusage',
   },
   {
     command='vmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='vmapclear',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mapclear',
   },
   {
     command='vmenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='vnoremap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='vnew',
     flags=bit.bor(BANG, FILE1, RANGE, NOTADR, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_splitview',
   },
   {
     command='vnoremenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='vsplit',
     flags=bit.bor(BANG, FILE1, RANGE, NOTADR, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_splitview',
   },
   {
     command='vunmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_unmap',
   },
   {
     command='vunmenu',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='write',
     flags=bit.bor(RANGE, WHOLEFOLD, BANG, FILE1, ARGOPT, DFLALL, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_write',
   },
   {
     command='wNext',
     flags=bit.bor(RANGE, WHOLEFOLD, NOTADR, BANG, FILE1, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wnext',
   },
   {
     command='wall',
     flags=bit.bor(BANG, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='do_wqall',
   },
   {
     command='while',
     flags=bit.bor(EXTRA, NOTRLCOM, SBOXOK, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_while',
   },
   {
     command='winsize',
     flags=bit.bor(EXTRA, NEEDARG, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_winsize',
   },
   {
     command='wincmd',
     flags=bit.bor(NEEDARG, WORD1, RANGE, NOTADR, CMDWIN),
-    addr_type=ADDR_WINDOWS,
+    addr_type='ADDR_WINDOWS',
     func='ex_wincmd',
   },
   {
     command='windo',
     flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM, RANGE, NOTADR, DFLALL),
-    addr_type=ADDR_WINDOWS,
+    addr_type='ADDR_WINDOWS',
     func='ex_listdo',
   },
   {
     command='winpos',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_ni',
   },
   {
     command='wnext',
     flags=bit.bor(RANGE, NOTADR, BANG, FILE1, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wnext',
   },
   {
     command='wprevious',
     flags=bit.bor(RANGE, NOTADR, BANG, FILE1, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wnext',
   },
   {
     command='wq',
     flags=bit.bor(RANGE, WHOLEFOLD, BANG, FILE1, ARGOPT, DFLALL, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_exit',
   },
   {
     command='wqall',
     flags=bit.bor(BANG, FILE1, ARGOPT, DFLALL, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='do_wqall',
   },
   {
     command='wshada',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_shada',
   },
   {
     command='wundo',
     flags=bit.bor(BANG, NEEDARG, FILE1),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_wundo',
   },
   {
     command='wviminfo',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_shada',
   },
   {
     command='xit',
     flags=bit.bor(RANGE, WHOLEFOLD, BANG, FILE1, ARGOPT, DFLALL, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_exit',
   },
   {
     command='xall',
     flags=bit.bor(BANG, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='do_wqall',
   },
   {
     command='xmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='xmapclear',
     flags=bit.bor(EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_mapclear',
   },
   {
     command='xmenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='xnoremap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_map',
   },
   {
     command='xnoremenu',
     flags=bit.bor(RANGE, NOTADR, ZEROR, EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='xunmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_unmap',
   },
   {
     command='xunmenu',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_menu',
   },
   {
     command='yank',
     flags=bit.bor(RANGE, WHOLEFOLD, REGSTR, COUNT, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_operators',
   },
   {
     command='z',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, EXFLAGS, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_z',
   },
   {
     command='!',
     enum='CMD_bang',
     flags=bit.bor(RANGE, WHOLEFOLD, BANG, FILES, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_bang',
   },
   {
     command='#',
     enum='CMD_pound',
     flags=bit.bor(RANGE, WHOLEFOLD, COUNT, EXFLAGS, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_print',
   },
   {
     command='&',
     enum='CMD_and',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_substitute',
   },
   {
     command='<',
     enum='CMD_lshift',
     flags=bit.bor(RANGE, WHOLEFOLD, COUNT, EXFLAGS, TRLBAR, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_operators',
   },
   {
     command='=',
     enum='CMD_equal',
     flags=bit.bor(RANGE, TRLBAR, DFLALL, EXFLAGS, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_equal',
   },
   {
     command='>',
     enum='CMD_rshift',
     flags=bit.bor(RANGE, WHOLEFOLD, COUNT, EXFLAGS, TRLBAR, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_operators',
   },
   {
     command='@',
     enum='CMD_at',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_at',
   },
   {
     command='Next',
     flags=bit.bor(EXTRA, RANGE, NOTADR, COUNT, BANG, EDITCMD, ARGOPT, TRLBAR),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_previous',
   },
   {
     command='~',
     enum='CMD_tilde',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, CMDWIN, MODIFY),
-    addr_type=ADDR_LINES,
+    addr_type='ADDR_LINES',
     func='ex_substitute',
   },
 }