Skip to content

Commit 260f841

Browse files
committed
fix some package usage
1 parent d1105c1 commit 260f841

2 files changed

Lines changed: 30 additions & 9 deletions

File tree

develop/testing/realloc_tests.lua

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@ local evo = require 'evolved'
22

33
---@type ffilib?
44
local ffi = (function()
5-
local ffi_loader = package and package.preload and package.preload['ffi']
6-
local ffi = ffi_loader and ffi_loader()
7-
return ffi
5+
if package and package.loaded then
6+
local loaded_ffi = package.loaded.ffi
7+
if loaded_ffi then return loaded_ffi end
8+
end
9+
10+
if package and package.preload then
11+
local ffi_loader = package.preload.ffi
12+
if ffi_loader then return ffi_loader() end
13+
end
814
end)()
915

1016
if not ffi then

evolved.lua

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,13 @@ local __lua_table_new = (function()
243243
if table_create then return function(nseq) return table_create(nseq or 0) end end
244244
end
245245

246-
do
247-
local table_new_loader = package and package.preload and package.preload['table.new']
246+
if package and package.loaded then
247+
local loaded_table_create = package.loaded.table and package.loaded.table.create
248+
if loaded_table_create then return function(nseq) return loaded_table_create(nseq or 0) end end
249+
end
250+
251+
if package and package.preload then
252+
local table_new_loader = package.preload['table.new']
248253
local table_new = table_new_loader and table_new_loader()
249254
if table_new then return function(nseq) return table_new(nseq or 0, 0) end end
250255
end
@@ -265,8 +270,13 @@ local __lua_table_clear = (function()
265270
if table_clear then return table_clear end
266271
end
267272

268-
do
269-
local table_clear_loader = package and package.preload and package.preload['table.clear']
273+
if package and package.loaded then
274+
local loaded_table_clear = package.loaded.table and package.loaded.table.clear
275+
if loaded_table_clear then return loaded_table_clear end
276+
end
277+
278+
if package and package.preload then
279+
local table_clear_loader = package.preload['table.clear']
270280
local table_clear = table_clear_loader and table_clear_loader()
271281
if table_clear then return table_clear end
272282
end
@@ -299,8 +309,13 @@ local __lua_table_move = (function()
299309
if table_move then return table_move end
300310
end
301311

302-
do
303-
local table_move_loader = package and package.preload and package.preload['table.move']
312+
if package and package.loaded then
313+
local loaded_table_move = package.loaded.table and package.loaded.table.move
314+
if loaded_table_move then return loaded_table_move end
315+
end
316+
317+
if package and package.preload then
318+
local table_move_loader = package.preload['table.move']
304319
local table_move = table_move_loader and table_move_loader()
305320
if table_move then return table_move end
306321
end

0 commit comments

Comments
 (0)