diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2018-01-15 13:51:55 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-01-15 13:53:46 -0500 |
| commit | f380115cd834ffbe51aca60f5476a51b94cdd413 (patch) | |
| tree | 97ce4906b20c00a369e763954c75d3f6f02c2d9f | |
| parent | 41afbb3f20f3d84abacb37afcc5aa64b24c22da8 (diff) | |
| download | haskell-f380115cd834ffbe51aca60f5476a51b94cdd413.tar.gz | |
Parenthesize forall-type args in cvtTypeKind
Trac #14646 happened because we forgot to parenthesize `forall` types to
the left of an arrow. This simple patch fixes that.
Test Plan: make test TEST=T14646
Reviewers: alanz, goldfire, bgamari
Reviewed By: alanz
Subscribers: rwbarton, thomie, carter
GHC Trac Issues: #14646
Differential Revision: https://phabricator.haskell.org/D4298
| -rw-r--r-- | compiler/hsSyn/Convert.hs | 9 | ||||
| -rw-r--r-- | testsuite/tests/th/T14646.hs | 6 | ||||
| -rw-r--r-- | testsuite/tests/th/T14646.stderr | 6 | ||||
| -rw-r--r-- | testsuite/tests/th/all.T | 1 |
4 files changed, 18 insertions, 4 deletions
diff --git a/compiler/hsSyn/Convert.hs b/compiler/hsSyn/Convert.hs index de72878cda..e8c7f0de01 100644 --- a/compiler/hsSyn/Convert.hs +++ b/compiler/hsSyn/Convert.hs @@ -1219,10 +1219,11 @@ cvtTypeKind ty_str ty tys' ArrowT | [x',y'] <- tys' -> do - case x' of - (L _ HsFunTy{}) -> do { x'' <- returnL (HsParTy x') - ; returnL (HsFunTy x'' y') } - _ -> returnL (HsFunTy x' y') + x'' <- case x' of + L _ HsFunTy{} -> returnL (HsParTy x') + L _ HsForAllTy{} -> returnL (HsParTy x') -- #14646 + _ -> return x' + returnL (HsFunTy x'' y') | otherwise -> mk_apps (HsTyVar NotPromoted (noLoc (getRdrName funTyCon))) tys' diff --git a/testsuite/tests/th/T14646.hs b/testsuite/tests/th/T14646.hs new file mode 100644 index 0000000000..c85872365f --- /dev/null +++ b/testsuite/tests/th/T14646.hs @@ -0,0 +1,6 @@ +{-# LANGUAGE RankNTypes #-} +{-# LANGUAGE TemplateHaskell #-} +module T14646 where + +$([d| f :: (forall a. a) -> Int + f _ = undefined |]) diff --git a/testsuite/tests/th/T14646.stderr b/testsuite/tests/th/T14646.stderr new file mode 100644 index 0000000000..869cf6fd01 --- /dev/null +++ b/testsuite/tests/th/T14646.stderr @@ -0,0 +1,6 @@ +T14646.hs:(5,3)-(6,24): Splicing declarations + [d| f :: (forall a. a) -> Int + f _ = undefined |] + ======> + f :: (forall a. a) -> Int + f _ = undefined diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T index 0ad178e691..1fae4c6af8 100644 --- a/testsuite/tests/th/all.T +++ b/testsuite/tests/th/all.T @@ -397,3 +397,4 @@ test('T13887', normal, compile_and_run, ['-v0']) test('T13968', normal, compile_fail, ['-v0']) test('T14204', normal, compile_fail, ['-v0']) test('T14060', normal, compile_and_run, ['-v0']) +test('T14646', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques']) |