1cd785f · typeable/pandoc

git.iko.soy/typeable/pandoc

Lua filters: fix package loading for Lua 5.1

The list of package searchers is named `package.loaders` in Lua 5.1 and LuaJIT, and `package.searchers` in Lua 5.2 and later.

commit1cd785fe33231a15423dea7d26cb9a7d770a7ace authorAlbert Krewinkel <albert@zeitkraut.de> dateSun 10 Dec 2017, 21:43 (9 years ago) parent544494d

1 file changed+4−1

unifiedsplit

src/Text/Pandoc/Lua/Packages.hs+4−1

@@ -53,7 +53,10 @@ data LuaPackageParams = LuaPackageParams

5353-- | Insert pandoc's package loader as the first loader, making it the default.

5454installPandocPackageSearcher :: LuaPackageParams -> Lua ()

5555installPandocPackageSearcher luaPkgParams = do

56− Lua.getglobal' "package.searchers"

56+ luaVersion <- Lua.getglobal "_VERSION" *> Lua.peek (-1)

57+ if luaVersion == "Lua 5.1"

58+ then Lua.getglobal' "package.loaders"

59+ else Lua.getglobal' "package.searchers"

5760 shiftArray

5861 Lua.pushHaskellFunction (pandocPackageSearcher luaPkgParams)

5962 Lua.wrapHaskellFunction