hslua-cli 1.4.2 → 1.4.3

raw patch · 4 files changed

+27/−13 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

CHANGELOG.md +10/−0
LICENSE +1/−1
hslua-cli.cabal +4/−3
src/HsLua/CLI.hs +12/−9

CHANGELOG.md view

@@ -2,6 +2,16 @@  `hslua-cli` uses [PVP Versioning](https://pvp.haskell.org). +## hslua-cli-1.4.3++Release pending.++-   Include copyright notice when printing version info; i.e., the+    behavior is now closer to that of the default `lua`+    interpreter.++-   Avoid "redundant import" warning when compiling with GHC 9.10.+ ## hslua-cli-1.4.2  Released 2024-01-18.

LICENSE view

@@ -1,4 +1,4 @@-Copyright © 1994-2022 Lua.org, PUC-Rio.+Copyright © 1994-2023 Lua.org, PUC-Rio. Copyright © 2007-2012 Gracjan Polak Copyright © 2012-2015 Ömer Sinan Ağacan Copyright © 2016-2024 Albert Krewinkel

hslua-cli.cabal view

@@ -1,6 +1,6 @@ cabal-version:       2.2 name:                hslua-cli-version:             1.4.2+version:             1.4.3 synopsis:            Command-line interface for Lua description:         Provides an embeddable command-line interface for Lua.                      The interface is compatible with the standard Lua@@ -24,8 +24,9 @@                    , GHC == 9.0.2                    , GHC == 9.2.8                    , GHC == 9.4.8-                   , GHC == 9.6.3-                   , GHC == 9.8.1+                   , GHC == 9.6.5+                   , GHC == 9.8.2+                   , GHC == 9.10.1  source-repository head   type:                git

src/HsLua/CLI.hs view

@@ -1,6 +1,7 @@ {-# LANGUAGE CPP               #-} {-# LANGUAGE LambdaCase        #-} {-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE PatternSynonyms   #-} {- | Module      : HsLua.CLI Copyright   : Copyright © 2017-2024 Albert Krewinkel@@ -19,21 +20,24 @@ import Control.Monad (unless, void, when, zipWithM_) import Data.Bifunctor (first) import Data.ByteString (ByteString)-import Data.Foldable (foldl') import Data.Maybe (listToMaybe) import Data.Text (Text) import Foreign.C.String (withCString)+import Lua (pattern LUA_COPYRIGHT) import HsLua.Core (LuaE, LuaError) import HsLua.REPL (Config (..), defaultConfig, repl, setup) import System.Console.GetOpt import System.Environment (lookupEnv)+import qualified Data.Text as T+import qualified Data.Text.IO as T import qualified Lua.Constants as Lua import qualified Lua.Primary as Lua import qualified HsLua.Core as Lua-import qualified HsLua.Marshalling as Lua-import qualified Data.Text as T-import qualified Data.Text.IO as T import qualified HsLua.Core.Utf8 as UTF8+import qualified HsLua.Marshalling as Lua+#if !MIN_VERSION_base(4,20,0)+import Data.Foldable (foldl')+#endif  #ifndef _WINDOWS import System.Posix.IO (stdOutput)@@ -94,11 +98,10 @@     }  -- | Print version information to the terminal.-showVersion :: LuaError e => Text -> LuaE e ()+showVersion :: Text -> LuaE e () showVersion extraInfo = do-  _ <- Lua.getglobal "_VERSION"-  versionString <- Lua.forcePeek $ Lua.peekText Lua.top `Lua.lastly` Lua.pop 1-  Lua.liftIO . T.putStrLn $ versionString `T.append` extraInfo+  let copyrightString = T.pack LUA_COPYRIGHT+  Lua.liftIO . T.putStrLn $ copyrightString `T.append` extraInfo  -- | Runs code given on the command line runCode :: LuaError e => LuaCode -> LuaE e ()@@ -245,7 +248,7 @@    , Option "i" []     (NoArg $ \opt -> opt { optInteractive = True })-    "interactive mode -- currently not supported"+    "interactive mode"    , Option "l" []     (flip ReqArg "mod" $ \mod' opt ->