1 files changed, 27 insertions, 18 deletions
diff --git a/src/Text/Pandoc/Lua/Packages.hs b/src/Text/Pandoc/Lua/Packages.hs
index 2f1c139db..c36c3c670 100644
--- a/src/Text/Pandoc/Lua/Packages.hs
+++ b/src/Text/Pandoc/Lua/Packages.hs
@@ -1,3 +1,6 @@
+{-# LANGUAGE FlexibleContexts  #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeApplications  #-}
 {- |
    Module      : Text.Pandoc.Lua.Packages
    Copyright   : Copyright © 2017-2021 Albert Krewinkel
@@ -13,12 +16,13 @@ module Text.Pandoc.Lua.Packages
   ) where
 
 import Control.Monad (forM_)
-import Foreign.Lua (NumResults)
-import Text.Pandoc.Lua.PandocLua (PandocLua, liftPandocLua, loadDefaultModule)
+import Text.Pandoc.Error (PandocError)
+import Text.Pandoc.Lua.Marshal.List (pushListModule)
+import Text.Pandoc.Lua.PandocLua (PandocLua, liftPandocLua)
 
-import qualified Foreign.Lua as Lua
-import qualified Foreign.Lua.Module.Path as Path
-import qualified Foreign.Lua.Module.Text as Text
+import qualified HsLua as Lua
+import qualified HsLua.Module.Path as Path
+import qualified HsLua.Module.Text as Text
 import qualified Text.Pandoc.Lua.Module.Pandoc as Pandoc
 import qualified Text.Pandoc.Lua.Module.MediaBag as MediaBag
 import qualified Text.Pandoc.Lua.Module.System as System
@@ -30,8 +34,8 @@ installPandocPackageSearcher :: PandocLua ()
 installPandocPackageSearcher = liftPandocLua $ do
   Lua.getglobal' "package.searchers"
   shiftArray
-  Lua.pushHaskellFunction pandocPackageSearcher
-  Lua.rawseti (Lua.nthFromTop 2) 1
+  Lua.pushHaskellFunction $ Lua.toHaskellFunction pandocPackageSearcher
+  Lua.rawseti (Lua.nth 2) 1
   Lua.pop 1           -- remove 'package.searchers' from stack
  where
   shiftArray = forM_ [4, 3, 2, 1] $ \i -> do
@@ -39,22 +43,27 @@ installPandocPackageSearcher = liftPandocLua $ do
     Lua.rawseti (-2) (i + 1)
 
 -- | Load a pandoc module.
-pandocPackageSearcher :: String -> PandocLua NumResults
+pandocPackageSearcher :: String -> PandocLua Lua.NumResults
 pandocPackageSearcher pkgName =
   case pkgName of
-    "pandoc"          -> pushWrappedHsFun Pandoc.pushModule
-    "pandoc.mediabag" -> pushWrappedHsFun MediaBag.pushModule
-    "pandoc.path"     -> pushWrappedHsFun Path.pushModule
-    "pandoc.system"   -> pushWrappedHsFun System.pushModule
-    "pandoc.types"    -> pushWrappedHsFun Types.pushModule
-    "pandoc.utils"    -> pushWrappedHsFun Utils.pushModule
-    "text"            -> pushWrappedHsFun Text.pushModule
-    "pandoc.List"     -> pushWrappedHsFun (loadDefaultModule pkgName)
+    "pandoc"          -> pushModuleLoader Pandoc.documentedModule
+    "pandoc.mediabag" -> pushModuleLoader MediaBag.documentedModule
+    "pandoc.path"     -> pushModuleLoader Path.documentedModule
+    "pandoc.system"   -> pushModuleLoader System.documentedModule
+    "pandoc.types"    -> pushModuleLoader Types.documentedModule
+    "pandoc.utils"    -> pushModuleLoader Utils.documentedModule
+    "text"            -> pushModuleLoader Text.documentedModule
+    "pandoc.List"     -> pushWrappedHsFun . Lua.toHaskellFunction @PandocError $
+                         (Lua.NumResults 1 <$ pushListModule @PandocError)
     _                 -> reportPandocSearcherFailure
  where
+  pushModuleLoader mdl = liftPandocLua $ do
+    Lua.pushHaskellFunction $
+      Lua.NumResults 1 <$ Lua.pushModule @PandocError mdl
+    return (Lua.NumResults 1)
   pushWrappedHsFun f = liftPandocLua $ do
     Lua.pushHaskellFunction f
     return 1
   reportPandocSearcherFailure = liftPandocLua $ do
-    Lua.push ("\n\t" <> pkgName <> "is not one of pandoc's default packages")
-    return (1 :: NumResults)
+    Lua.push ("\n\t" <> pkgName <> " is not one of pandoc's default packages")
+    return (Lua.NumResults 1)