Lua filters: perform minor code clean-up

Change: minor
This commit is contained in:
Albert Krewinkel
2017-12-18 18:10:08 +01:00
parent 808f6d3fa1
commit 70dc5834da
2 changed files with 8 additions and 11 deletions
+4 -4
View File
@@ -50,8 +50,7 @@ import qualified Foreign.Lua.Module.Text as Lua
-- initalization.
runPandocLua :: Lua a -> PandocIO (Either LuaException a)
runPandocLua luaOp = do
datadir <- getUserDataDir
luaPkgParams <- luaPackageParams datadir
luaPkgParams <- luaPackageParams
enc <- liftIO $ getForeignEncoding <* setForeignEncoding utf8
res <- liftIO $ Lua.runLuaEither (initLuaState luaPkgParams *> luaOp)
liftIO $ setForeignEncoding enc
@@ -60,9 +59,10 @@ runPandocLua luaOp = do
return res
-- | Generate parameters required to setup pandoc's lua environment.
luaPackageParams :: Maybe FilePath -> PandocIO LuaPackageParams
luaPackageParams datadir = do
luaPackageParams :: PandocIO LuaPackageParams
luaPackageParams = do
commonState <- getCommonState
datadir <- getUserDataDir
mbRef <- liftIO . newIORef =<< getMediaBag
return LuaPackageParams
{ luaPkgCommonState = commonState
+4 -7
View File
@@ -71,16 +71,13 @@ pushPandocModule datadir = do
return 1
walkElement :: (ToLuaStack a, Walkable [Inline] a, Walkable [Block] a)
=> a -> LuaFilter -> Lua NumResults
walkElement x f = do
x' <- walkInlines f x >>= walkBlocks f
Lua.push x'
return 1
=> a -> LuaFilter -> Lua a
walkElement x f = walkInlines f x >>= walkBlocks f
walkInline :: Inline -> LuaFilter -> Lua NumResults
walkInline :: Inline -> LuaFilter -> Lua Inline
walkInline = walkElement
walkBlock :: Block -> LuaFilter -> Lua NumResults
walkBlock :: Block -> LuaFilter -> Lua Block
walkBlock = walkElement
readDoc :: String -> String -> Lua NumResults