Re: [commit: ghc] master: Embrace -XTypeInType, add -XStarIsType (d650729)
My `happy` chokes on the unicode sequence you added: (if isUnicode $1 then "★" else "*") Casn this be done with unicode escapes somehow? Cheers, Gabor PS: Happy Version 1.19.9 Copyright (c) 1993-1996 Andy Gill, Simon Marlow (c) 1997-2005 Simon Marlow On 6/14/18, git@git.haskell.org <git@git.haskell.org> wrote:
Repository : ssh://git@git.haskell.org/ghc
On branch : master Link : http://ghc.haskell.org/trac/ghc/changeset/d650729f9a0f3b6aa5e6ef2d5fba337f6f...
---------------------------------------------------------------
commit d650729f9a0f3b6aa5e6ef2d5fba337f6f70fa60 Author: Vladislav Zavialov <vlad.z.4096@gmail.com> Date: Thu Jun 14 15:02:36 2018 -0400
Embrace -XTypeInType, add -XStarIsType
Summary: Implement the "Embrace Type :: Type" GHC proposal, .../ghc-proposals/blob/master/proposals/0020-no-type-in-type.rst
GHC 8.0 included a major change to GHC's type system: the Type :: Type axiom. Though casual users were protected from this by hiding its features behind the -XTypeInType extension, all programs written in GHC 8+ have the axiom behind the scenes. In order to preserve backward compatibility, various legacy features were left unchanged. For example, with -XDataKinds but not -XTypeInType, GADTs could not be used in types. Now these restrictions are lifted and -XTypeInType becomes a redundant flag that will be eventually deprecated.
* Incorporate the features currently in -XTypeInType into the -XPolyKinds and -XDataKinds extensions. * Introduce a new extension -XStarIsType to control how to parse * in code and whether to print it in error messages.
Test Plan: Validate
Reviewers: goldfire, hvr, bgamari, alanz, simonpj
Reviewed By: goldfire, simonpj
Subscribers: rwbarton, thomie, mpickering, carter
GHC Trac Issues: #15195
Differential Revision: https://phabricator.haskell.org/D4748
---------------------------------------------------------------
d650729f9a0f3b6aa5e6ef2d5fba337f6f70fa60 .gitignore | 1 + .gitmodules | 4 +- compiler/basicTypes/DataCon.hs | 22 +- compiler/basicTypes/Name.hs | 21 +- compiler/basicTypes/RdrName.hs | 96 +++- compiler/basicTypes/SrcLoc.hs | 5 +- compiler/deSugar/DsMeta.hs | 7 +- compiler/hsSyn/Convert.hs | 37 +- compiler/hsSyn/HsDecls.hs | 9 +- compiler/hsSyn/HsExtension.hs | 16 +- compiler/hsSyn/HsInstances.hs | 5 - compiler/hsSyn/HsTypes.hs | 117 +---- compiler/iface/IfaceType.hs | 8 +- compiler/main/DynFlags.hs | 31 ++ compiler/main/DynFlags.hs-boot | 1 + compiler/main/HscTypes.hs | 3 +- compiler/parser/Lexer.x | 104 +++-- compiler/parser/Parser.y | 88 ++-- compiler/parser/RdrHsSyn.hs | 190 ++++---- compiler/prelude/PrelNames.hs | 7 +- compiler/prelude/PrelNames.hs-boot | 3 +- compiler/prelude/TysWiredIn.hs | 24 +- compiler/rename/RnEnv.hs | 43 +- compiler/rename/RnSource.hs | 4 +- compiler/rename/RnTypes.hs | 186 ++------ compiler/typecheck/TcDeriv.hs | 14 +- compiler/typecheck/TcHsType.hs | 82 ++-- compiler/typecheck/TcInstDcls.hs | 4 +- compiler/typecheck/TcMType.hs | 2 +- compiler/typecheck/TcPatSyn.hs | 2 +- compiler/typecheck/TcRnTypes.hs | 6 - compiler/typecheck/TcSplice.hs | 4 +- compiler/typecheck/TcTyClsDecls.hs | 43 +- compiler/types/Kind.hs | 33 +- compiler/types/TyCoRep.hs | 1 + compiler/types/TyCon.hs | 8 +- compiler/types/Type.hs | 11 +- compiler/types/Unify.hs | 2 +- compiler/utils/Outputable.hs | 11 +- docs/users_guide/8.6.1-notes.rst | 30 +- docs/users_guide/glasgow_exts.rst | 482 +++++++++------------ libraries/base/Data/Data.hs | 4 +- libraries/base/Data/Kind.hs | 2 +- libraries/base/Data/Proxy.hs | 2 +- libraries/base/Data/Type/Equality.hs | 4 +- libraries/base/Data/Typeable.hs | 26 +- libraries/base/Data/Typeable/Internal.hs | 1 - libraries/base/GHC/Base.hs | 3 +- libraries/base/GHC/Err.hs | 2 +- libraries/base/GHC/Generics.hs | 50 +-- libraries/base/Type/Reflection/Unsafe.hs | 2 +- libraries/base/tests/CatEntail.hs | 4 +- .../ghc-boot-th/GHC/LanguageExtensions/Type.hs | 1 + libraries/ghc-prim/GHC/Magic.hs | 3 +- libraries/ghc-prim/GHC/Types.hs | 8 +- testsuite/tests/codeGen/should_fail/T13233.hs | 2 +- testsuite/tests/dependent/ghci/T11549.script | 2 +- testsuite/tests/dependent/ghci/T14238.stdout | 2 +- testsuite/tests/dependent/should_compile/Dep1.hs | 2 +- testsuite/tests/dependent/should_compile/Dep2.hs | 2 +- testsuite/tests/dependent/should_compile/Dep3.hs | 2 +- .../tests/dependent/should_compile/DkNameRes.hs | 9 + .../dependent/should_compile/InferDependency.hs | 6 - .../dependent/should_compile/KindEqualities.hs | 2 +- .../dependent/should_compile/KindEqualities2.hs | 3 +- .../tests/dependent/should_compile/KindLevels.hs | 2 +- .../tests/dependent/should_compile/RAE_T32b.hs | 24 +- testsuite/tests/dependent/should_compile/Rae31.hs | 23 +- .../tests/dependent/should_compile/RaeBlogPost.hs | 27 +- .../tests/dependent/should_compile/RaeJobTalk.hs | 2 +- testsuite/tests/dependent/should_compile/T11405.hs | 2 +- testsuite/tests/dependent/should_compile/T11635.hs | 2 +- testsuite/tests/dependent/should_compile/T11711.hs | 1 - testsuite/tests/dependent/should_compile/T11719.hs | 6 +- testsuite/tests/dependent/should_compile/T11966.hs | 1 - testsuite/tests/dependent/should_compile/T12176.hs | 2 +- testsuite/tests/dependent/should_compile/T12442.hs | 4 +- testsuite/tests/dependent/should_compile/T12742.hs | 2 +- testsuite/tests/dependent/should_compile/T13910.hs | 9 +- testsuite/tests/dependent/should_compile/T13938.hs | 3 +- .../tests/dependent/should_compile/T13938a.hs | 3 +- testsuite/tests/dependent/should_compile/T14038.hs | 3 +- .../tests/dependent/should_compile/T14066a.hs | 2 +- testsuite/tests/dependent/should_compile/T14556.hs | 3 +- testsuite/tests/dependent/should_compile/T14720.hs | 3 +- testsuite/tests/dependent/should_compile/T14749.hs | 2 +- testsuite/tests/dependent/should_compile/T14991.hs | 3 +- testsuite/tests/dependent/should_compile/T9632.hs | 2 +- .../tests/dependent/should_compile/TypeLevelVec.hs | 2 +- testsuite/tests/dependent/should_compile/all.T | 1 + .../dependent/should_compile/dynamic-paper.hs | 27 +- .../tests/dependent/should_compile/mkGADTVars.hs | 2 +- .../tests/dependent/should_fail/BadTelescope.hs | 2 +- .../tests/dependent/should_fail/BadTelescope2.hs | 2 +- .../tests/dependent/should_fail/BadTelescope3.hs | 2 +- .../tests/dependent/should_fail/BadTelescope4.hs | 2 +- testsuite/tests/dependent/should_fail/DepFail1.hs | 2 +- .../tests/dependent/should_fail/InferDependency.hs | 2 +- .../tests/dependent/should_fail/KindLevelsB.hs | 9 - .../tests/dependent/should_fail/KindLevelsB.stderr | 5 - .../tests/dependent/should_fail/PromotedClass.hs | 2 +- testsuite/tests/dependent/should_fail/RAE_T32a.hs | 28 +- .../tests/dependent/should_fail/RAE_T32a.stderr | 6 +- .../tests/dependent/should_fail/RenamingStar.hs | 2 +- .../dependent/should_fail/RenamingStar.stderr | 10 +- testsuite/tests/dependent/should_fail/SelfDep.hs | 2 + .../tests/dependent/should_fail/SelfDep.stderr | 8 +- testsuite/tests/dependent/should_fail/T11407.hs | 2 +- testsuite/tests/dependent/should_fail/T11473.hs | 2 +- testsuite/tests/dependent/should_fail/T12081.hs | 2 +- testsuite/tests/dependent/should_fail/T12174.hs | 2 +- testsuite/tests/dependent/should_fail/T13135.hs | 4 +- testsuite/tests/dependent/should_fail/T13601.hs | 2 +- testsuite/tests/dependent/should_fail/T13780a.hs | 2 +- testsuite/tests/dependent/should_fail/T13780b.hs | 3 +- testsuite/tests/dependent/should_fail/T13780c.hs | 2 +- .../tests/dependent/should_fail/T13780c.stderr | 6 +- testsuite/tests/dependent/should_fail/T14066.hs | 4 +- testsuite/tests/dependent/should_fail/T14066c.hs | 2 +- testsuite/tests/dependent/should_fail/T14066d.hs | 2 +- testsuite/tests/dependent/should_fail/T14066e.hs | 2 +- testsuite/tests/dependent/should_fail/T14066f.hs | 2 +- testsuite/tests/dependent/should_fail/T14066g.hs | 2 +- testsuite/tests/dependent/should_fail/T14066h.hs | 2 +- testsuite/tests/dependent/should_fail/T15245.hs | 10 + .../tests/dependent/should_fail/T15245.stderr | 7 + .../tests/dependent/should_fail/TypeSkolEscape.hs | 2 +- testsuite/tests/dependent/should_fail/all.T | 2 +- testsuite/tests/dependent/should_run/T11964a.hs | 2 +- testsuite/tests/deriving/should_compile/T11416.hs | 3 +- testsuite/tests/deriving/should_compile/T11732a.hs | 2 +- testsuite/tests/deriving/should_compile/T11732b.hs | 2 +- testsuite/tests/deriving/should_compile/T11732c.hs | 2 +- testsuite/tests/deriving/should_compile/T14331.hs | 2 +- testsuite/tests/deriving/should_compile/T14579.hs | 3 +- testsuite/tests/deriving/should_compile/T14932.hs | 4 +- testsuite/tests/deriving/should_fail/T12512.hs | 2 +- testsuite/tests/deriving/should_fail/T14728a.hs | 2 +- testsuite/tests/deriving/should_fail/T14728b.hs | 2 +- testsuite/tests/deriving/should_fail/T15073.hs | 2 +- testsuite/tests/determinism/determ004/determ004.hs | 2 +- testsuite/tests/determinism/determ014/A.hs | 6 +- testsuite/tests/driver/T4437.hs | 1 + testsuite/tests/gadt/T7293.hs | 6 +- testsuite/tests/gadt/T7293.stderr | 4 +- testsuite/tests/gadt/T7294.hs | 6 +- testsuite/tests/gadt/T7294.stderr | 4 +- testsuite/tests/generics/GEq/GEq1.hs | 5 +- testsuite/tests/ghci/scripts/T10321.hs | 3 +- testsuite/tests/ghci/scripts/T11252.script | 2 +- testsuite/tests/ghci/scripts/T11376.script | 2 +- testsuite/tests/ghci/scripts/T12550.script | 2 +- testsuite/tests/ghci/scripts/T13407.script | 4 +- testsuite/tests/ghci/scripts/T13963.script | 2 +- testsuite/tests/ghci/scripts/T13988.hs | 2 +- testsuite/tests/ghci/scripts/T7873.script | 2 +- testsuite/tests/ghci/scripts/T7939.hs | 4 +- testsuite/tests/ghci/scripts/T8357.hs | 5 +- testsuite/tests/indexed-types/should_compile/HO.hs | 5 +- .../tests/indexed-types/should_compile/Numerals.hs | 7 +- .../tests/indexed-types/should_compile/T12369.hs | 4 +- .../tests/indexed-types/should_compile/T12522b.hs | 8 +- .../tests/indexed-types/should_compile/T12938.hs | 2 +- .../tests/indexed-types/should_compile/T13244.hs | 2 +- .../tests/indexed-types/should_compile/T13398b.hs | 2 +- .../tests/indexed-types/should_compile/T14162.hs | 3 +- .../tests/indexed-types/should_compile/T14554.hs | 5 +- .../tests/indexed-types/should_compile/T15122.hs | 2 +- .../tests/indexed-types/should_compile/T2219.hs | 4 +- .../tests/indexed-types/should_compile/T7585.hs | 6 +- .../tests/indexed-types/should_compile/T9747.hs | 9 +- .../tests/indexed-types/should_fail/T12522a.hs | 6 +- .../tests/indexed-types/should_fail/T12522a.stderr | 6 +- .../tests/indexed-types/should_fail/T13674.hs | 4 +- .../tests/indexed-types/should_fail/T13784.hs | 5 +- .../tests/indexed-types/should_fail/T13784.stderr | 14 +- .../tests/indexed-types/should_fail/T13877.hs | 6 +- .../tests/indexed-types/should_fail/T13972.hs | 2 +- .../tests/indexed-types/should_fail/T14175.hs | 2 +- .../tests/indexed-types/should_fail/T14246.hs | 8 +- .../tests/indexed-types/should_fail/T14246.stderr | 2 +- .../tests/indexed-types/should_fail/T14369.hs | 2 +- testsuite/tests/indexed-types/should_fail/T2544.hs | 4 +- .../tests/indexed-types/should_fail/T2544.stderr | 8 +- .../tests/indexed-types/should_fail/T3330c.hs | 6 +- .../tests/indexed-types/should_fail/T3330c.stderr | 10 +- testsuite/tests/indexed-types/should_fail/T4174.hs | 10 +- .../tests/indexed-types/should_fail/T4174.stderr | 6 +- testsuite/tests/indexed-types/should_fail/T7786.hs | 4 +- .../tests/indexed-types/should_fail/T7786.stderr | 25 +- testsuite/tests/indexed-types/should_fail/T7967.hs | 10 +- .../tests/indexed-types/should_fail/T7967.stderr | 12 +- testsuite/tests/indexed-types/should_fail/T9036.hs | 7 +- .../tests/indexed-types/should_fail/T9036.stderr | 2 +- testsuite/tests/indexed-types/should_fail/T9662.hs | 4 +- .../tests/indexed-types/should_fail/T9662.stderr | 6 +- .../tests/indexed-types/should_run/T11465a.hs | 1 - .../should_run/overloadedrecflds_generics.hs | 5 +- .../should_run/overloadedrecfldsrun07.hs | 6 +- .../parser/should_compile/DumpParsedAst.stderr | 109 ++--- .../tests/parser/should_compile/DumpRenamedAst.hs | 2 +- .../parser/should_compile/DumpRenamedAst.stderr | 62 ++- testsuite/tests/parser/should_compile/T10379.hs | 2 +- testsuite/tests/parser/should_fail/T15209.stderr | 2 +- testsuite/tests/parser/should_fail/all.T | 5 + testsuite/tests/parser/should_fail/readFail036.hs | 4 +- .../tests/parser/should_fail/readFail036.stderr | 4 +- testsuite/tests/parser/should_fail/typeops_A.hs | 1 + .../tests/parser/should_fail/typeops_A.stderr | 2 + testsuite/tests/parser/should_fail/typeops_B.hs | 1 + .../tests/parser/should_fail/typeops_B.stderr | 2 + testsuite/tests/parser/should_fail/typeops_C.hs | 1 + .../tests/parser/should_fail/typeops_C.stderr | 2 + testsuite/tests/parser/should_fail/typeops_D.hs | 1 + .../tests/parser/should_fail/typeops_D.stderr | 2 + .../tests/partial-sigs/should_compile/T15039a.hs | 12 +- .../partial-sigs/should_compile/T15039a.stderr | 11 +- .../tests/partial-sigs/should_compile/T15039b.hs | 12 +- .../partial-sigs/should_compile/T15039b.stderr | 44 +- .../tests/partial-sigs/should_compile/T15039c.hs | 12 +- .../partial-sigs/should_compile/T15039c.stderr | 11 +- .../tests/partial-sigs/should_compile/T15039d.hs | 12 +- .../partial-sigs/should_compile/T15039d.stderr | 44 +- .../tests/partial-sigs/should_fail/T14040a.hs | 2 +- testsuite/tests/partial-sigs/should_fail/T14584.hs | 2 +- .../tests/partial-sigs/should_fail/T14584.stderr | 2 +- testsuite/tests/patsyn/should_compile/T12698.hs | 2 +- testsuite/tests/patsyn/should_compile/T12968.hs | 2 +- testsuite/tests/patsyn/should_compile/T13768.hs | 8 +- testsuite/tests/patsyn/should_compile/T14058.hs | 2 +- testsuite/tests/patsyn/should_compile/T14058a.hs | 3 +- testsuite/tests/patsyn/should_fail/T14507.hs | 4 +- testsuite/tests/patsyn/should_fail/T14507.stderr | 2 +- testsuite/tests/patsyn/should_fail/T14552.hs | 2 +- testsuite/tests/perf/compiler/T12227.hs | 17 +- testsuite/tests/perf/compiler/T12545a.hs | 3 +- testsuite/tests/perf/compiler/T13035.hs | 13 +- testsuite/tests/perf/compiler/T13035.stderr | 2 +- testsuite/tests/perf/compiler/T9872d.hs | 186 ++++++-- testsuite/tests/pmcheck/complete_sigs/T14253.hs | 2 +- testsuite/tests/pmcheck/should_compile/T14086.hs | 2 +- testsuite/tests/pmcheck/should_compile/T3927b.hs | 8 +- testsuite/tests/polykinds/MonoidsTF.hs | 4 +- testsuite/tests/polykinds/PolyKinds10.hs | 27 +- testsuite/tests/polykinds/SigTvKinds3.hs | 2 +- testsuite/tests/polykinds/T10134a.hs | 3 +- testsuite/tests/polykinds/T10934.hs | 6 +- testsuite/tests/polykinds/T11142.hs | 2 +- testsuite/tests/polykinds/T11399.hs | 2 +- testsuite/tests/polykinds/T11480b.hs | 24 +- testsuite/tests/polykinds/T11520.hs | 2 +- testsuite/tests/polykinds/T11523.hs | 1 - testsuite/tests/polykinds/T11554.hs | 2 +- testsuite/tests/polykinds/T11616.hs | 2 +- testsuite/tests/polykinds/T11640.hs | 2 +- testsuite/tests/polykinds/T11648.hs | 4 +- testsuite/tests/polykinds/T11648b.hs | 2 +- testsuite/tests/polykinds/T11821a.hs | 2 +- testsuite/tests/polykinds/T12055.hs | 4 +- testsuite/tests/polykinds/T12055a.hs | 4 +- testsuite/tests/polykinds/T12593.hs | 2 +- testsuite/tests/polykinds/T12668.hs | 2 +- testsuite/tests/polykinds/T12718.hs | 2 +- testsuite/tests/polykinds/T13391.hs | 7 - testsuite/tests/polykinds/T13391.stderr | 7 - testsuite/tests/polykinds/T13625.hs | 2 +- testsuite/tests/polykinds/T13659.hs | 4 +- testsuite/tests/polykinds/T13659.stderr | 2 +- testsuite/tests/polykinds/T13738.hs | 2 +- testsuite/tests/polykinds/T13985.stderr | 10 +- testsuite/tests/polykinds/T14174.hs | 2 +- testsuite/tests/polykinds/T14174a.hs | 7 +- testsuite/tests/polykinds/T14209.hs | 2 +- testsuite/tests/polykinds/T14270.hs | 2 +- testsuite/tests/polykinds/T14450.hs | 4 +- testsuite/tests/polykinds/T14450.stderr | 2 +- testsuite/tests/polykinds/T14515.hs | 3 +- testsuite/tests/polykinds/T14520.hs | 4 +- testsuite/tests/polykinds/T14555.hs | 4 +- testsuite/tests/polykinds/T14561.hs | 2 +- testsuite/tests/polykinds/T14563.hs | 2 +- testsuite/tests/polykinds/T14580.hs | 2 +- testsuite/tests/polykinds/T14710.stderr | 8 - testsuite/tests/polykinds/T14846.hs | 2 +- testsuite/tests/polykinds/T14873.hs | 3 +- testsuite/tests/polykinds/T15170.hs | 2 +- testsuite/tests/polykinds/T5716.hs | 3 +- testsuite/tests/polykinds/T5716.stderr | 10 +- testsuite/tests/polykinds/T6021.stderr | 4 - testsuite/tests/polykinds/T6035.hs | 4 +- testsuite/tests/polykinds/T6039.stderr | 12 +- testsuite/tests/polykinds/T6093.hs | 7 +- testsuite/tests/polykinds/T7404.stderr | 4 - testsuite/tests/polykinds/T7594.hs | 6 +- testsuite/tests/polykinds/T7594.stderr | 9 +- testsuite/tests/polykinds/T8566.hs | 8 +- testsuite/tests/polykinds/T8566.stderr | 8 +- testsuite/tests/polykinds/T8566a.hs | 8 +- testsuite/tests/polykinds/T8985.hs | 8 +- testsuite/tests/polykinds/T9222.hs | 3 +- testsuite/tests/polykinds/T9222.stderr | 6 +- testsuite/tests/polykinds/all.T | 5 +- testsuite/tests/printer/Ppr040.hs | 2 +- testsuite/tests/printer/Ppr045.hs | 1 + testsuite/tests/rename/should_fail/T11592.hs | 2 +- testsuite/tests/rename/should_fail/T13947.stderr | 2 +- .../tests/simplCore/should_compile/T13025a.hs | 6 +- testsuite/tests/simplCore/should_compile/T13658.hs | 2 +- .../tests/simplCore/should_compile/T14270a.hs | 3 +- .../tests/simplCore/should_compile/T15186A.hs | 2 +- testsuite/tests/simplCore/should_compile/T4903a.hs | 10 +- testsuite/tests/simplCore/should_run/T13750a.hs | 13 +- testsuite/tests/th/T11463.hs | 2 +- testsuite/tests/th/T11484.hs | 2 +- testsuite/tests/th/T13642.hs | 2 +- testsuite/tests/th/T13781.hs | 2 +- testsuite/tests/th/T14060.hs | 2 +- testsuite/tests/th/T14869.hs | 2 +- testsuite/tests/th/T8031.hs | 4 +- testsuite/tests/th/TH_RichKinds2.hs | 5 +- testsuite/tests/th/TH_RichKinds2.stderr | 2 +- .../tests/typecheck/should_compile/SplitWD.hs | 2 +- testsuite/tests/typecheck/should_compile/T10432.hs | 5 +- testsuite/tests/typecheck/should_compile/T11237.hs | 4 +- testsuite/tests/typecheck/should_compile/T11348.hs | 1 - testsuite/tests/typecheck/should_compile/T11524.hs | 1 - testsuite/tests/typecheck/should_compile/T11723.hs | 2 +- testsuite/tests/typecheck/should_compile/T11811.hs | 2 +- testsuite/tests/typecheck/should_compile/T12133.hs | 4 +- testsuite/tests/typecheck/should_compile/T12381.hs | 2 +- testsuite/tests/typecheck/should_compile/T12734.hs | 38 +- .../tests/typecheck/should_compile/T12734a.hs | 31 +- .../tests/typecheck/should_compile/T12734a.stderr | 9 +- .../tests/typecheck/should_compile/T12785a.hs | 2 +- testsuite/tests/typecheck/should_compile/T12911.hs | 2 +- testsuite/tests/typecheck/should_compile/T12919.hs | 2 +- testsuite/tests/typecheck/should_compile/T12987.hs | 2 +- testsuite/tests/typecheck/should_compile/T13083.hs | 5 +- testsuite/tests/typecheck/should_compile/T13333.hs | 2 +- testsuite/tests/typecheck/should_compile/T13337.hs | 2 +- testsuite/tests/typecheck/should_compile/T13343.hs | 2 +- testsuite/tests/typecheck/should_compile/T13458.hs | 2 +- testsuite/tests/typecheck/should_compile/T13603.hs | 2 +- testsuite/tests/typecheck/should_compile/T13643.hs | 2 +- testsuite/tests/typecheck/should_compile/T13822.hs | 3 +- testsuite/tests/typecheck/should_compile/T13871.hs | 2 +- testsuite/tests/typecheck/should_compile/T13879.hs | 2 +- .../tests/typecheck/should_compile/T13915a.hs | 2 +- .../tests/typecheck/should_compile/T13915b.hs | 2 +- testsuite/tests/typecheck/should_compile/T13943.hs | 2 +- testsuite/tests/typecheck/should_compile/T14441.hs | 3 +- .../tests/typecheck/should_compile/T14934a.hs | 3 +- testsuite/tests/typecheck/should_compile/all.T | 4 +- testsuite/tests/typecheck/should_compile/tc191.hs | 2 +- testsuite/tests/typecheck/should_compile/tc205.hs | 4 +- testsuite/tests/typecheck/should_compile/tc269.hs | 3 +- .../should_compile/valid_hole_fits_interactions.hs | 2 +- .../tests/typecheck/should_fail/ClassOperator.hs | 4 +- .../typecheck/should_fail/ClassOperator.stderr | 16 +- .../typecheck/should_fail/CustomTypeErrors04.hs | 2 +- .../typecheck/should_fail/CustomTypeErrors05.hs | 2 +- .../tests/typecheck/should_fail/LevPolyBounded.hs | 2 +- testsuite/tests/typecheck/should_fail/T11313.hs | 2 - .../tests/typecheck/should_fail/T11313.stderr | 8 +- testsuite/tests/typecheck/should_fail/T11724.hs | 2 +- testsuite/tests/typecheck/should_fail/T11963.hs | 29 -- .../tests/typecheck/should_fail/T11963.stderr | 20 - testsuite/tests/typecheck/should_fail/T12648.hs | 6 +- testsuite/tests/typecheck/should_fail/T12709.hs | 3 +- .../tests/typecheck/should_fail/T12709.stderr | 8 +- testsuite/tests/typecheck/should_fail/T12785b.hs | 8 +- testsuite/tests/typecheck/should_fail/T12973.hs | 2 +- testsuite/tests/typecheck/should_fail/T13105.hs | 2 +- testsuite/tests/typecheck/should_fail/T13446.hs | 4 +- testsuite/tests/typecheck/should_fail/T13909.hs | 2 +- testsuite/tests/typecheck/should_fail/T13929.hs | 2 +- .../tests/typecheck/should_fail/T13983.stderr | 2 +- testsuite/tests/typecheck/should_fail/T14350.hs | 2 +- testsuite/tests/typecheck/should_fail/T14904a.hs | 2 +- testsuite/tests/typecheck/should_fail/T14904b.hs | 2 +- testsuite/tests/typecheck/should_fail/T7645.hs | 4 +- testsuite/tests/typecheck/should_fail/T7645.stderr | 5 +- testsuite/tests/typecheck/should_fail/all.T | 1 - .../tests/typecheck/should_run/EtaExpandLevPoly.hs | 4 +- .../typecheck/should_run/KindInvariant.script | 6 +- testsuite/tests/typecheck/should_run/T11120.hs | 2 +- testsuite/tests/typecheck/should_run/T12809.hs | 2 +- testsuite/tests/typecheck/should_run/T13435.hs | 3 +- testsuite/tests/typecheck/should_run/TypeOf.hs | 2 +- testsuite/tests/typecheck/should_run/TypeRep.hs | 4 +- testsuite/tests/unboxedsums/sum_rr.hs | 2 +- 391 files changed, 1865 insertions(+), 1997 deletions(-)
Diff suppressed because of size. To see it, use:
git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc d650729f9a0f3b6aa5e6ef2d5fba337f6f70fa60 _______________________________________________ ghc-commits mailing list ghc-commits@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-commits
Hi Gabor, Indeed, I can reproduce this issue. This is happening because your locale does not support Unicode. It is probably something like this: $ locale -a C POSIX Rather than fix this particular issue, I suggest we forbid Unicode in GHC sources using the linter (the one that checks for lines too long, etc) to avoid such problems in the future.
Can this be done with unicode escapes somehow?
Yes, that would be '\x2605'. All the best, - Vladislav On Jun 15, 2018 11:34, "Gabor Greif" <ggreif@gmail.com> wrote:
My `happy` chokes on the unicode sequence you added:
(if isUnicode $1 then "★" else "*")
Casn this be done with unicode escapes somehow?
Cheers,
Gabor
PS: Happy Version 1.19.9 Copyright (c) 1993-1996 Andy Gill, Simon Marlow (c) 1997-2005 Simon Marlow
On 6/14/18, git@git.haskell.org <git@git.haskell.org> wrote:
Repository : ssh://git@git.haskell.org/ghc
On branch : master Link :
http://ghc.haskell.org/trac/ghc/changeset/d650729f9a0f3b6aa5e6ef2d5fba337f6f...
---------------------------------------------------------------
commit d650729f9a0f3b6aa5e6ef2d5fba337f6f70fa60 Author: Vladislav Zavialov <vlad.z.4096@gmail.com> Date: Thu Jun 14 15:02:36 2018 -0400
Embrace -XTypeInType, add -XStarIsType
Summary: Implement the "Embrace Type :: Type" GHC proposal, .../ghc-proposals/blob/master/proposals/0020-no-type-in-type.rst
GHC 8.0 included a major change to GHC's type system: the Type ::
Type
axiom. Though casual users were protected from this by hiding its features behind the -XTypeInType extension, all programs written in
GHC
8+ have the axiom behind the scenes. In order to preserve backward compatibility, various legacy features were left unchanged. For
example,
with -XDataKinds but not -XTypeInType, GADTs could not be used in
types.
Now these restrictions are lifted and -XTypeInType becomes a
redundant
flag that will be eventually deprecated.
* Incorporate the features currently in -XTypeInType into the -XPolyKinds and -XDataKinds extensions. * Introduce a new extension -XStarIsType to control how to parse * in code and whether to print it in error messages.
Test Plan: Validate
Reviewers: goldfire, hvr, bgamari, alanz, simonpj
Reviewed By: goldfire, simonpj
Subscribers: rwbarton, thomie, mpickering, carter
GHC Trac Issues: #15195
Differential Revision: https://phabricator.haskell.org/D4748
---------------------------------------------------------------
d650729f9a0f3b6aa5e6ef2d5fba337f6f70fa60 .gitignore | 1 + .gitmodules | 4 +- compiler/basicTypes/DataCon.hs | 22 +- compiler/basicTypes/Name.hs | 21 +- compiler/basicTypes/RdrName.hs | 96 +++- compiler/basicTypes/SrcLoc.hs | 5 +- compiler/deSugar/DsMeta.hs | 7 +- compiler/hsSyn/Convert.hs | 37 +- compiler/hsSyn/HsDecls.hs | 9 +- compiler/hsSyn/HsExtension.hs | 16 +- compiler/hsSyn/HsInstances.hs | 5 - compiler/hsSyn/HsTypes.hs | 117 +---- compiler/iface/IfaceType.hs | 8 +- compiler/main/DynFlags.hs | 31 ++ compiler/main/DynFlags.hs-boot | 1 + compiler/main/HscTypes.hs | 3 +- compiler/parser/Lexer.x | 104 +++-- compiler/parser/Parser.y | 88 ++-- compiler/parser/RdrHsSyn.hs | 190 ++++---- compiler/prelude/PrelNames.hs | 7 +- compiler/prelude/PrelNames.hs-boot | 3 +- compiler/prelude/TysWiredIn.hs | 24 +- compiler/rename/RnEnv.hs | 43 +- compiler/rename/RnSource.hs | 4 +- compiler/rename/RnTypes.hs | 186 ++------ compiler/typecheck/TcDeriv.hs | 14 +- compiler/typecheck/TcHsType.hs | 82 ++-- compiler/typecheck/TcInstDcls.hs | 4 +- compiler/typecheck/TcMType.hs | 2 +- compiler/typecheck/TcPatSyn.hs | 2 +- compiler/typecheck/TcRnTypes.hs | 6 - compiler/typecheck/TcSplice.hs | 4 +- compiler/typecheck/TcTyClsDecls.hs | 43 +- compiler/types/Kind.hs | 33 +- compiler/types/TyCoRep.hs | 1 + compiler/types/TyCon.hs | 8 +- compiler/types/Type.hs | 11 +- compiler/types/Unify.hs | 2 +- compiler/utils/Outputable.hs | 11 +- docs/users_guide/8.6.1-notes.rst | 30 +- docs/users_guide/glasgow_exts.rst | 482 +++++++++------------ libraries/base/Data/Data.hs | 4 +- libraries/base/Data/Kind.hs | 2 +- libraries/base/Data/Proxy.hs | 2 +- libraries/base/Data/Type/Equality.hs | 4 +- libraries/base/Data/Typeable.hs | 26 +- libraries/base/Data/Typeable/Internal.hs | 1 - libraries/base/GHC/Base.hs | 3 +- libraries/base/GHC/Err.hs | 2 +- libraries/base/GHC/Generics.hs | 50 +-- libraries/base/Type/Reflection/Unsafe.hs | 2 +- libraries/base/tests/CatEntail.hs | 4 +- .../ghc-boot-th/GHC/LanguageExtensions/Type.hs | 1 + libraries/ghc-prim/GHC/Magic.hs | 3 +- libraries/ghc-prim/GHC/Types.hs | 8 +- testsuite/tests/codeGen/should_fail/T13233.hs | 2 +- testsuite/tests/dependent/ghci/T11549.script | 2 +- testsuite/tests/dependent/ghci/T14238.stdout | 2 +- testsuite/tests/dependent/should_compile/Dep1.hs | 2 +- testsuite/tests/dependent/should_compile/Dep2.hs | 2 +- testsuite/tests/dependent/should_compile/Dep3.hs | 2 +- .../tests/dependent/should_compile/DkNameRes.hs | 9 + .../dependent/should_compile/InferDependency.hs | 6 - .../dependent/should_compile/KindEqualities.hs | 2 +- .../dependent/should_compile/KindEqualities2.hs | 3 +- .../tests/dependent/should_compile/KindLevels.hs | 2 +- .../tests/dependent/should_compile/RAE_T32b.hs | 24 +- testsuite/tests/dependent/should_compile/Rae31.hs | 23 +- .../tests/dependent/should_compile/RaeBlogPost.hs | 27 +- .../tests/dependent/should_compile/RaeJobTalk.hs | 2 +- testsuite/tests/dependent/should_compile/T11405.hs | 2 +- testsuite/tests/dependent/should_compile/T11635.hs | 2 +- testsuite/tests/dependent/should_compile/T11711.hs | 1 - testsuite/tests/dependent/should_compile/T11719.hs | 6 +- testsuite/tests/dependent/should_compile/T11966.hs | 1 - testsuite/tests/dependent/should_compile/T12176.hs | 2 +- testsuite/tests/dependent/should_compile/T12442.hs | 4 +- testsuite/tests/dependent/should_compile/T12742.hs | 2 +- testsuite/tests/dependent/should_compile/T13910.hs | 9 +- testsuite/tests/dependent/should_compile/T13938.hs | 3 +- .../tests/dependent/should_compile/T13938a.hs | 3 +- testsuite/tests/dependent/should_compile/T14038.hs | 3 +- .../tests/dependent/should_compile/T14066a.hs | 2 +- testsuite/tests/dependent/should_compile/T14556.hs | 3 +- testsuite/tests/dependent/should_compile/T14720.hs | 3 +- testsuite/tests/dependent/should_compile/T14749.hs | 2 +- testsuite/tests/dependent/should_compile/T14991.hs | 3 +- testsuite/tests/dependent/should_compile/T9632.hs | 2 +- .../tests/dependent/should_compile/TypeLevelVec.hs | 2 +- testsuite/tests/dependent/should_compile/all.T | 1 + .../dependent/should_compile/dynamic-paper.hs | 27 +- .../tests/dependent/should_compile/mkGADTVars.hs | 2 +- .../tests/dependent/should_fail/BadTelescope.hs | 2 +- .../tests/dependent/should_fail/BadTelescope2.hs | 2 +- .../tests/dependent/should_fail/BadTelescope3.hs | 2 +- .../tests/dependent/should_fail/BadTelescope4.hs | 2 +- testsuite/tests/dependent/should_fail/DepFail1.hs | 2 +- .../tests/dependent/should_fail/InferDependency.hs | 2 +- .../tests/dependent/should_fail/KindLevelsB.hs | 9 - .../tests/dependent/should_fail/KindLevelsB.stderr | 5 - .../tests/dependent/should_fail/PromotedClass.hs | 2 +- testsuite/tests/dependent/should_fail/RAE_T32a.hs | 28 +- .../tests/dependent/should_fail/RAE_T32a.stderr | 6 +- .../tests/dependent/should_fail/RenamingStar.hs | 2 +- .../dependent/should_fail/RenamingStar.stderr | 10 +- testsuite/tests/dependent/should_fail/SelfDep.hs | 2 + .../tests/dependent/should_fail/SelfDep.stderr | 8 +- testsuite/tests/dependent/should_fail/T11407.hs | 2 +- testsuite/tests/dependent/should_fail/T11473.hs | 2 +- testsuite/tests/dependent/should_fail/T12081.hs | 2 +- testsuite/tests/dependent/should_fail/T12174.hs | 2 +- testsuite/tests/dependent/should_fail/T13135.hs | 4 +- testsuite/tests/dependent/should_fail/T13601.hs | 2 +- testsuite/tests/dependent/should_fail/T13780a.hs | 2 +- testsuite/tests/dependent/should_fail/T13780b.hs | 3 +- testsuite/tests/dependent/should_fail/T13780c.hs | 2 +- .../tests/dependent/should_fail/T13780c.stderr | 6 +- testsuite/tests/dependent/should_fail/T14066.hs | 4 +- testsuite/tests/dependent/should_fail/T14066c.hs | 2 +- testsuite/tests/dependent/should_fail/T14066d.hs | 2 +- testsuite/tests/dependent/should_fail/T14066e.hs | 2 +- testsuite/tests/dependent/should_fail/T14066f.hs | 2 +- testsuite/tests/dependent/should_fail/T14066g.hs | 2 +- testsuite/tests/dependent/should_fail/T14066h.hs | 2 +- testsuite/tests/dependent/should_fail/T15245.hs | 10 + .../tests/dependent/should_fail/T15245.stderr | 7 + .../tests/dependent/should_fail/TypeSkolEscape.hs | 2 +- testsuite/tests/dependent/should_fail/all.T | 2 +- testsuite/tests/dependent/should_run/T11964a.hs | 2 +- testsuite/tests/deriving/should_compile/T11416.hs | 3 +- testsuite/tests/deriving/should_compile/T11732a.hs | 2 +- testsuite/tests/deriving/should_compile/T11732b.hs | 2 +- testsuite/tests/deriving/should_compile/T11732c.hs | 2 +- testsuite/tests/deriving/should_compile/T14331.hs | 2 +- testsuite/tests/deriving/should_compile/T14579.hs | 3 +- testsuite/tests/deriving/should_compile/T14932.hs | 4 +- testsuite/tests/deriving/should_fail/T12512.hs | 2 +- testsuite/tests/deriving/should_fail/T14728a.hs | 2 +- testsuite/tests/deriving/should_fail/T14728b.hs | 2 +- testsuite/tests/deriving/should_fail/T15073.hs | 2 +- testsuite/tests/determinism/determ004/determ004.hs | 2 +- testsuite/tests/determinism/determ014/A.hs | 6 +- testsuite/tests/driver/T4437.hs | 1 + testsuite/tests/gadt/T7293.hs | 6 +- testsuite/tests/gadt/T7293.stderr | 4 +- testsuite/tests/gadt/T7294.hs | 6 +- testsuite/tests/gadt/T7294.stderr | 4 +- testsuite/tests/generics/GEq/GEq1.hs | 5 +- testsuite/tests/ghci/scripts/T10321.hs | 3 +- testsuite/tests/ghci/scripts/T11252.script | 2 +- testsuite/tests/ghci/scripts/T11376.script | 2 +- testsuite/tests/ghci/scripts/T12550.script | 2 +- testsuite/tests/ghci/scripts/T13407.script | 4 +- testsuite/tests/ghci/scripts/T13963.script | 2 +- testsuite/tests/ghci/scripts/T13988.hs | 2 +- testsuite/tests/ghci/scripts/T7873.script | 2 +- testsuite/tests/ghci/scripts/T7939.hs | 4 +- testsuite/tests/ghci/scripts/T8357.hs | 5 +- testsuite/tests/indexed-types/should_compile/HO.hs | 5 +- .../tests/indexed-types/should_compile/Numerals.hs | 7 +- .../tests/indexed-types/should_compile/T12369.hs | 4 +- .../tests/indexed-types/should_compile/T12522b.hs | 8 +- .../tests/indexed-types/should_compile/T12938.hs | 2 +- .../tests/indexed-types/should_compile/T13244.hs | 2 +- .../tests/indexed-types/should_compile/T13398b.hs | 2 +- .../tests/indexed-types/should_compile/T14162.hs | 3 +- .../tests/indexed-types/should_compile/T14554.hs | 5 +- .../tests/indexed-types/should_compile/T15122.hs | 2 +- .../tests/indexed-types/should_compile/T2219.hs | 4 +- .../tests/indexed-types/should_compile/T7585.hs | 6 +- .../tests/indexed-types/should_compile/T9747.hs | 9 +- .../tests/indexed-types/should_fail/T12522a.hs | 6 +- .../tests/indexed-types/should_fail/T12522a.stderr | 6 +- .../tests/indexed-types/should_fail/T13674.hs | 4 +- .../tests/indexed-types/should_fail/T13784.hs | 5 +- .../tests/indexed-types/should_fail/T13784.stderr | 14 +- .../tests/indexed-types/should_fail/T13877.hs | 6 +- .../tests/indexed-types/should_fail/T13972.hs | 2 +- .../tests/indexed-types/should_fail/T14175.hs | 2 +- .../tests/indexed-types/should_fail/T14246.hs | 8 +- .../tests/indexed-types/should_fail/T14246.stderr | 2 +- .../tests/indexed-types/should_fail/T14369.hs | 2 +- testsuite/tests/indexed-types/should_fail/T2544.hs | 4 +- .../tests/indexed-types/should_fail/T2544.stderr | 8 +- .../tests/indexed-types/should_fail/T3330c.hs | 6 +- .../tests/indexed-types/should_fail/T3330c.stderr | 10 +- testsuite/tests/indexed-types/should_fail/T4174.hs | 10 +- .../tests/indexed-types/should_fail/T4174.stderr | 6 +- testsuite/tests/indexed-types/should_fail/T7786.hs | 4 +- .../tests/indexed-types/should_fail/T7786.stderr | 25 +- testsuite/tests/indexed-types/should_fail/T7967.hs | 10 +- .../tests/indexed-types/should_fail/T7967.stderr | 12 +- testsuite/tests/indexed-types/should_fail/T9036.hs | 7 +- .../tests/indexed-types/should_fail/T9036.stderr | 2 +- testsuite/tests/indexed-types/should_fail/T9662.hs | 4 +- .../tests/indexed-types/should_fail/T9662.stderr | 6 +- .../tests/indexed-types/should_run/T11465a.hs | 1 - .../should_run/overloadedrecflds_generics.hs | 5 +- .../should_run/overloadedrecfldsrun07.hs | 6 +- .../parser/should_compile/DumpParsedAst.stderr | 109 ++--- .../tests/parser/should_compile/DumpRenamedAst.hs | 2 +- .../parser/should_compile/DumpRenamedAst.stderr | 62 ++- testsuite/tests/parser/should_compile/T10379.hs | 2 +- testsuite/tests/parser/should_fail/T15209.stderr | 2 +- testsuite/tests/parser/should_fail/all.T | 5 + testsuite/tests/parser/should_fail/readFail036.hs | 4 +- .../tests/parser/should_fail/readFail036.stderr | 4 +- testsuite/tests/parser/should_fail/typeops_A.hs | 1 + .../tests/parser/should_fail/typeops_A.stderr | 2 + testsuite/tests/parser/should_fail/typeops_B.hs | 1 + .../tests/parser/should_fail/typeops_B.stderr | 2 + testsuite/tests/parser/should_fail/typeops_C.hs | 1 + .../tests/parser/should_fail/typeops_C.stderr | 2 + testsuite/tests/parser/should_fail/typeops_D.hs | 1 + .../tests/parser/should_fail/typeops_D.stderr | 2 + .../tests/partial-sigs/should_compile/T15039a.hs | 12 +- .../partial-sigs/should_compile/T15039a.stderr | 11 +- .../tests/partial-sigs/should_compile/T15039b.hs | 12 +- .../partial-sigs/should_compile/T15039b.stderr | 44 +- .../tests/partial-sigs/should_compile/T15039c.hs | 12 +- .../partial-sigs/should_compile/T15039c.stderr | 11 +- .../tests/partial-sigs/should_compile/T15039d.hs | 12 +- .../partial-sigs/should_compile/T15039d.stderr | 44 +- .../tests/partial-sigs/should_fail/T14040a.hs | 2 +- testsuite/tests/partial-sigs/should_fail/T14584.hs | 2 +- .../tests/partial-sigs/should_fail/T14584.stderr | 2 +- testsuite/tests/patsyn/should_compile/T12698.hs | 2 +- testsuite/tests/patsyn/should_compile/T12968.hs | 2 +- testsuite/tests/patsyn/should_compile/T13768.hs | 8 +- testsuite/tests/patsyn/should_compile/T14058.hs | 2 +- testsuite/tests/patsyn/should_compile/T14058a.hs | 3 +- testsuite/tests/patsyn/should_fail/T14507.hs | 4 +- testsuite/tests/patsyn/should_fail/T14507.stderr | 2 +- testsuite/tests/patsyn/should_fail/T14552.hs | 2 +- testsuite/tests/perf/compiler/T12227.hs | 17 +- testsuite/tests/perf/compiler/T12545a.hs | 3 +- testsuite/tests/perf/compiler/T13035.hs | 13 +- testsuite/tests/perf/compiler/T13035.stderr | 2 +- testsuite/tests/perf/compiler/T9872d.hs | 186 ++++++-- testsuite/tests/pmcheck/complete_sigs/T14253.hs | 2 +- testsuite/tests/pmcheck/should_compile/T14086.hs | 2 +- testsuite/tests/pmcheck/should_compile/T3927b.hs | 8 +- testsuite/tests/polykinds/MonoidsTF.hs | 4 +- testsuite/tests/polykinds/PolyKinds10.hs | 27 +- testsuite/tests/polykinds/SigTvKinds3.hs | 2 +- testsuite/tests/polykinds/T10134a.hs | 3 +- testsuite/tests/polykinds/T10934.hs | 6 +- testsuite/tests/polykinds/T11142.hs | 2 +- testsuite/tests/polykinds/T11399.hs | 2 +- testsuite/tests/polykinds/T11480b.hs | 24 +- testsuite/tests/polykinds/T11520.hs | 2 +- testsuite/tests/polykinds/T11523.hs | 1 - testsuite/tests/polykinds/T11554.hs | 2 +- testsuite/tests/polykinds/T11616.hs | 2 +- testsuite/tests/polykinds/T11640.hs | 2 +- testsuite/tests/polykinds/T11648.hs | 4 +- testsuite/tests/polykinds/T11648b.hs | 2 +- testsuite/tests/polykinds/T11821a.hs | 2 +- testsuite/tests/polykinds/T12055.hs | 4 +- testsuite/tests/polykinds/T12055a.hs | 4 +- testsuite/tests/polykinds/T12593.hs | 2 +- testsuite/tests/polykinds/T12668.hs | 2 +- testsuite/tests/polykinds/T12718.hs | 2 +- testsuite/tests/polykinds/T13391.hs | 7 - testsuite/tests/polykinds/T13391.stderr | 7 - testsuite/tests/polykinds/T13625.hs | 2 +- testsuite/tests/polykinds/T13659.hs | 4 +- testsuite/tests/polykinds/T13659.stderr | 2 +- testsuite/tests/polykinds/T13738.hs | 2 +- testsuite/tests/polykinds/T13985.stderr | 10 +- testsuite/tests/polykinds/T14174.hs | 2 +- testsuite/tests/polykinds/T14174a.hs | 7 +- testsuite/tests/polykinds/T14209.hs | 2 +- testsuite/tests/polykinds/T14270.hs | 2 +- testsuite/tests/polykinds/T14450.hs | 4 +- testsuite/tests/polykinds/T14450.stderr | 2 +- testsuite/tests/polykinds/T14515.hs | 3 +- testsuite/tests/polykinds/T14520.hs | 4 +- testsuite/tests/polykinds/T14555.hs | 4 +- testsuite/tests/polykinds/T14561.hs | 2 +- testsuite/tests/polykinds/T14563.hs | 2 +- testsuite/tests/polykinds/T14580.hs | 2 +- testsuite/tests/polykinds/T14710.stderr | 8 - testsuite/tests/polykinds/T14846.hs | 2 +- testsuite/tests/polykinds/T14873.hs | 3 +- testsuite/tests/polykinds/T15170.hs | 2 +- testsuite/tests/polykinds/T5716.hs | 3 +- testsuite/tests/polykinds/T5716.stderr | 10 +- testsuite/tests/polykinds/T6021.stderr | 4 - testsuite/tests/polykinds/T6035.hs | 4 +- testsuite/tests/polykinds/T6039.stderr | 12 +- testsuite/tests/polykinds/T6093.hs | 7 +- testsuite/tests/polykinds/T7404.stderr | 4 - testsuite/tests/polykinds/T7594.hs | 6 +- testsuite/tests/polykinds/T7594.stderr | 9 +- testsuite/tests/polykinds/T8566.hs | 8 +- testsuite/tests/polykinds/T8566.stderr | 8 +- testsuite/tests/polykinds/T8566a.hs | 8 +- testsuite/tests/polykinds/T8985.hs | 8 +- testsuite/tests/polykinds/T9222.hs | 3 +- testsuite/tests/polykinds/T9222.stderr | 6 +- testsuite/tests/polykinds/all.T | 5 +- testsuite/tests/printer/Ppr040.hs | 2 +- testsuite/tests/printer/Ppr045.hs | 1 + testsuite/tests/rename/should_fail/T11592.hs | 2 +- testsuite/tests/rename/should_fail/T13947.stderr | 2 +- .../tests/simplCore/should_compile/T13025a.hs | 6 +- testsuite/tests/simplCore/should_compile/T13658.hs | 2 +- .../tests/simplCore/should_compile/T14270a.hs | 3 +- .../tests/simplCore/should_compile/T15186A.hs | 2 +- testsuite/tests/simplCore/should_compile/T4903a.hs | 10 +- testsuite/tests/simplCore/should_run/T13750a.hs | 13 +- testsuite/tests/th/T11463.hs | 2 +- testsuite/tests/th/T11484.hs | 2 +- testsuite/tests/th/T13642.hs | 2 +- testsuite/tests/th/T13781.hs | 2 +- testsuite/tests/th/T14060.hs | 2 +- testsuite/tests/th/T14869.hs | 2 +- testsuite/tests/th/T8031.hs | 4 +- testsuite/tests/th/TH_RichKinds2.hs | 5 +- testsuite/tests/th/TH_RichKinds2.stderr | 2 +- .../tests/typecheck/should_compile/SplitWD.hs | 2 +- testsuite/tests/typecheck/should_compile/T10432.hs | 5 +- testsuite/tests/typecheck/should_compile/T11237.hs | 4 +- testsuite/tests/typecheck/should_compile/T11348.hs | 1 - testsuite/tests/typecheck/should_compile/T11524.hs | 1 - testsuite/tests/typecheck/should_compile/T11723.hs | 2 +- testsuite/tests/typecheck/should_compile/T11811.hs | 2 +- testsuite/tests/typecheck/should_compile/T12133.hs | 4 +- testsuite/tests/typecheck/should_compile/T12381.hs | 2 +- testsuite/tests/typecheck/should_compile/T12734.hs | 38 +- .../tests/typecheck/should_compile/T12734a.hs | 31 +- .../tests/typecheck/should_compile/T12734a.stderr | 9 +- .../tests/typecheck/should_compile/T12785a.hs | 2 +- testsuite/tests/typecheck/should_compile/T12911.hs | 2 +- testsuite/tests/typecheck/should_compile/T12919.hs | 2 +- testsuite/tests/typecheck/should_compile/T12987.hs | 2 +- testsuite/tests/typecheck/should_compile/T13083.hs | 5 +- testsuite/tests/typecheck/should_compile/T13333.hs | 2 +- testsuite/tests/typecheck/should_compile/T13337.hs | 2 +- testsuite/tests/typecheck/should_compile/T13343.hs | 2 +- testsuite/tests/typecheck/should_compile/T13458.hs | 2 +- testsuite/tests/typecheck/should_compile/T13603.hs | 2 +- testsuite/tests/typecheck/should_compile/T13643.hs | 2 +- testsuite/tests/typecheck/should_compile/T13822.hs | 3 +- testsuite/tests/typecheck/should_compile/T13871.hs | 2 +- testsuite/tests/typecheck/should_compile/T13879.hs | 2 +- .../tests/typecheck/should_compile/T13915a.hs | 2 +- .../tests/typecheck/should_compile/T13915b.hs | 2 +- testsuite/tests/typecheck/should_compile/T13943.hs | 2 +- testsuite/tests/typecheck/should_compile/T14441.hs | 3 +- .../tests/typecheck/should_compile/T14934a.hs | 3 +- testsuite/tests/typecheck/should_compile/all.T | 4 +- testsuite/tests/typecheck/should_compile/tc191.hs | 2 +- testsuite/tests/typecheck/should_compile/tc205.hs | 4 +- testsuite/tests/typecheck/should_compile/tc269.hs | 3 +- .../should_compile/valid_hole_fits_interactions.hs | 2 +- .../tests/typecheck/should_fail/ClassOperator.hs | 4 +- .../typecheck/should_fail/ClassOperator.stderr | 16 +- .../typecheck/should_fail/CustomTypeErrors04.hs | 2 +- .../typecheck/should_fail/CustomTypeErrors05.hs | 2 +- .../tests/typecheck/should_fail/LevPolyBounded.hs | 2 +- testsuite/tests/typecheck/should_fail/T11313.hs | 2 - .../tests/typecheck/should_fail/T11313.stderr | 8 +- testsuite/tests/typecheck/should_fail/T11724.hs | 2 +- testsuite/tests/typecheck/should_fail/T11963.hs | 29 -- .../tests/typecheck/should_fail/T11963.stderr | 20 - testsuite/tests/typecheck/should_fail/T12648.hs | 6 +- testsuite/tests/typecheck/should_fail/T12709.hs | 3 +- .../tests/typecheck/should_fail/T12709.stderr | 8 +- testsuite/tests/typecheck/should_fail/T12785b.hs | 8 +- testsuite/tests/typecheck/should_fail/T12973.hs | 2 +- testsuite/tests/typecheck/should_fail/T13105.hs | 2 +- testsuite/tests/typecheck/should_fail/T13446.hs | 4 +- testsuite/tests/typecheck/should_fail/T13909.hs | 2 +- testsuite/tests/typecheck/should_fail/T13929.hs | 2 +- .../tests/typecheck/should_fail/T13983.stderr | 2 +- testsuite/tests/typecheck/should_fail/T14350.hs | 2 +- testsuite/tests/typecheck/should_fail/T14904a.hs | 2 +- testsuite/tests/typecheck/should_fail/T14904b.hs | 2 +- testsuite/tests/typecheck/should_fail/T7645.hs | 4 +- testsuite/tests/typecheck/should_fail/T7645.stderr | 5 +- testsuite/tests/typecheck/should_fail/all.T | 1 - .../tests/typecheck/should_run/EtaExpandLevPoly.hs | 4 +- .../typecheck/should_run/KindInvariant.script | 6 +- testsuite/tests/typecheck/should_run/T11120.hs | 2 +- testsuite/tests/typecheck/should_run/T12809.hs | 2 +- testsuite/tests/typecheck/should_run/T13435.hs | 3 +- testsuite/tests/typecheck/should_run/TypeOf.hs | 2 +- testsuite/tests/typecheck/should_run/TypeRep.hs | 4 +- testsuite/tests/unboxedsums/sum_rr.hs | 2 +- 391 files changed, 1865 insertions(+), 1997 deletions(-)
Diff suppressed because of size. To see it, use:
git diff-tree --root --patch-with-stat --no-color
--find-copies-harder
--ignore-space-at-eol --cc d650729f9a0f3b6aa5e6ef2d5fba337f6f70fa60 _______________________________________________ ghc-commits mailing list ghc-commits@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-commits
_______________________________________________ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
participants (2)
-
Gabor Greif -
Vladislav Zavialov