394449f · stackage · git.iko.soy

11Only in orig: dist

22diff -ru orig/haskell-src-exts.cabal new/haskell-src-exts.cabal

3−--- orig/haskell-src-exts.cabal 2014-04-17 07:02:07.071112593 +0300

4−+++ new/haskell-src-exts.cabal 2014-04-17 07:02:00.000000000 +0300

5−@@ -1,123 +1,96 @@

6−-name: haskell-src-exts

7−-version: 1.15.0

8−-cabal-version: >=1.10

9−-build-type: Custom

10−-license: BSD3

11−-license-file: LICENSE

12−-maintainer: Niklas Broberg <niklas.broberg@chalmers.se>

13−-stability: Stable

14−-homepage: https://github.com/haskell-suite/haskell-src-exts

15−-synopsis: Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer

16−-description: Haskell-Source with Extensions (HSE, haskell-src-exts)

17−- is an extension of the standard haskell-src package,

18−- and handles most registered syntactic extensions to Haskell, including:

19−- .

20−- * Multi-parameter type classes with functional dependencies

21−- .

22−- * Indexed type families (including associated types)

23−- .

24−- * Empty data declarations

25−- .

26−- * GADTs

27−- .

28−- * Implicit parameters

29−- .

30−- * Template Haskell

31−- .

32−- and a few more. All extensions implemented in GHC are supported.

33−- Apart from these standard extensions,

34−- it also handles regular patterns as per the HaRP extension

35−- as well as HSX-style embedded XML syntax.

36−-category: Language

37−-author: Niklas Broberg

38−-tested-with: GHC ==6.10.2 GHC ==6.10.4 GHC ==6.12.3 GHC ==7.0.2

39−-data-dir: ""

40−-extra-source-files: CHANGELOG Test/examples/ArityMismatch.hs

41−- Test/examples/ArrowLayout.hs Test/examples/Attributes.hs

42−- Test/examples/BadStringLineBreak.hs Test/examples/BangPatterns.hs

43−- Test/examples/Bug.hs Test/examples/ByteStringUtils.hs

44−- Test/examples/ClassInstType.hs Test/examples/ConstraintKinds.hs

45−- Test/examples/CParser.hs Test/examples/CStyleLinePragmas.hs

46−- Test/examples/CxtWhitespace.hs Test/examples/DataHeadParen.hs

47−- Test/examples/DataKinds.hs Test/examples/Directory.hs

48−- Test/examples/DoRec.hs Test/examples/DoubleHashOp.hs

49−- Test/examples/EmptyAnn.hs Test/examples/EmptyContext.hs

50−- Test/examples/EmptyFunDepPremise.hs Test/examples/EmptyInstance.hs

51−- Test/examples/EmptyList.hs Test/examples/ExtraEndBrace.hs

52−- Test/examples/FamilyKindSig.hs Test/examples/FamilyVarid.hs

53−- Test/examples/FFIExtensions.hs Test/examples/FixityTests.hs

54−- Test/examples/ForallInInstance.hs Test/examples/ForeignImport.hs

55−- Test/examples/GadtDeriving.hs Test/examples/GADTRecord.hs

56−- Test/examples/GenericTree.hs Test/examples/GhcDeriving.hs

57−- Test/examples/GroupKeyword.hs Test/examples/HappyDoAction.hs

58−- Test/examples/HaskellParser.hs Test/examples/HexPrec.hs

59−- Test/examples/IfThenElseLayout.hs Test/examples/IllDataTypeDecl.hs

60−- Test/examples/IndentedWhereBlock.hs Test/examples/IndentedWhere.hs

61−- Test/examples/InfixParser.hs Test/examples/LambdaCase.hs

62−- Test/examples/LineOptionsPragma.hs Test/examples/MultiCtxt.hs

63−- Test/examples/MultiWayIf.hs Test/examples/NegPrimWordLiteral.hs

64−- Test/examples/NestedAsPat.hs Test/examples/NonDecreasing.hs

65−- Test/examples/NPlusK.hs Test/examples/ParallelListComp.hs

66−- Test/examples/ParenFunBind.hs

67−- Test/examples/PrimitiveIntHexLiteral.hs Test/examples/QQType.hs

68−- Test/examples/QualifiedDot.hs Test/examples/QuasiQuoteLines.hs

69−- Test/examples/QuasiQuoteOld.hs Test/examples/QuasiQuoteSplice.hs

70−- Test/examples/RCategory.lhs Test/examples/ReadP.hs

71−- Test/examples/RealGHC.lhs Test/examples/RecordInfixSelector.hs

72−- Test/examples/RelaxedDo.hs Test/examples/SCCPragmas.hs

73−- Test/examples/ScopedTypeVariables.hs

74−- Test/examples/SimpleDeriving.hs Test/examples/SingleClassAsst.hs

75−- Test/examples/SpecializeInstance.hs

76−- Test/examples/SpecializePhaseControl.hs

77−- Test/examples/TabWhitespace.hs Test/examples/Testing.hs

78−- Test/examples/THTypes.hs Test/examples/TupleSections.hs

79−- Test/examples/TypeFunctions.hs

80−- Test/examples/TypeOperatorAsVariable.hs

81−- Test/examples/TypeOperatorsTest.hs

82−- Test/examples/UnboxedSingleton.hs Test/examples/UnboxedTuples.hs

83−- Test/examples/Unicode.hs Test/examples/UnicodeSyntax.hs

84−- Test/examples/UnindentedPragmaClose.hs Test/examples/Unpack.hs

85−- Test/examples/WhereBlock.hs Test/failing.txt Test/printFail.txt

86−- Test/Runner.hs

87−-

88−-source-repository head

89−- type: git

90−- location: https://github.com/haskell-suite/haskell-src-exts.git

91−-

92−-library

93−- build-depends: array >=0.1 && <0.6, pretty >=1.0 && <1.2,

94−- cpphs >=1.3 && <1.19, base -any, ghc-prim <0.4

95−- exposed-modules: Language.Haskell.Exts Language.Haskell.Exts.Lexer

96−- Language.Haskell.Exts.Parser Language.Haskell.Exts.Pretty

97−- Language.Haskell.Exts.Syntax Language.Haskell.Exts.Extension

98−- Language.Haskell.Exts.Build Language.Haskell.Exts.Fixity

99−- Language.Haskell.Exts.Comments Language.Haskell.Exts.SrcLoc

100−- Language.Haskell.Exts.Annotated

101−- Language.Haskell.Exts.Annotated.Syntax

102−- Language.Haskell.Exts.Annotated.Fixity

103−- Language.Haskell.Exts.Annotated.Build

104−- Language.Haskell.Exts.Annotated.ExactPrint

105−- Language.Haskell.Exts.Annotated.Simplify

106−- exposed: True

107−- buildable: True

108−- build-tools: happy >=1.17

109−- default-language: Haskell98

110−- hs-source-dirs: src

111−- other-modules: Language.Haskell.Exts.ExtScheme

112−- Language.Haskell.Exts.ParseMonad Language.Haskell.Exts.ParseSyntax

113−- Language.Haskell.Exts.InternalLexer

114−- Language.Haskell.Exts.ParseUtils

115−- Language.Haskell.Exts.InternalParser

116−-

117−-test-suite test

118−- build-depends: base -any, haskell-src-exts <1.16,

119−- smallcheck >=1.0 && <1.2, tasty >=0.3 && <0.9,

120−- tasty-smallcheck <0.9, tasty-hunit <0.9, filepath <1.4,

121−- directory <1.3

122−- type: exitcode-stdio-1.0

123−- main-is: Runner.hs

124−- buildable: True

125−- default-language: Haskell2010

126−- hs-source-dirs: Test

127−- ghc-options: -threaded

128−-

129−\ No newline at end of file

130−+Name: haskell-src-exts

131−+Version: 1.15.0

132−+License: BSD3

133−+License-File: LICENSE

134−+Build-Type: Simple

135−+Author: Niklas Broberg

136−+Maintainer: Niklas Broberg <niklas.broberg@chalmers.se>

137−+Category: Language

138−+Synopsis: Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer

139−+Description: Haskell-Source with Extensions (HSE, haskell-src-exts)

140−+ is an extension of the standard haskell-src package,

141−+ and handles most registered syntactic extensions to Haskell, including:

142−+ .

143−+ * Multi-parameter type classes with functional dependencies

144−+ .

145−+ * Indexed type families (including associated types)

146−+ .

147−+ * Empty data declarations

148−+ .

149−+ * GADTs

150−+ .

151−+ * Implicit parameters

152−+ .

153−+ * Template Haskell

154−+ .

155−+ and a few more. All extensions implemented in GHC are supported.

156−+ Apart from these standard extensions,

157−+ it also handles regular patterns as per the HaRP extension

158−+ as well as HSX-style embedded XML syntax.

159−+Homepage: https://github.com/haskell-suite/haskell-src-exts

160−+Stability: Stable

161−+Tested-with: GHC==6.10.2, GHC==6.10.4, GHC==6.12.3, GHC==7.0.2

162−+Build-Type: Custom

163−+Cabal-Version: >= 1.10

164−+

165−+Extra-Source-Files:

166−+ CHANGELOG

3+--- orig/haskell-src-exts.cabal 2014-04-17 17:23:21.635397047 +0300

4++++ new/haskell-src-exts.cabal 2014-04-17 17:23:21.000000000 +0300

5+@@ -35,92 +35,11 @@

6+

7+ Extra-Source-Files:

8+ CHANGELOG

9+- Test/examples/ArityMismatch.hs

10+- Test/examples/ArrowLayout.hs

11+- Test/examples/Attributes.hs

12+- Test/examples/BadStringLineBreak.hs

13+- Test/examples/BangPatterns.hs

14+- Test/examples/Bug.hs

15+- Test/examples/ByteStringUtils.hs

16+- Test/examples/ClassInstType.hs

17+- Test/examples/ConstraintKinds.hs

18+- Test/examples/CParser.hs

19+- Test/examples/CStyleLinePragmas.hs

20+- Test/examples/CxtWhitespace.hs

21+- Test/examples/DataHeadParen.hs

22+- Test/examples/DataKinds.hs

23+- Test/examples/Directory.hs

24+- Test/examples/DoRec.hs

25+- Test/examples/DoubleHashOp.hs

26+- Test/examples/EmptyAnn.hs

27+- Test/examples/EmptyContext.hs

28+- Test/examples/EmptyFunDepPremise.hs

29+- Test/examples/EmptyInstance.hs

30+- Test/examples/EmptyList.hs

31+- Test/examples/ExtraEndBrace.hs

32+- Test/examples/FamilyKindSig.hs

33+- Test/examples/FamilyVarid.hs

34+- Test/examples/FFIExtensions.hs

35+- Test/examples/FixityTests.hs

36+- Test/examples/ForallInInstance.hs

37+- Test/examples/ForeignImport.hs

38+- Test/examples/GadtDeriving.hs

39+- Test/examples/GADTRecord.hs

40+- Test/examples/GenericTree.hs

41+- Test/examples/GhcDeriving.hs

42+- Test/examples/GroupKeyword.hs

43+- Test/examples/HappyDoAction.hs

44+- Test/examples/HaskellParser.hs

45+- Test/examples/HexPrec.hs

46+- Test/examples/IfThenElseLayout.hs

47+- Test/examples/IllDataTypeDecl.hs

48+- Test/examples/IndentedWhereBlock.hs

49+- Test/examples/IndentedWhere.hs

50+- Test/examples/InfixParser.hs

51+- Test/examples/LambdaCase.hs

52+- Test/examples/LineOptionsPragma.hs

53+- Test/examples/MultiCtxt.hs

54+- Test/examples/MultiWayIf.hs

55+- Test/examples/NegPrimWordLiteral.hs

56+- Test/examples/NestedAsPat.hs

57+- Test/examples/NonDecreasing.hs

58+- Test/examples/NPlusK.hs

59+- Test/examples/ParallelListComp.hs

60+- Test/examples/ParenFunBind.hs

61+- Test/examples/PrimitiveIntHexLiteral.hs

62+- Test/examples/QQType.hs

63+- Test/examples/QualifiedDot.hs

64+- Test/examples/QuasiQuoteLines.hs

65+- Test/examples/QuasiQuoteOld.hs

66+- Test/examples/QuasiQuoteSplice.hs

67+- Test/examples/RCategory.lhs

68+- Test/examples/ReadP.hs

69+- Test/examples/RealGHC.lhs

70+- Test/examples/RecordInfixSelector.hs

71+- Test/examples/RelaxedDo.hs

72+- Test/examples/SCCPragmas.hs

73+- Test/examples/ScopedTypeVariables.hs

74+- Test/examples/SimpleDeriving.hs

75+- Test/examples/SingleClassAsst.hs

76+- Test/examples/SpecializeInstance.hs

77+- Test/examples/SpecializePhaseControl.hs

78+- Test/examples/TabWhitespace.hs

79+- Test/examples/Testing.hs

80+- Test/examples/THTypes.hs

81+- Test/examples/TupleSections.hs

82+- Test/examples/TypeFunctions.hs

83+- Test/examples/TypeOperatorAsVariable.hs

84+- Test/examples/TypeOperatorsTest.hs

85+- Test/examples/UnboxedSingleton.hs

86+- Test/examples/UnboxedTuples.hs

87+- Test/examples/Unicode.hs

88+- Test/examples/UnicodeSyntax.hs

89+- Test/examples/UnindentedPragmaClose.hs

90+- Test/examples/Unpack.hs

91+- Test/examples/WhereBlock.hs

16792+ Test/examples/*.hs

168−+ Test/failing.txt

169−+ Test/printFail.txt

170−+ Test/Runner.hs

93+ Test/failing.txt

94+ Test/printFail.txt

95+ Test/Runner.hs

17196+ Test/UnitTests.hs

172−+

173−+Library

174−+ Default-language: Haskell98

175−+ Build-Tools: happy >= 1.17

176−+ Build-Depends: array >= 0.1, pretty >= 1.0, cpphs >= 1.3,

177−+ base >= 4.5 && < 5,

178−+ -- this is needed to access GHC.Generics on GHC 7.4

179−+ ghc-prim

180−+

181−+ Exposed-modules: Language.Haskell.Exts,

182−+ Language.Haskell.Exts.Lexer,

183−+ Language.Haskell.Exts.Parser,

184−+ Language.Haskell.Exts.Pretty,

185−+ Language.Haskell.Exts.Syntax,

186−+ Language.Haskell.Exts.Extension,

187−+ Language.Haskell.Exts.Build,

188−+ Language.Haskell.Exts.Fixity,

189−+ Language.Haskell.Exts.Comments,

190−+ Language.Haskell.Exts.SrcLoc,

191−+

192−+ Language.Haskell.Exts.Annotated,

193−+ Language.Haskell.Exts.Annotated.Syntax,

194−+ Language.Haskell.Exts.Annotated.Fixity,

195−+ Language.Haskell.Exts.Annotated.Build,

196−+ Language.Haskell.Exts.Annotated.ExactPrint,

197−+ Language.Haskell.Exts.Annotated.Simplify

198−+

199−+ Other-modules: Language.Haskell.Exts.ExtScheme,

200−+

201−+ Language.Haskell.Exts.ParseMonad,

202−+ Language.Haskell.Exts.ParseSyntax,

203−+ Language.Haskell.Exts.InternalLexer,

204−+ Language.Haskell.Exts.ParseUtils,

205−+ Language.Haskell.Exts.InternalParser

206−+ Hs-source-dirs: src

207−+

208−+Source-Repository head

209−+ Type: git

210−+ Location: https://github.com/haskell-suite/haskell-src-exts.git

211−+

212−+Test-Suite test

213−+ type: exitcode-stdio-1.0

214−+ hs-source-dirs: Test

215−+ main-is: Runner.hs

216−+ GHC-Options: -threaded

217−+ Default-language: Haskell2010

218−+ Build-depends: base < 5,

219−+ haskell-src-exts,

220−+ smallcheck >= 1.0,

221−+ tasty >= 0.3,

222−+ tasty-smallcheck,

223−+ tasty-hunit,

224−+ filepath,

225−+ directory

97+

98+ Library

99+ Default-language: Haskell98

226100diff -ru orig/src/Language/Haskell/Exts/Annotated/Syntax.hs new/src/Language/Haskell/Exts/Annotated/Syntax.hs

227−--- orig/src/Language/Haskell/Exts/Annotated/Syntax.hs 2014-04-17 07:02:06.927109238 +0300

228−+++ new/src/Language/Haskell/Exts/Annotated/Syntax.hs 2014-04-17 07:02:00.000000000 +0300

101+--- orig/src/Language/Haskell/Exts/Annotated/Syntax.hs 2014-04-17 17:23:21.619396670 +0300

102++++ new/src/Language/Haskell/Exts/Annotated/Syntax.hs 2014-04-17 17:23:21.000000000 +0300

229103@@ -1,4 +1,4 @@

230104-{-# LANGUAGE DeriveDataTypeable, DeriveFoldable, DeriveTraversable, DeriveGeneric #-}

231105+{-# LANGUAGE DeriveDataTypeable, DeriveFoldable, DeriveTraversable, DeriveFunctor, DeriveGeneric #-}

12201094

12211095 instance Annotated XName where

12221096diff -ru orig/src/Language/Haskell/Exts/Annotated.hs new/src/Language/Haskell/Exts/Annotated.hs

1223−--- orig/src/Language/Haskell/Exts/Annotated.hs 2014-04-17 07:02:06.927109238 +0300

1224−+++ new/src/Language/Haskell/Exts/Annotated.hs 2014-04-17 07:02:00.000000000 +0300

1097+--- orig/src/Language/Haskell/Exts/Annotated.hs 2014-04-17 17:23:21.615396576 +0300

1098++++ new/src/Language/Haskell/Exts/Annotated.hs 2014-04-17 17:23:21.000000000 +0300

12251099@@ -127,6 +127,7 @@

12261100 case classifyLanguage e of

12271101 UnknownLanguage _ -> Right $ classifyExtension e

12311105 extractLang = extractLang' Nothing []

12321106

12331107diff -ru orig/src/Language/Haskell/Exts/ParseSyntax.hs new/src/Language/Haskell/Exts/ParseSyntax.hs

1234−--- orig/src/Language/Haskell/Exts/ParseSyntax.hs 2014-04-17 07:02:06.927109238 +0300

1235−+++ new/src/Language/Haskell/Exts/ParseSyntax.hs 2014-04-17 07:02:00.000000000 +0300

1108+--- orig/src/Language/Haskell/Exts/ParseSyntax.hs 2014-04-17 17:23:21.615396576 +0300

1109++++ new/src/Language/Haskell/Exts/ParseSyntax.hs 2014-04-17 17:23:21.000000000 +0300

12361110@@ -1,3 +1,4 @@

12371111+{-# LANGUAGE DeriveFunctor #-}

12381112 {-# OPTIONS_HADDOCK hide #-}

13411215 instance Annotated PFieldUpdate where

13421216 ann (FieldUpdate l qn e) = l

13431217diff -ru orig/src/Language/Haskell/Exts/Pretty.hs new/src/Language/Haskell/Exts/Pretty.hs

1344−--- orig/src/Language/Haskell/Exts/Pretty.hs 2014-04-17 07:02:06.927109238 +0300

1345−+++ new/src/Language/Haskell/Exts/Pretty.hs 2014-04-17 07:02:00.000000000 +0300

1218+--- orig/src/Language/Haskell/Exts/Pretty.hs 2014-04-17 17:23:21.615396576 +0300

1219++++ new/src/Language/Haskell/Exts/Pretty.hs 2014-04-17 17:23:21.000000000 +0300

13461220@@ -716,7 +716,23 @@

13471221 -- prettyPrec _ (TyPred asst) = pretty asst

13481222 prettyPrec _ (TyInfix a op b) = myFsep [pretty a, ppQNameInfix op, pretty b]

13731247 prettyPrec _ (P.TyKind _ t k) = parens (myFsep [pretty t, text "::", pretty k])

13741248+ prettyPrec _ (P.TyPromoted _ p) = pretty $ sPromoted p

13751249diff -ru orig/src/Language/Haskell/Exts.hs new/src/Language/Haskell/Exts.hs

1376−--- orig/src/Language/Haskell/Exts.hs 2014-04-17 07:02:06.847107375 +0300

1377−+++ new/src/Language/Haskell/Exts.hs 2014-04-17 07:02:00.000000000 +0300

1250+--- orig/src/Language/Haskell/Exts.hs 2014-04-17 17:23:21.615396576 +0300

1251++++ new/src/Language/Haskell/Exts.hs 2014-04-17 17:23:21.000000000 +0300

13781252@@ -125,6 +125,7 @@

13791253 case classifyLanguage e of

13801254 UnknownLanguage _ -> Right $ classifyExtension e