Hello community, here is the log from the commit of package ghc-hslua for openSUSE:Factory checked in at 2015-09-17 09:19:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-hslua (Old) and /work/SRC/openSUSE:Factory/.ghc-hslua.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-hslua" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-hslua/ghc-hslua.changes 2015-08-23 17:38:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-hslua.new/ghc-hslua.changes 2015-09-17 09:19:24.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Sep 13 12:46:14 UTC 2015 - mimi...@gmail.com + +- update to 0.4.1 +* Bugfix: tolist wasn't popping elements of the list from stack. + +------------------------------------------------------------------- Old: ---- hslua-0.4.0.tar.gz New: ---- hslua-0.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-hslua.spec ++++++ --- /var/tmp/diff_new_pack.JPVDph/_old 2015-09-17 09:19:25.000000000 +0200 +++ /var/tmp/diff_new_pack.JPVDph/_new 2015-09-17 09:19:25.000000000 +0200 @@ -19,7 +19,7 @@ %global pkg_name hslua Name: ghc-hslua -Version: 0.4.0 +Version: 0.4.1 Release: 0 Summary: A Lua language interpreter embedding in Haskell License: MIT ++++++ hslua-0.4.0.tar.gz -> hslua-0.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hslua-0.4.0/CHANGELOG.md new/hslua-0.4.1/CHANGELOG.md --- old/hslua-0.4.0/CHANGELOG.md 2015-05-29 16:26:15.000000000 +0200 +++ new/hslua-0.4.1/CHANGELOG.md 2015-09-08 23:23:09.000000000 +0200 @@ -1,5 +1,9 @@ ## Changelog +### 0.4.1 + +* Bugfix(#30): `tolist` wasn't popping elements of the list from stack. + ### 0.4.0 * `pushstring` and `tostring` now uses `ByteString` instead of `[Char]`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hslua-0.4.0/README.md new/hslua-0.4.1/README.md --- old/hslua-0.4.0/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/hslua-0.4.1/README.md 2015-09-08 23:23:09.000000000 +0200 @@ -0,0 +1,13 @@ +# hslua -- Lua interpreter interface for Haskell + +[](https://travis-ci.org/osa1/hslua) +[](https://coveralls.io/github/osa1/hslua?branch=master) +[](https://hackage.haskell.org/package/hslua) + +To use system-wide installed Lua/LuaJIT when linking hslua as a dependency, build/install your package using `--constraint="hslua +system-lua"` or for LuaJIT: `--constraint="hslua +system-lua +luajit"`. For example, you can install Pandoc with hslua that uses system-wide LuaJIT like this: + +``` +cabal install pandoc --constraint="hslua +system-lua +luajit" +``` + +(Note that `-fluajit` flag is added with hslua 0.3.14) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hslua-0.4.0/hslua.cabal new/hslua-0.4.1/hslua.cabal --- old/hslua-0.4.0/hslua.cabal 2015-05-29 16:26:15.000000000 +0200 +++ new/hslua-0.4.1/hslua.cabal 2015-09-08 23:23:09.000000000 +0200 @@ -1,5 +1,5 @@ name: hslua -version: 0.4.0 +version: 0.4.1 stability: beta cabal-version: >= 1.8 license: MIT @@ -18,6 +18,7 @@ [Example programs](https://github.com/osa1/hslua/tree/master/examples) category: Scripting extra-source-files: lua-5.1.5/*.h + README.md CHANGELOG.md COPYRIGHT examples/callbacks/callbacks.lua @@ -41,7 +42,7 @@ default: False library - build-depends: base == 4.*, bytestring >= 0.10 && < 0.11 + build-depends: base == 4.*, bytestring >= 0.10.2.0 && < 0.11 exposed-modules: Scripting.Lua, Scripting.Lua.Raw hs-source-dirs: src ghc-options: -Wall -O2 @@ -121,4 +122,6 @@ hspec, hspec-contrib, HUnit, - text + text, + QuickCheck >= 2.7, + quickcheck-instances diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hslua-0.4.0/src/Scripting/Lua.hsc new/hslua-0.4.1/src/Scripting/Lua.hsc --- old/hslua-0.4.0/src/Scripting/Lua.hsc 2015-05-29 16:26:15.000000000 +0200 +++ new/hslua-0.4.1/src/Scripting/Lua.hsc 2015-09-08 23:23:09.000000000 +0200 @@ -1,5 +1,10 @@ {-# LANGUAGE FlexibleInstances, ForeignFunctionInterface, ScopedTypeVariables #-} +-- In older versions of GHC, FlexibleInstances doesn't imply +-- TypeSynonymInstances, so we need to enable it explicitly. +-- See #29. +{-# LANGUAGE TypeSynonymInstances #-} + module Scripting.Lua ( LuaState , LuaCFunction @@ -137,6 +142,7 @@ iter (i : is) = do rawgeti l n i ret <- peek l (-1) + pop l 1 case ret of Nothing -> return Nothing Just val -> do @@ -638,11 +644,11 @@ Just v -> luaimport' (narg+1) (x v) l Nothing -> do t <- ltype l narg - exp <- typename l (valuetype (fromJust arg)) + expected <- typename l (valuetype (fromJust arg)) got <- typename l t luaimportargerror narg (Prelude.concat ["argument ", show narg, " of Haskell function: ", - exp, " expected, got ", got]) + expected, " expected, got ", got]) (x undefined) l foreign import ccall "wrapper" mkWrapper :: LuaCFunction -> IO (FunPtr LuaCFunction) @@ -714,10 +720,11 @@ case r of Just x -> return x Nothing -> do - exp <- typename l (valuetype (fromJust r)) + expected <- typename l (valuetype (fromJust r)) t <- ltype l (-1) got <- typename l t - fail ("Incorrect result type (" ++ exp ++ " expected, got " ++ got ++ ")") + fail $ Prelude.concat + [ "Incorrect result type (", expected, " expected, got ", got, ")" ] instance (StackValue t, LuaCallProc b) => LuaCallProc (t -> b) where callproc' l f a k x = callproc' l f (a >> push l x) (k+1)
