- update to 3.1.5
- drop alex-3.1.4-ghc-7.10.patch, merged by upstream * Generate less warning-laden code, and suppress other warnings. * Bug fixes. OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/alex?expand=0&rev=45
This commit is contained in:
parent
b240037859
commit
2ae4bd7b8b
@ -1,24 +0,0 @@
|
|||||||
diff --git a/templates/wrappers.hs b/templates/wrappers.hs
|
|
||||||
index a1a1a6d..c020cc7 100644
|
|
||||||
--- a/templates/wrappers.hs
|
|
||||||
+++ b/templates/wrappers.hs
|
|
||||||
@@ -284,6 +284,19 @@ runAlex input (Alex f)
|
|
||||||
|
|
||||||
newtype Alex a = Alex { unAlex :: AlexState -> Either String (AlexState, a) }
|
|
||||||
|
|
||||||
+instance Functor Alex where
|
|
||||||
+ fmap f a = Alex $ \s -> case unAlex a s of
|
|
||||||
+ Left msg -> Left msg
|
|
||||||
+ Right (s', a') -> Right (s', f a')
|
|
||||||
+
|
|
||||||
+instance Applicative Alex where
|
|
||||||
+ pure a = Alex $ \s -> Right (s, a)
|
|
||||||
+ fa <*> a = Alex $ \s -> case unAlex fa s of
|
|
||||||
+ Left msg -> Left msg
|
|
||||||
+ Right (s', f) -> case unAlex a s' of
|
|
||||||
+ Left msg -> Left msg
|
|
||||||
+ Right (s'', b) -> Right (s'', f b)
|
|
||||||
+
|
|
||||||
instance Monad Alex where
|
|
||||||
m >>= k = Alex $ \s -> case unAlex m s of
|
|
||||||
Left msg -> Left msg
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:d64e4eccd953c62795ed566a6de5f3d150b653e05872ff697b3d9dbc961da19f
|
|
||||||
size 101827
|
|
3
alex-3.1.5.tar.gz
Normal file
3
alex-3.1.5.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:ddadb06546c2d5677482a943ceefad6990936367712bf6e6ceae251163092210
|
||||||
|
size 102419
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Nov 29 17:05:31 UTC 2015 - mimi.vx@gmail.com
|
||||||
|
|
||||||
|
- update to 3.1.5
|
||||||
|
- drop alex-3.1.4-ghc-7.10.patch, merged by upstream
|
||||||
|
* Generate less warning-laden code, and suppress other warnings.
|
||||||
|
* Bug fixes.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed May 13 09:19:35 UTC 2015 - mimi.vx@gmail.com
|
Wed May 13 09:19:35 UTC 2015 - mimi.vx@gmail.com
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
%bcond_without tests
|
%bcond_without tests
|
||||||
|
|
||||||
Name: alex
|
Name: alex
|
||||||
Version: 3.1.4
|
Version: 3.1.5
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Tool for generating lexical analysers in Haskell
|
Summary: Tool for generating lexical analysers in Haskell
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
@ -29,8 +29,6 @@ Group: Development/Languages/Other
|
|||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Url: http://hackage.haskell.org/package/%{name}
|
Url: http://hackage.haskell.org/package/%{name}
|
||||||
Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
|
Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
|
||||||
# PATCH-FIX-UPSTREAM alex-3.1.4-ghc-7.10.patch -- fix for new prelude in ghc-7.10 -- Sergei Trofimovich
|
|
||||||
Patch0: alex-3.1.4-ghc-7.10.patch
|
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: ghc-Cabal-devel
|
BuildRequires: ghc-Cabal-devel
|
||||||
@ -39,6 +37,7 @@ BuildRequires: ghc-array-devel
|
|||||||
BuildRequires: ghc-containers-devel
|
BuildRequires: ghc-containers-devel
|
||||||
BuildRequires: ghc-directory-devel
|
BuildRequires: ghc-directory-devel
|
||||||
BuildRequires: ghc-rpm-macros
|
BuildRequires: ghc-rpm-macros
|
||||||
|
BuildRequires: happy
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Alex is a tool for generating lexical analysers in Haskell. It takes a
|
Alex is a tool for generating lexical analysers in Haskell. It takes a
|
||||||
@ -48,7 +47,6 @@ lex or flex for C/C++.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ghc_bin_build
|
%ghc_bin_build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user