Skip to content

Commit 0e911b4

Browse files
andreasabelandreasabel
committed
Drop support for GHC 7
1 parent 7598c0d commit 0e911b4

File tree

2 files changed

+39
-43
lines changed

2 files changed

+39
-43
lines changed

‎Language/Haskell/Syntax.hs‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
--
1919
-- * parameters of type class assertions are unrestricted
2020
--
21-
-- For GHC, we also derive 'Typeable' and 'Data' for all types.
21+
-- For GHC, we also derive 'Data' for all types.
2222

2323
-----------------------------------------------------------------------------
2424

@@ -75,15 +75,15 @@ data SrcLoc = SrcLoc {
7575
srcColumn :: Int
7676
}
7777
#ifdef __GLASGOW_HASKELL__
78-
deriving (Eq,Ord,Show,Typeable,Data)
78+
deriving (Eq,Ord,Show,Data)
7979
#else
8080
deriving (Eq,Ord,Show)
8181
#endif
8282

8383
-- | The name of a Haskell module.
8484
newtype Module = Module String
8585
#ifdef __GLASGOW_HASKELL__
86-
deriving (Eq,Ord,Show,Typeable,Data)
86+
deriving (Eq,Ord,Show,Data)
8787
#else
8888
deriving (Eq,Ord,Show)
8989
#endif
@@ -100,7 +100,7 @@ data HsSpecialCon
100100
-- constructors @(,)@ etc.
101101
| HsCons -- ^ List data constructor @(:)@.
102102
#ifdef __GLASGOW_HASKELL__
103-
deriving (Eq,Ord,Show,Typeable,Data)
103+
deriving (Eq,Ord,Show,Data)
104104
#else
105105
deriving (Eq,Ord,Show)
106106
#endif
@@ -112,7 +112,7 @@ data HsQName
112112
| UnQual HsName -- ^ Unqualified name.
113113
| Special HsSpecialCon -- ^ Built-in constructor with special syntax.
114114
#ifdef __GLASGOW_HASKELL__
115-
deriving (Eq,Ord,Show,Typeable,Data)
115+
deriving (Eq,Ord,Show,Data)
116116
#else
117117
deriving (Eq,Ord,Show)
118118
#endif
@@ -122,7 +122,7 @@ data HsName
122122
= HsIdent String -- ^ /varid/ or /conid/.
123123
| HsSymbol String -- ^ /varsym/ or /consym/.
124124
#ifdef __GLASGOW_HASKELL__
125-
deriving (Eq,Ord,Show,Typeable,Data)
125+
deriving (Eq,Ord,Show,Data)
126126
#else
127127
deriving (Eq,Ord,Show)
128128
#endif
@@ -132,7 +132,7 @@ data HsQOp
132132
= HsQVarOp HsQName -- ^ Variable operator (/qvarop/).
133133
| HsQConOp HsQName -- ^ Constructor operator (/qconop/).
134134
#ifdef __GLASGOW_HASKELL__
135-
deriving (Eq,Ord,Show,Typeable,Data)
135+
deriving (Eq,Ord,Show,Data)
136136
#else
137137
deriving (Eq,Ord,Show)
138138
#endif
@@ -142,7 +142,7 @@ data HsOp
142142
= HsVarOp HsName -- ^ Variable operator (/varop/).
143143
| HsConOp HsName -- ^ Constructor operator (/conop/).
144144
#ifdef __GLASGOW_HASKELL__
145-
deriving (Eq,Ord,Show,Typeable,Data)
145+
deriving (Eq,Ord,Show,Data)
146146
#else
147147
deriving (Eq,Ord,Show)
148148
#endif
@@ -153,7 +153,7 @@ data HsCName
153153
= HsVarName HsName -- ^ Name of a method or field.
154154
| HsConName HsName -- ^ Name of a data constructor.
155155
#ifdef __GLASGOW_HASKELL__
156-
deriving (Eq,Ord,Show,Typeable,Data)
156+
deriving (Eq,Ord,Show,Data)
157157
#else
158158
deriving (Eq,Ord,Show)
159159
#endif
@@ -162,7 +162,7 @@ data HsCName
162162
data HsModule = HsModule SrcLoc Module (Maybe [HsExportSpec])
163163
[HsImportDecl] [HsDecl]
164164
#ifdef __GLASGOW_HASKELL__
165-
deriving (Eq,Show,Typeable,Data)
165+
deriving (Eq,Show,Data)
166166
#else
167167
deriving (Eq,Show)
168168
#endif
@@ -182,7 +182,7 @@ data HsExportSpec
182182
| HsEModuleContents Module -- ^ @module M@:
183183
-- Re-export a module.
184184
#ifdef __GLASGOW_HASKELL__
185-
deriving (Eq,Show,Typeable,Data)
185+
deriving (Eq,Show,Data)
186186
#else
187187
deriving (Eq,Show)
188188
#endif
@@ -200,7 +200,7 @@ data HsImportDecl = HsImportDecl
200200
-- by @hiding@.
201201
}
202202
#ifdef __GLASGOW_HASKELL__
203-
deriving (Eq,Show,Typeable,Data)
203+
deriving (Eq,Show,Data)
204204
#else
205205
deriving (Eq,Show)
206206
#endif
@@ -217,7 +217,7 @@ data HsImportSpec
217217
-- A class imported with some of its methods, or
218218
-- a datatype imported with some of its constructors.
219219
#ifdef __GLASGOW_HASKELL__
220-
deriving (Eq,Show,Typeable,Data)
220+
deriving (Eq,Show,Data)
221221
#else
222222
deriving (Eq,Show)
223223
#endif
@@ -228,7 +228,7 @@ data HsAssoc
228228
| HsAssocLeft -- ^ Left-associative operator (declared with @infixl@).
229229
| HsAssocRight -- ^ Right-associative operator (declared with @infixr@).
230230
#ifdef __GLASGOW_HASKELL__
231-
deriving (Eq,Show,Typeable,Data)
231+
deriving (Eq,Show,Data)
232232
#else
233233
deriving (Eq,Show)
234234
#endif
@@ -247,7 +247,7 @@ data HsDecl
247247
| HsForeignImport SrcLoc String HsSafety String HsName HsType
248248
| HsForeignExport SrcLoc String String HsName HsType
249249
#ifdef __GLASGOW_HASKELL__
250-
deriving (Eq,Show,Typeable,Data)
250+
deriving (Eq,Show,Data)
251251
#else
252252
deriving (Eq,Show)
253253
#endif
@@ -256,7 +256,7 @@ data HsDecl
256256
data HsMatch
257257
= HsMatch SrcLoc HsName [HsPat] HsRhs {-where-} [HsDecl]
258258
#ifdef __GLASGOW_HASKELL__
259-
deriving (Eq,Show,Typeable,Data)
259+
deriving (Eq,Show,Data)
260260
#else
261261
deriving (Eq,Show)
262262
#endif
@@ -268,7 +268,7 @@ data HsConDecl
268268
| HsRecDecl SrcLoc HsName [([HsName],HsBangType)]
269269
-- ^ Record constructor.
270270
#ifdef __GLASGOW_HASKELL__
271-
deriving (Eq,Show,Typeable,Data)
271+
deriving (Eq,Show,Data)
272272
#else
273273
deriving (Eq,Show)
274274
#endif
@@ -279,7 +279,7 @@ data HsBangType
279279
= HsBangedTy HsType -- ^ Strict component, marked with \"@!@\".
280280
| HsUnBangedTy HsType -- ^ Non-strict component.
281281
#ifdef __GLASGOW_HASKELL__
282-
deriving (Eq,Show,Typeable,Data)
282+
deriving (Eq,Show,Data)
283283
#else
284284
deriving (Eq,Show)
285285
#endif
@@ -290,7 +290,7 @@ data HsRhs
290290
| HsGuardedRhss [HsGuardedRhs]
291291
-- ^ Guarded right hand side (/gdrhs/).
292292
#ifdef __GLASGOW_HASKELL__
293-
deriving (Eq,Show,Typeable,Data)
293+
deriving (Eq,Show,Data)
294294
#else
295295
deriving (Eq,Show)
296296
#endif
@@ -300,7 +300,7 @@ data HsRhs
300300
data HsGuardedRhs
301301
= HsGuardedRhs SrcLoc HsExp HsExp
302302
#ifdef __GLASGOW_HASKELL__
303-
deriving (Eq,Show,Typeable,Data)
303+
deriving (Eq,Show,Data)
304304
#else
305305
deriving (Eq,Show)
306306
#endif
@@ -310,7 +310,7 @@ data HsSafety
310310
= HsSafe -- ^ Call may generate callbacks.
311311
| HsUnsafe -- ^ Call will not generate callbacks.
312312
#ifdef __GLASGOW_HASKELL__
313-
deriving (Eq,Ord,Show,Typeable,Data)
313+
deriving (Eq,Ord,Show,Data)
314314
#else
315315
deriving (Eq,Ord,Show)
316316
#endif
@@ -320,7 +320,7 @@ data HsSafety
320320
data HsQualType
321321
= HsQualType HsContext HsType
322322
#ifdef __GLASGOW_HASKELL__
323-
deriving (Eq,Show,Typeable,Data)
323+
deriving (Eq,Show,Data)
324324
#else
325325
deriving (Eq,Show)
326326
#endif
@@ -333,7 +333,7 @@ data HsType
333333
| HsTyVar HsName -- ^ Type variable.
334334
| HsTyCon HsQName -- ^ Named type or type constructor.
335335
#ifdef __GLASGOW_HASKELL__
336-
deriving (Eq,Show,Typeable,Data)
336+
deriving (Eq,Show,Data)
337337
#else
338338
deriving (Eq,Show)
339339
#endif
@@ -360,7 +360,7 @@ data HsLiteral
360360
| HsFloatPrim Rational -- ^ GHC unboxed float literal.
361361
| HsDoublePrim Rational -- ^ GHC unboxed double literal.
362362
#ifdef __GLASGOW_HASKELL__
363-
deriving (Eq,Show,Typeable,Data)
363+
deriving (Eq,Show,Data)
364364
#else
365365
deriving (Eq,Show)
366366
#endif
@@ -420,7 +420,7 @@ data HsExp
420420
| HsWildCard -- ^ (patterns only)
421421
| HsIrrPat HsExp -- ^ (patterns only)
422422
#ifdef __GLASGOW_HASKELL__
423-
deriving (Eq,Show,Typeable,Data)
423+
deriving (Eq,Show,Data)
424424
#else
425425
deriving (Eq,Show)
426426
#endif
@@ -442,7 +442,7 @@ data HsPat
442442
| HsPWildCard -- ^ Wildcard pattern (@_@).
443443
| HsPIrrPat HsPat -- ^ Irrefutable pattern (@~@).
444444
#ifdef __GLASGOW_HASKELL__
445-
deriving (Eq,Show,Typeable,Data)
445+
deriving (Eq,Show,Data)
446446
#else
447447
deriving (Eq,Show)
448448
#endif
@@ -451,7 +451,7 @@ data HsPat
451451
data HsPatField
452452
= HsPFieldPat HsQName HsPat
453453
#ifdef __GLASGOW_HASKELL__
454-
deriving (Eq,Show,Typeable,Data)
454+
deriving (Eq,Show,Data)
455455
#else
456456
deriving (Eq,Show)
457457
#endif
@@ -466,7 +466,7 @@ data HsStmt
466466
-- in a list comprehension, a guard expression.
467467
| HsLetStmt [HsDecl] -- ^ Local bindings.
468468
#ifdef __GLASGOW_HASKELL__
469-
deriving (Eq,Show,Typeable,Data)
469+
deriving (Eq,Show,Data)
470470
#else
471471
deriving (Eq,Show)
472472
#endif
@@ -475,7 +475,7 @@ data HsStmt
475475
data HsFieldUpdate
476476
= HsFieldUpdate HsQName HsExp
477477
#ifdef __GLASGOW_HASKELL__
478-
deriving (Eq,Show,Typeable,Data)
478+
deriving (Eq,Show,Data)
479479
#else
480480
deriving (Eq,Show)
481481
#endif
@@ -484,7 +484,7 @@ data HsFieldUpdate
484484
data HsAlt
485485
= HsAlt SrcLoc HsPat HsGuardedAlts [HsDecl]
486486
#ifdef __GLASGOW_HASKELL__
487-
deriving (Eq,Show,Typeable,Data)
487+
deriving (Eq,Show,Data)
488488
#else
489489
deriving (Eq,Show)
490490
#endif
@@ -493,7 +493,7 @@ data HsGuardedAlts
493493
= HsUnGuardedAlt HsExp -- ^ @->@ /exp/.
494494
| HsGuardedAlts [HsGuardedAlt] -- ^ /gdpat/.
495495
#ifdef __GLASGOW_HASKELL__
496-
deriving (Eq,Show,Typeable,Data)
496+
deriving (Eq,Show,Data)
497497
#else
498498
deriving (Eq,Show)
499499
#endif
@@ -503,7 +503,7 @@ data HsGuardedAlts
503503
data HsGuardedAlt
504504
= HsGuardedAlt SrcLoc HsExp HsExp
505505
#ifdef __GLASGOW_HASKELL__
506-
deriving (Eq,Show,Typeable,Data)
506+
deriving (Eq,Show,Data)
507507
#else
508508
deriving (Eq,Show)
509509
#endif

‎haskell-src.cabal‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cabal-version: >=1.10
1+
cabal-version: 1.18
22
name: haskell-src
33
-- don't forget to update the changelog.md!
44
version: 1.0.4.1
@@ -34,7 +34,7 @@ tested-with:
3434
GHC == 8.2.2
3535
GHC == 8.0.2
3636

37-
extra-source-files: changelog.md
37+
extra-doc-files: changelog.md
3838

3939
source-repository head
4040
type: git
@@ -49,21 +49,17 @@ library
4949
Language.Haskell.Syntax,
5050
Language.Haskell.ParseUtils
5151

52-
build-depends: base >= 4.3 && < 5
52+
build-depends: base >= 4.9 && < 5
5353
-- no confirmed upper bound on base yet
5454
, syb >= 0.1 && < 0.8
5555
, pretty >= 1.0.1.2 && < 1.2
5656
, array >= 0.3 && < 0.6
5757

58-
if !impl(ghc >= 8.0)
59-
build-depends: fail == 4.9.*
60-
, semigroups == 0.18.*
61-
-- semigroups >= 0.19 does not build with ghc < 8
62-
else
63-
ghc-options: -Wcompat -Wnoncanonical-monad-instances
64-
6558
build-tools: happy >= 1.19
6659

6760
default-language: Haskell98
6861

69-
ghc-options: -Wall
62+
ghc-options:
63+
-Wall
64+
-Wcompat
65+
-Wnoncanonical-monad-instances

0 commit comments

Comments
 (0)