Use module helpers available in HsLua 1.0.3

Author: tarleb

hslua-module-system.cabal

@@ -31,7 +31,7 @@ library
                      , containers >= 0.5    && < 0.7
                      , directory  >= 1.3    && < 1.4
                      , exceptions >= 0.8    && < 0.11
-                     , hslua      >= 1.0    && < 1.2
+                     , hslua      >= 1.0.3  && < 1.2
                      , temporary  >= 1.2    && < 1.4
   default-extensions:  LambdaCase
   default-language:    Haskell2010

src/Foreign/Lua/Module/System.hs

@@ -59,29 +59,28 @@ import qualified System.IO.Temp as Temp
 pushModule :: Lua NumResults
 pushModule = do
   Lua.newtable
-  addField "arch" arch
-  addField "compiler_name" compiler_name
-  addField "compiler_version" compiler_version
-  addField "os" os
-  addFunction "env" env
-  addFunction "getenv" getenv
-  addFunction "getwd" getwd
-  addFunction "ls" ls
-  addFunction "mkdir" mkdir
-  addFunction "rmdir" rmdir
-  addFunction "setenv" setenv
-  addFunction "setwd" setwd
-  addFunction "tmpdirname" tmpdirname
-  addFunction "with_env" with_env
-  addFunction "with_tmpdir" with_tmpdir
-  addFunction "with_wd" with_wd
+  Lua.addfield "arch" arch
+  Lua.addfield "compiler_name" compiler_name
+  Lua.addfield "compiler_version" compiler_version
+  Lua.addfield "os" os
+  Lua.addfunction "env" env
+  Lua.addfunction "getenv" getenv
+  Lua.addfunction "getwd" getwd
+  Lua.addfunction "ls" ls
+  Lua.addfunction "mkdir" mkdir
+  Lua.addfunction "rmdir" rmdir
+  Lua.addfunction "setenv" setenv
+  Lua.addfunction "setwd" setwd
+  Lua.addfunction "tmpdirname" tmpdirname
+  Lua.addfunction "with_env" with_env
+  Lua.addfunction "with_tmpdir" with_tmpdir
+  Lua.addfunction "with_wd" with_wd
   return 1
 
 -- | Add the @system@ module under the given name to the table of
 -- preloaded packages.
 preloadModule :: String -> Lua ()
-preloadModule = flip addPackagePreloader pushModule
-
+preloadModule = flip Lua.preloadhs pushModule
 
 --
 -- Fields

src/Foreign/Lua/Module/SystemUtils.hs

@@ -11,45 +11,16 @@ Utility functions and types for HsLua's system module.
 module Foreign.Lua.Module.SystemUtils
   ( AnyValue (..)
   , Callback (..)
-  , addPackagePreloader
-  , addField
-  , addFunction
   , invoke
   , invokeWithFilePath
   , ioToLua
   )
 where
 
 import Control.Exception (IOException, try)
-import Foreign.Lua (Lua, NumResults(..), Peekable, Pushable,
-                    StackIndex, ToHaskellFunction)
-
+import Foreign.Lua (Lua, NumResults(..), Peekable, Pushable, StackIndex)
 import qualified Foreign.Lua as Lua
 
--- | Registers a preloading function. Takes an module name and the Lua
--- operation which produces the package.
-addPackagePreloader :: String -> Lua NumResults -> Lua ()
-addPackagePreloader name modulePusher = do
-  Lua.getfield Lua.registryindex Lua.preloadTableRegistryField
-  Lua.pushHaskellFunction modulePusher
-  Lua.setfield (-2) name
-  Lua.pop 1
-
--- | Add a string-indexed field to the table at the top of the stack.
-addField :: Pushable a => String -> a -> Lua ()
-addField name value = do
-  Lua.push name
-  Lua.push value
-  Lua.rawset (Lua.nthFromTop 3)
-
--- | Attach a function to the table at the top of the stack, using the
--- given name.
-addFunction :: ToHaskellFunction a => String -> a -> Lua ()
-addFunction name fn = do
-  Lua.push name
-  Lua.pushHaskellFunction fn
-  Lua.rawset (-3)
-
 -- | Lua callback function
 newtype Callback = Callback StackIndex
 

stack.yaml

@@ -1,3 +1,5 @@
 resolver: lts-13.18
 packages:
-- .
+  - .
+extra-deps:
+  - hslua-1.0.3