From 394449f6cc1c6df24575033eb531685fc3b8ad40 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 17 Apr 2014 17:23:37 +0300 Subject: [PATCH] Fix patch --- .../patches/haskell-src-exts-1.15.0.patch | 336 ++++++------------ 1 file changed, 105 insertions(+), 231 deletions(-) diff --git a/patching/patches/haskell-src-exts-1.15.0.patch b/patching/patches/haskell-src-exts-1.15.0.patch index de5b441f..dde21c18 100644 --- a/patching/patches/haskell-src-exts-1.15.0.patch +++ b/patching/patches/haskell-src-exts-1.15.0.patch @@ -1,231 +1,105 @@ Only in orig: dist diff -ru orig/haskell-src-exts.cabal new/haskell-src-exts.cabal ---- orig/haskell-src-exts.cabal 2014-04-17 07:02:07.071112593 +0300 -+++ new/haskell-src-exts.cabal 2014-04-17 07:02:00.000000000 +0300 -@@ -1,123 +1,96 @@ --name: haskell-src-exts --version: 1.15.0 --cabal-version: >=1.10 --build-type: Custom --license: BSD3 --license-file: LICENSE --maintainer: Niklas Broberg --stability: Stable --homepage: https://github.com/haskell-suite/haskell-src-exts --synopsis: Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer --description: Haskell-Source with Extensions (HSE, haskell-src-exts) -- is an extension of the standard haskell-src package, -- and handles most registered syntactic extensions to Haskell, including: -- . -- * Multi-parameter type classes with functional dependencies -- . -- * Indexed type families (including associated types) -- . -- * Empty data declarations -- . -- * GADTs -- . -- * Implicit parameters -- . -- * Template Haskell -- . -- and a few more. All extensions implemented in GHC are supported. -- Apart from these standard extensions, -- it also handles regular patterns as per the HaRP extension -- as well as HSX-style embedded XML syntax. --category: Language --author: Niklas Broberg --tested-with: GHC ==6.10.2 GHC ==6.10.4 GHC ==6.12.3 GHC ==7.0.2 --data-dir: "" --extra-source-files: CHANGELOG Test/examples/ArityMismatch.hs -- Test/examples/ArrowLayout.hs Test/examples/Attributes.hs -- Test/examples/BadStringLineBreak.hs Test/examples/BangPatterns.hs -- Test/examples/Bug.hs Test/examples/ByteStringUtils.hs -- Test/examples/ClassInstType.hs Test/examples/ConstraintKinds.hs -- Test/examples/CParser.hs Test/examples/CStyleLinePragmas.hs -- Test/examples/CxtWhitespace.hs Test/examples/DataHeadParen.hs -- Test/examples/DataKinds.hs Test/examples/Directory.hs -- Test/examples/DoRec.hs Test/examples/DoubleHashOp.hs -- Test/examples/EmptyAnn.hs Test/examples/EmptyContext.hs -- Test/examples/EmptyFunDepPremise.hs Test/examples/EmptyInstance.hs -- Test/examples/EmptyList.hs Test/examples/ExtraEndBrace.hs -- Test/examples/FamilyKindSig.hs Test/examples/FamilyVarid.hs -- Test/examples/FFIExtensions.hs Test/examples/FixityTests.hs -- Test/examples/ForallInInstance.hs Test/examples/ForeignImport.hs -- Test/examples/GadtDeriving.hs Test/examples/GADTRecord.hs -- Test/examples/GenericTree.hs Test/examples/GhcDeriving.hs -- Test/examples/GroupKeyword.hs Test/examples/HappyDoAction.hs -- Test/examples/HaskellParser.hs Test/examples/HexPrec.hs -- Test/examples/IfThenElseLayout.hs Test/examples/IllDataTypeDecl.hs -- Test/examples/IndentedWhereBlock.hs Test/examples/IndentedWhere.hs -- Test/examples/InfixParser.hs Test/examples/LambdaCase.hs -- Test/examples/LineOptionsPragma.hs Test/examples/MultiCtxt.hs -- Test/examples/MultiWayIf.hs Test/examples/NegPrimWordLiteral.hs -- Test/examples/NestedAsPat.hs Test/examples/NonDecreasing.hs -- Test/examples/NPlusK.hs Test/examples/ParallelListComp.hs -- Test/examples/ParenFunBind.hs -- Test/examples/PrimitiveIntHexLiteral.hs Test/examples/QQType.hs -- Test/examples/QualifiedDot.hs Test/examples/QuasiQuoteLines.hs -- Test/examples/QuasiQuoteOld.hs Test/examples/QuasiQuoteSplice.hs -- Test/examples/RCategory.lhs Test/examples/ReadP.hs -- Test/examples/RealGHC.lhs Test/examples/RecordInfixSelector.hs -- Test/examples/RelaxedDo.hs Test/examples/SCCPragmas.hs -- Test/examples/ScopedTypeVariables.hs -- Test/examples/SimpleDeriving.hs Test/examples/SingleClassAsst.hs -- Test/examples/SpecializeInstance.hs -- Test/examples/SpecializePhaseControl.hs -- Test/examples/TabWhitespace.hs Test/examples/Testing.hs -- Test/examples/THTypes.hs Test/examples/TupleSections.hs -- Test/examples/TypeFunctions.hs -- Test/examples/TypeOperatorAsVariable.hs -- Test/examples/TypeOperatorsTest.hs -- Test/examples/UnboxedSingleton.hs Test/examples/UnboxedTuples.hs -- Test/examples/Unicode.hs Test/examples/UnicodeSyntax.hs -- Test/examples/UnindentedPragmaClose.hs Test/examples/Unpack.hs -- Test/examples/WhereBlock.hs Test/failing.txt Test/printFail.txt -- Test/Runner.hs -- --source-repository head -- type: git -- location: https://github.com/haskell-suite/haskell-src-exts.git -- --library -- build-depends: array >=0.1 && <0.6, pretty >=1.0 && <1.2, -- cpphs >=1.3 && <1.19, base -any, ghc-prim <0.4 -- exposed-modules: Language.Haskell.Exts Language.Haskell.Exts.Lexer -- Language.Haskell.Exts.Parser Language.Haskell.Exts.Pretty -- Language.Haskell.Exts.Syntax Language.Haskell.Exts.Extension -- Language.Haskell.Exts.Build Language.Haskell.Exts.Fixity -- Language.Haskell.Exts.Comments Language.Haskell.Exts.SrcLoc -- Language.Haskell.Exts.Annotated -- Language.Haskell.Exts.Annotated.Syntax -- Language.Haskell.Exts.Annotated.Fixity -- Language.Haskell.Exts.Annotated.Build -- Language.Haskell.Exts.Annotated.ExactPrint -- Language.Haskell.Exts.Annotated.Simplify -- exposed: True -- buildable: True -- build-tools: happy >=1.17 -- default-language: Haskell98 -- hs-source-dirs: src -- other-modules: Language.Haskell.Exts.ExtScheme -- Language.Haskell.Exts.ParseMonad Language.Haskell.Exts.ParseSyntax -- Language.Haskell.Exts.InternalLexer -- Language.Haskell.Exts.ParseUtils -- Language.Haskell.Exts.InternalParser -- --test-suite test -- build-depends: base -any, haskell-src-exts <1.16, -- smallcheck >=1.0 && <1.2, tasty >=0.3 && <0.9, -- tasty-smallcheck <0.9, tasty-hunit <0.9, filepath <1.4, -- directory <1.3 -- type: exitcode-stdio-1.0 -- main-is: Runner.hs -- buildable: True -- default-language: Haskell2010 -- hs-source-dirs: Test -- ghc-options: -threaded -- -\ No newline at end of file -+Name: haskell-src-exts -+Version: 1.15.0 -+License: BSD3 -+License-File: LICENSE -+Build-Type: Simple -+Author: Niklas Broberg -+Maintainer: Niklas Broberg -+Category: Language -+Synopsis: Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer -+Description: Haskell-Source with Extensions (HSE, haskell-src-exts) -+ is an extension of the standard haskell-src package, -+ and handles most registered syntactic extensions to Haskell, including: -+ . -+ * Multi-parameter type classes with functional dependencies -+ . -+ * Indexed type families (including associated types) -+ . -+ * Empty data declarations -+ . -+ * GADTs -+ . -+ * Implicit parameters -+ . -+ * Template Haskell -+ . -+ and a few more. All extensions implemented in GHC are supported. -+ Apart from these standard extensions, -+ it also handles regular patterns as per the HaRP extension -+ as well as HSX-style embedded XML syntax. -+Homepage: https://github.com/haskell-suite/haskell-src-exts -+Stability: Stable -+Tested-with: GHC==6.10.2, GHC==6.10.4, GHC==6.12.3, GHC==7.0.2 -+Build-Type: Custom -+Cabal-Version: >= 1.10 -+ -+Extra-Source-Files: -+ CHANGELOG +--- orig/haskell-src-exts.cabal 2014-04-17 17:23:21.635397047 +0300 ++++ new/haskell-src-exts.cabal 2014-04-17 17:23:21.000000000 +0300 +@@ -35,92 +35,11 @@ + + Extra-Source-Files: + CHANGELOG +- Test/examples/ArityMismatch.hs +- Test/examples/ArrowLayout.hs +- Test/examples/Attributes.hs +- Test/examples/BadStringLineBreak.hs +- Test/examples/BangPatterns.hs +- Test/examples/Bug.hs +- Test/examples/ByteStringUtils.hs +- Test/examples/ClassInstType.hs +- Test/examples/ConstraintKinds.hs +- Test/examples/CParser.hs +- Test/examples/CStyleLinePragmas.hs +- Test/examples/CxtWhitespace.hs +- Test/examples/DataHeadParen.hs +- Test/examples/DataKinds.hs +- Test/examples/Directory.hs +- Test/examples/DoRec.hs +- Test/examples/DoubleHashOp.hs +- Test/examples/EmptyAnn.hs +- Test/examples/EmptyContext.hs +- Test/examples/EmptyFunDepPremise.hs +- Test/examples/EmptyInstance.hs +- Test/examples/EmptyList.hs +- Test/examples/ExtraEndBrace.hs +- Test/examples/FamilyKindSig.hs +- Test/examples/FamilyVarid.hs +- Test/examples/FFIExtensions.hs +- Test/examples/FixityTests.hs +- Test/examples/ForallInInstance.hs +- Test/examples/ForeignImport.hs +- Test/examples/GadtDeriving.hs +- Test/examples/GADTRecord.hs +- Test/examples/GenericTree.hs +- Test/examples/GhcDeriving.hs +- Test/examples/GroupKeyword.hs +- Test/examples/HappyDoAction.hs +- Test/examples/HaskellParser.hs +- Test/examples/HexPrec.hs +- Test/examples/IfThenElseLayout.hs +- Test/examples/IllDataTypeDecl.hs +- Test/examples/IndentedWhereBlock.hs +- Test/examples/IndentedWhere.hs +- Test/examples/InfixParser.hs +- Test/examples/LambdaCase.hs +- Test/examples/LineOptionsPragma.hs +- Test/examples/MultiCtxt.hs +- Test/examples/MultiWayIf.hs +- Test/examples/NegPrimWordLiteral.hs +- Test/examples/NestedAsPat.hs +- Test/examples/NonDecreasing.hs +- Test/examples/NPlusK.hs +- Test/examples/ParallelListComp.hs +- Test/examples/ParenFunBind.hs +- Test/examples/PrimitiveIntHexLiteral.hs +- Test/examples/QQType.hs +- Test/examples/QualifiedDot.hs +- Test/examples/QuasiQuoteLines.hs +- Test/examples/QuasiQuoteOld.hs +- Test/examples/QuasiQuoteSplice.hs +- Test/examples/RCategory.lhs +- Test/examples/ReadP.hs +- Test/examples/RealGHC.lhs +- Test/examples/RecordInfixSelector.hs +- Test/examples/RelaxedDo.hs +- Test/examples/SCCPragmas.hs +- Test/examples/ScopedTypeVariables.hs +- Test/examples/SimpleDeriving.hs +- Test/examples/SingleClassAsst.hs +- Test/examples/SpecializeInstance.hs +- Test/examples/SpecializePhaseControl.hs +- Test/examples/TabWhitespace.hs +- Test/examples/Testing.hs +- Test/examples/THTypes.hs +- Test/examples/TupleSections.hs +- Test/examples/TypeFunctions.hs +- Test/examples/TypeOperatorAsVariable.hs +- Test/examples/TypeOperatorsTest.hs +- Test/examples/UnboxedSingleton.hs +- Test/examples/UnboxedTuples.hs +- Test/examples/Unicode.hs +- Test/examples/UnicodeSyntax.hs +- Test/examples/UnindentedPragmaClose.hs +- Test/examples/Unpack.hs +- Test/examples/WhereBlock.hs + Test/examples/*.hs -+ Test/failing.txt -+ Test/printFail.txt -+ Test/Runner.hs + Test/failing.txt + Test/printFail.txt + Test/Runner.hs + Test/UnitTests.hs -+ -+Library -+ Default-language: Haskell98 -+ Build-Tools: happy >= 1.17 -+ Build-Depends: array >= 0.1, pretty >= 1.0, cpphs >= 1.3, -+ base >= 4.5 && < 5, -+ -- this is needed to access GHC.Generics on GHC 7.4 -+ ghc-prim -+ -+ Exposed-modules: Language.Haskell.Exts, -+ Language.Haskell.Exts.Lexer, -+ Language.Haskell.Exts.Parser, -+ Language.Haskell.Exts.Pretty, -+ Language.Haskell.Exts.Syntax, -+ Language.Haskell.Exts.Extension, -+ Language.Haskell.Exts.Build, -+ Language.Haskell.Exts.Fixity, -+ Language.Haskell.Exts.Comments, -+ Language.Haskell.Exts.SrcLoc, -+ -+ Language.Haskell.Exts.Annotated, -+ Language.Haskell.Exts.Annotated.Syntax, -+ Language.Haskell.Exts.Annotated.Fixity, -+ Language.Haskell.Exts.Annotated.Build, -+ Language.Haskell.Exts.Annotated.ExactPrint, -+ Language.Haskell.Exts.Annotated.Simplify -+ -+ Other-modules: Language.Haskell.Exts.ExtScheme, -+ -+ Language.Haskell.Exts.ParseMonad, -+ Language.Haskell.Exts.ParseSyntax, -+ Language.Haskell.Exts.InternalLexer, -+ Language.Haskell.Exts.ParseUtils, -+ Language.Haskell.Exts.InternalParser -+ Hs-source-dirs: src -+ -+Source-Repository head -+ Type: git -+ Location: https://github.com/haskell-suite/haskell-src-exts.git -+ -+Test-Suite test -+ type: exitcode-stdio-1.0 -+ hs-source-dirs: Test -+ main-is: Runner.hs -+ GHC-Options: -threaded -+ Default-language: Haskell2010 -+ Build-depends: base < 5, -+ haskell-src-exts, -+ smallcheck >= 1.0, -+ tasty >= 0.3, -+ tasty-smallcheck, -+ tasty-hunit, -+ filepath, -+ directory + + Library + Default-language: Haskell98 diff -ru orig/src/Language/Haskell/Exts/Annotated/Syntax.hs new/src/Language/Haskell/Exts/Annotated/Syntax.hs ---- orig/src/Language/Haskell/Exts/Annotated/Syntax.hs 2014-04-17 07:02:06.927109238 +0300 -+++ new/src/Language/Haskell/Exts/Annotated/Syntax.hs 2014-04-17 07:02:00.000000000 +0300 +--- orig/src/Language/Haskell/Exts/Annotated/Syntax.hs 2014-04-17 17:23:21.619396670 +0300 ++++ new/src/Language/Haskell/Exts/Annotated/Syntax.hs 2014-04-17 17:23:21.000000000 +0300 @@ -1,4 +1,4 @@ -{-# LANGUAGE DeriveDataTypeable, DeriveFoldable, DeriveTraversable, DeriveGeneric #-} +{-# LANGUAGE DeriveDataTypeable, DeriveFoldable, DeriveTraversable, DeriveFunctor, DeriveGeneric #-} @@ -1220,8 +1094,8 @@ diff -ru orig/src/Language/Haskell/Exts/Annotated/Syntax.hs new/src/Language/Has instance Annotated XName where diff -ru orig/src/Language/Haskell/Exts/Annotated.hs new/src/Language/Haskell/Exts/Annotated.hs ---- orig/src/Language/Haskell/Exts/Annotated.hs 2014-04-17 07:02:06.927109238 +0300 -+++ new/src/Language/Haskell/Exts/Annotated.hs 2014-04-17 07:02:00.000000000 +0300 +--- orig/src/Language/Haskell/Exts/Annotated.hs 2014-04-17 17:23:21.615396576 +0300 ++++ new/src/Language/Haskell/Exts/Annotated.hs 2014-04-17 17:23:21.000000000 +0300 @@ -127,6 +127,7 @@ case classifyLanguage e of UnknownLanguage _ -> Right $ classifyExtension e @@ -1231,8 +1105,8 @@ diff -ru orig/src/Language/Haskell/Exts/Annotated.hs new/src/Language/Haskell/Ex extractLang = extractLang' Nothing [] diff -ru orig/src/Language/Haskell/Exts/ParseSyntax.hs new/src/Language/Haskell/Exts/ParseSyntax.hs ---- orig/src/Language/Haskell/Exts/ParseSyntax.hs 2014-04-17 07:02:06.927109238 +0300 -+++ new/src/Language/Haskell/Exts/ParseSyntax.hs 2014-04-17 07:02:00.000000000 +0300 +--- orig/src/Language/Haskell/Exts/ParseSyntax.hs 2014-04-17 17:23:21.615396576 +0300 ++++ new/src/Language/Haskell/Exts/ParseSyntax.hs 2014-04-17 17:23:21.000000000 +0300 @@ -1,3 +1,4 @@ +{-# LANGUAGE DeriveFunctor #-} {-# OPTIONS_HADDOCK hide #-} @@ -1341,8 +1215,8 @@ diff -ru orig/src/Language/Haskell/Exts/ParseSyntax.hs new/src/Language/Haskell/ instance Annotated PFieldUpdate where ann (FieldUpdate l qn e) = l diff -ru orig/src/Language/Haskell/Exts/Pretty.hs new/src/Language/Haskell/Exts/Pretty.hs ---- orig/src/Language/Haskell/Exts/Pretty.hs 2014-04-17 07:02:06.927109238 +0300 -+++ new/src/Language/Haskell/Exts/Pretty.hs 2014-04-17 07:02:00.000000000 +0300 +--- orig/src/Language/Haskell/Exts/Pretty.hs 2014-04-17 17:23:21.615396576 +0300 ++++ new/src/Language/Haskell/Exts/Pretty.hs 2014-04-17 17:23:21.000000000 +0300 @@ -716,7 +716,23 @@ -- prettyPrec _ (TyPred asst) = pretty asst prettyPrec _ (TyInfix a op b) = myFsep [pretty a, ppQNameInfix op, pretty b] @@ -1373,8 +1247,8 @@ diff -ru orig/src/Language/Haskell/Exts/Pretty.hs new/src/Language/Haskell/Exts/ prettyPrec _ (P.TyKind _ t k) = parens (myFsep [pretty t, text "::", pretty k]) + prettyPrec _ (P.TyPromoted _ p) = pretty $ sPromoted p diff -ru orig/src/Language/Haskell/Exts.hs new/src/Language/Haskell/Exts.hs ---- orig/src/Language/Haskell/Exts.hs 2014-04-17 07:02:06.847107375 +0300 -+++ new/src/Language/Haskell/Exts.hs 2014-04-17 07:02:00.000000000 +0300 +--- orig/src/Language/Haskell/Exts.hs 2014-04-17 17:23:21.615396576 +0300 ++++ new/src/Language/Haskell/Exts.hs 2014-04-17 17:23:21.000000000 +0300 @@ -125,6 +125,7 @@ case classifyLanguage e of UnknownLanguage _ -> Right $ classifyExtension e