diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-06-16 19:57:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-16 19:57:28 +0200 |
| commit | b006771cba7b9db6f0b4214b2251e3dd742a1228 (patch) | |
| tree | 2e25a57d18399f6cf6c709c4cc14827d5e31a5b9 | |
| parent | a503349e200dba09f5fc93363a3fc3a64dd7eeab (diff) | |
| parent | 1cc3b32f4c6c52203d070c5bb2d88c27aa65ffbc (diff) | |
| download | rneovim-b006771cba7b9db6f0b4214b2251e3dd742a1228.tar.gz rneovim-b006771cba7b9db6f0b4214b2251e3dd742a1228.tar.bz2 rneovim-b006771cba7b9db6f0b4214b2251e3dd742a1228.zip | |
Merge #8570 'gen_events.lua: define NUM_EVENTS as enum'
| -rw-r--r-- | cmake/RunTests.cmake | 6 | ||||
| -rw-r--r-- | src/nvim/generators/gen_events.lua | 15 |
2 files changed, 9 insertions, 12 deletions
diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake index 5b62fd72c9..a51990e925 100644 --- a/cmake/RunTests.cmake +++ b/cmake/RunTests.cmake @@ -24,12 +24,12 @@ if(BUSTED_OUTPUT_TYPE STREQUAL junit) set(EXTRA_ARGS OUTPUT_FILE ${BUILD_DIR}/${TEST_TYPE}test-junit.xml) endif() -if(DEFINED ENV{TEST_TAG}) +if(DEFINED ENV{TEST_TAG} AND NOT "$ENV{TEST_TAG}" STREQUAL "") set(TEST_TAG "--tags=$ENV{TEST_TAG}") endif() -if(DEFINED ENV{TEST_FILTER}) - set(TEST_TAG "--filter=$ENV{TEST_FILTER}") +if(DEFINED ENV{TEST_FILTER} AND NOT "$ENV{TEST_FILTER}" STREQUAL "") + set(TEST_FILTER "--filter=$ENV{TEST_FILTER}") endif() execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${WORKING_DIR}/Xtest-tmpdir) 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 |