mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 12:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

unittest: fix handling of pragma pack in cimport

Browse Source
This commit is contained in:
Stefan Hoffmann
2014-10-26 11:20:19 +01:00
parent 34ec5a9f81
commit 741cb5be08
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/unit/helpers.lua
View File

@@ -25,6 +25,10 @@ if imported == nil then
imported = Set:new() imported = Set:new()
end end
if pragma_pack_id == nil then
pragma_pack_id = 1
end
-- some things are just too complex for the LuaJIT C parser to digest. We -- some things are just too complex for the LuaJIT C parser to digest. We
-- usually don't need them anyway. -- usually don't need them anyway.
local function filter_complex_blocks(body) local function filter_complex_blocks(body)
@@ -81,7 +85,16 @@ local function cimport(...)
-- add the formatted lines to a set -- add the formatted lines to a set
local new_cdefs = Set:new() local new_cdefs = Set:new()
for line in body:gmatch("[^\r\n]+") do for line in body:gmatch("[^\r\n]+") do
new_cdefs:add(trim(line)) line = trim(line)
-- give each #pragma pack an unique id, so that they don't get removed
-- if they are inserted into the set
-- (they are needed in the right order with the struct definitions,
-- otherwise luajit has wrong memory layouts for the sturcts)
if line:match("#pragma%s+pack") then
line = line .. " // " .. pragma_pack_id
pragma_pack_id = pragma_pack_id + 1
end
new_cdefs:add(line)
end end
-- subtract the lines we've already imported from the new lines, then add -- subtract the lines we've already imported from the new lines, then add