70dc583 · typeable/pandoc

git.iko.soy/typeable/pandoc

Lua filters: perform minor code clean-up

Change: minor

commit70dc5834da16680caedef4727b1d7f335f0b5427 authorAlbert Krewinkel <albert@zeitkraut.de> dateMon 18 Dec 2017, 14:24 (9 years ago) parent808f6d3

2 files changed+8−11

compare with master

unifiedsplit

src/Text/Pandoc/Lua/Init.hs+4−4 src/Text/Pandoc/Lua/PandocModule.hs+4−7

src/Text/Pandoc/Lua/Init.hs+4−4

@@ -50,8 +50,7 @@ import qualified Foreign.Lua.Module.Text as Lua

5050-- initalization.

5151runPandocLua :: Lua a -> PandocIO (Either LuaException a)

5252runPandocLua luaOp = do

53− datadir <- getUserDataDir

54− luaPkgParams <- luaPackageParams datadir

53+ luaPkgParams <- luaPackageParams

5554 enc <- liftIO $ getForeignEncoding <* setForeignEncoding utf8

5655 res <- liftIO $ Lua.runLuaEither (initLuaState luaPkgParams *> luaOp)

5756 liftIO $ setForeignEncoding enc

@@ -60,9 +59,10 @@ runPandocLua luaOp = do

6059 return res

6160

6261-- | Generate parameters required to setup pandoc's lua environment.

63−luaPackageParams :: Maybe FilePath -> PandocIO LuaPackageParams

64−luaPackageParams datadir = do

62+luaPackageParams :: PandocIO LuaPackageParams

63+luaPackageParams = do

6564 commonState <- getCommonState

65+ datadir <- getUserDataDir

6666 mbRef <- liftIO . newIORef =<< getMediaBag

6767 return LuaPackageParams

6868 { luaPkgCommonState = commonState

src/Text/Pandoc/Lua/PandocModule.hs+4−7

@@ -71,16 +71,13 @@ pushPandocModule datadir = do

7171 return 1

7272

7373walkElement :: (ToLuaStack a, Walkable [Inline] a, Walkable [Block] a)

74− => a -> LuaFilter -> Lua NumResults

75−walkElement x f = do

76− x' <- walkInlines f x >>= walkBlocks f

77− Lua.push x'

78− return 1

74+ => a -> LuaFilter -> Lua a

75+walkElement x f = walkInlines f x >>= walkBlocks f

7976

80−walkInline :: Inline -> LuaFilter -> Lua NumResults

77+walkInline :: Inline -> LuaFilter -> Lua Inline

8178walkInline = walkElement

8279

83−walkBlock :: Block -> LuaFilter -> Lua NumResults

80+walkBlock :: Block -> LuaFilter -> Lua Block

8481walkBlock = walkElement

8582

8683readDoc :: String -> String -> Lua NumResults