Skip to content

Commit 1ea6512

Browse files
committed
refactor function names
1 parent b680c53 commit 1ea6512

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

scripts/update_builtin_commands.vim

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function! s:Trie.remove(s) abort
7272
return v:true
7373
endfunction
7474

75-
function! s:gen(ex_cmds_h) abort
75+
function! s:parse(ex_cmds_h) abort
7676
let lines = readfile(a:ex_cmds_h)
7777

7878
" { 'name': string, 'flags': string, 'minlen': int, 'parser': string}
@@ -100,14 +100,14 @@ function! s:gen(ex_cmds_h) abort
100100
return cmds
101101
endfunction
102102

103-
function! s:gen_new_builtin(existing, latest) abort
103+
function! s:diff(existing, latest) abort
104104
let existing_names = {}
105105
for cmd in a:existing
106106
let existing_names[cmd.name] = v:true
107107
endfor
108108
let newcmds = []
109109
for cmd in filter(copy(a:latest), {_, c -> !has_key(existing_names, c.name)})
110-
let newcmds = add(newcmds, extend(cmd, {'parser': 'parse_cmd_common'}))
110+
let newcmds = add(newcmds, cmd)
111111
endfor
112112
return newcmds
113113
endfunction
@@ -125,8 +125,9 @@ endfunction
125125
" ex_cmds_h: path to vim/src/ex_cmds.h
126126
function! VimLParserNewCmds(ex_cmds_h) abort
127127
let vimlparser = vimlparser#import()
128-
let latest = s:gen(a:ex_cmds_h)
129-
let new_cmds = s:gen_new_builtin(vimlparser#import().VimLParser.builtin_commands, latest)
128+
let latest = s:parse(a:ex_cmds_h)
129+
let new_cmds = s:diff(vimlparser#import().VimLParser.builtin_commands, latest)
130+
call map(new_cmds, {_,cmd -> extend(cmd, {'parser': 'parse_cmd_common'})})
130131
let generated_text = s:gen_viml(new_cmds)
131132
if generated_text ==# ''
132133
verbose echo 's:VimLParser.builtin_commands in autoload/vimlparser.vim is up-to-date.'

scripts/update_builtin_functions.vim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function! s:get_parse_lines(lines) abort
1212
return map(range(from + 1, to - 1), {_,i -> a:lines[i] })
1313
endfunction
1414

15-
function! s:gen(evalfunc_c) abort
15+
function! s:parse(evalfunc_c) abort
1616
let lines = readfile(a:evalfunc_c)
1717

1818
" { 'name': string, 'min_argc': integer, 'max_argc': integer }
@@ -32,7 +32,7 @@ function! s:gen(evalfunc_c) abort
3232
return funcs
3333
endfunction
3434

35-
function! s:gen_new_builtin(existing, latest) abort
35+
function! s:diff(existing, latest) abort
3636
let existing_names = {}
3737
for func in a:existing
3838
let existing_names[func.name] = v:true
@@ -60,8 +60,8 @@ endfunction
6060
" evalfunc_c: path to vim/src/evalfunc.c
6161
function! VimLParserNewFuncs(evalfunc_c) abort
6262
let vimlparser = vimlparser#import()
63-
let latest = s:gen(a:evalfunc_c)
64-
let new_funcs = s:gen_new_builtin(vimlparser#import().VimLParser.builtin_functions, latest)
63+
let latest = s:parse(a:evalfunc_c)
64+
let new_funcs = s:diff(vimlparser#import().VimLParser.builtin_functions, latest)
6565
let generated_text = s:gen_viml(new_funcs)
6666
if generated_text ==# ''
6767
verbose echo 's:VimLParser.builtin_functions in autoload/vimlparser.vim is up-to-date.'

0 commit comments

Comments
 (0)