Skip to content

Commit ddfb7bb

Browse files
committed
Extract common stanza in happy-lib, fix deprecation warning
1 parent 16b576b commit ddfb7bb

3 files changed

Lines changed: 13 additions & 29 deletions

File tree

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
packages:
2-
happy.cabal
32
lib/happy-lib.cabal
3+
happy.cabal

lib/frontend/src/Happy/Frontend/AttrGrammar/Mangler.lhs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manipulation and let binding goop
66
(c) 1993-2001 Andy Gill, Simon Marlow
77
-----------------------------------------------------------------------------
88

9-
> {-# LANGUAGE PatternSignatures #-}
9+
> {-# LANGUAGE ScopedTypeVariables #-}
1010
> module Happy.Frontend.AttrGrammar.Mangler (rewriteAttributeGrammar) where
1111

1212
> import Happy.Grammar

lib/happy-lib.cabal

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -65,29 +65,25 @@ source-repository head
6565
type: git
6666
location: https://github.com/haskell/happy.git
6767

68+
common common-stanza
69+
default-language: Haskell98
70+
default-extensions: CPP, MagicHash, FlexibleContexts, NamedFieldPuns
71+
ghc-options: -Wall -Wno-incomplete-uni-patterns
72+
6873
library grammar
74+
import: common-stanza
6975
hs-source-dirs: grammar/src
70-
7176
exposed-modules: Happy.Grammar
7277
build-depends: base < 5, array
7378

74-
default-language: Haskell98
75-
default-extensions: CPP, MagicHash, FlexibleContexts
76-
ghc-options: -Wall
77-
other-modules:
78-
7979
library frontend
80+
import: common-stanza
8081
hs-source-dirs: frontend/src
8182
exposed-modules: Happy.Frontend,
8283
Happy.Frontend.AbsSyn,
8384
Happy.Frontend.Mangler,
8485
Happy.Frontend.PrettyGrammar
85-
8686
build-depends: base < 5, array, transformers, containers, mtl, happy-lib:grammar
87-
88-
default-language: Haskell98
89-
default-extensions: CPP, MagicHash, FlexibleContexts
90-
ghc-options: -Wall -Wno-incomplete-uni-patterns
9187
other-modules:
9288
Happy.Frontend.ParseMonad
9389
Happy.Frontend.ParseMonad.Class
@@ -100,46 +96,36 @@ library frontend
10096
Happy.Frontend.AttrGrammar.Mangler
10197

10298
library tabular
99+
import: common-stanza
103100
hs-source-dirs: tabular/src
104-
105101
exposed-modules: Happy.Tabular,
106102
Happy.Tabular.First,
107103
Happy.Tabular.Info,
108104
Happy.Tabular.LALR,
109105
Happy.Tabular.NameSet
110106
build-depends: base < 5, array, containers, happy-lib:grammar
111107

112-
default-language: Haskell98
113-
default-extensions: CPP, MagicHash, FlexibleContexts, NamedFieldPuns
114-
ghc-options: -Wall
115108

116109
library backend-lalr
110+
import: common-stanza
117111
hs-source-dirs: backend-lalr/src
118-
119112
exposed-modules: Happy.Backend.LALR,
120113
Happy.Backend.LALR.ProduceCode
121114
build-depends: base < 5, array, happy-lib:grammar, happy-lib:tabular
122-
123-
default-language: Haskell98
124-
default-extensions: CPP, MagicHash, FlexibleContexts
125-
ghc-options: -Wall -Wno-incomplete-uni-patterns
126115
other-modules: Paths_happy_lib
127116
autogen-modules: Paths_happy_lib
128117

129118
library backend-glr
119+
import: common-stanza
130120
hs-source-dirs: backend-glr/src
131-
132121
exposed-modules: Happy.Backend.GLR,
133122
Happy.Backend.GLR.ProduceCode
134123
build-depends: base < 5, array, happy-lib:grammar, happy-lib:tabular
135-
136-
default-language: Haskell98
137-
default-extensions: CPP, MagicHash, FlexibleContexts
138-
ghc-options: -Wall -Wno-incomplete-uni-patterns
139124
other-modules: Paths_happy_lib
140125
autogen-modules: Paths_happy_lib
141126

142127
library
128+
import: common-stanza
143129
reexported-modules: Happy.Grammar,
144130
Happy.Frontend,
145131
Happy.Frontend.AbsSyn,
@@ -154,7 +140,6 @@ library
154140
Happy.Backend.LALR.ProduceCode,
155141
Happy.Backend.GLR,
156142
Happy.Backend.GLR.ProduceCode
157-
158143
build-depends: base >= 4.9 && < 5,
159144
array >= 0.5,
160145
containers >= 0.4.2,
@@ -165,4 +150,3 @@ library
165150
happy-lib:frontend,
166151
happy-lib:backend-lalr,
167152
happy-lib:backend-glr
168-
default-language: Haskell98

0 commit comments

Comments
 (0)