diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2018-06-16 01:40:38 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2018-06-16 01:57:30 +0200 |
commit | 2a274cbe308f681ca50f5a159580a066bbcd43df (patch) | |
tree | 8f6682662235f9efcdd4d049707bab805fb19228 | |
parent | eeeaf04c5ecd4471c8a01c87d935e2c0e563272e (diff) | |
download | rneovim-2a274cbe308f681ca50f5a159580a066bbcd43df.tar.gz rneovim-2a274cbe308f681ca50f5a159580a066bbcd43df.tar.bz2 rneovim-2a274cbe308f681ca50f5a159580a066bbcd43df.zip |
gen_events.lua: define NUM_EVENTS as an enum value
Fix PVS warnings:
fileio.c:7293 Medium V547 Expression is always true.
fileio.c:7351 Medium V547 Expression 'event == 100' is always false.
event_name2nr returns event_T, so PVS infers that nothing outside of
that range could possibly be returned.
-rw-r--r-- | src/nvim/generators/gen_events.lua | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/nvim/generators/gen_events.lua b/src/nvim/generators/gen_events.lua index 75e0b3da3a..d03c787b2b 100644 --- a/src/nvim/generators/gen_events.lua +++ b/src/nvim/generators/gen_events.lua @@ -25,25 +25,22 @@ static const struct event_name { } event_names[] = {]]) for i, event in ipairs(events) do - if i > 1 then - comma = ',\n' - else - comma = '\n' + enum_tgt:write(('\n EVENT_%s = %u,'):format(event:upper(), i - 1)) + names_tgt:write(('\n {%u, "%s", EVENT_%s},'):format(#event, event, event:upper())) + if i == #events then -- Last item. + enum_tgt:write(('\n NUM_EVENTS = %u,'):format(i)) end - enum_tgt:write(('%s EVENT_%s = %u'):format(comma, event:upper(), i - 1)) - names_tgt:write(('%s {%u, "%s", EVENT_%s}'):format(comma, #event, event, event:upper())) end for alias, event in pairs(aliases) do - names_tgt:write((',\n {%u, "%s", EVENT_%s}'):format(#alias, alias, event:upper())) + names_tgt:write(('\n {%u, "%s", EVENT_%s},'):format(#alias, alias, event:upper())) end -names_tgt:write(',\n {0, NULL, (event_T)0}') +names_tgt:write('\n {0, NULL, (event_T)0},') enum_tgt:write('\n} event_T;\n') names_tgt:write('\n};\n') -enum_tgt:write(('\n#define NUM_EVENTS %u\n'):format(#events)) names_tgt:write('\nstatic AutoPat *first_autopat[NUM_EVENTS] = {\n ') line_len = 1 for i = 1,((#events) - 1) do |