diff options
| author | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2020-09-30 09:24:39 +0300 |
|---|---|---|
| committer | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2020-10-02 01:39:25 +0300 |
| commit | d5e13cebc969f9820b6b9437afe0699e15bbc2ff (patch) | |
| tree | dc3ba9494530a6ead0a37f62c2c07ad93823bd10 | |
| parent | 7c7bd94dc0117dff4e5071211e759528541c9df9 (diff) | |
| download | haskell-wip/backport-9.0-linear-types-syntax.tar.gz | |
Fix pretty-printing of the mult-polymorphic arrowwip/backport-9.0-linear-types-syntax
(cherry-picked from a8018c17747342444c67eeec21a506c89c1110e8)
6 files changed, 12 insertions, 12 deletions
diff --git a/compiler/GHC/Utils/Outputable.hs b/compiler/GHC/Utils/Outputable.hs index 5ea7dc5d60..83407e43cd 100644 --- a/compiler/GHC/Utils/Outputable.hs +++ b/compiler/GHC/Utils/Outputable.hs @@ -677,7 +677,7 @@ lbrace = docToSDoc $ Pretty.lbrace rbrace = docToSDoc $ Pretty.rbrace mulArrow :: SDoc -> SDoc -mulArrow d = text "#" <+> d <+> arrow +mulArrow d = text "%" <> d <+> arrow forAllLit :: SDoc diff --git a/testsuite/tests/linear/should_fail/LinearErrOrigin.stderr b/testsuite/tests/linear/should_fail/LinearErrOrigin.stderr index 02dc7216db..7bd7222618 100644 --- a/testsuite/tests/linear/should_fail/LinearErrOrigin.stderr +++ b/testsuite/tests/linear/should_fail/LinearErrOrigin.stderr @@ -5,15 +5,15 @@ LinearErrOrigin.hs:7:7: error: the type signature for: foo :: forall a b (p :: GHC.Types.Multiplicity) (q :: GHC.Types.Multiplicity). - (a # p -> b) -> a # q -> b + (a %p -> b) -> a %q -> b at LinearErrOrigin.hs:6:1-31 ‘q’ is a rigid type variable bound by the type signature for: foo :: forall a b (p :: GHC.Types.Multiplicity) (q :: GHC.Types.Multiplicity). - (a # p -> b) -> a # q -> b + (a %p -> b) -> a %q -> b at LinearErrOrigin.hs:6:1-31 • In an equation for ‘foo’: foo f x = f x • Relevant bindings include - f :: a # p -> b (bound at LinearErrOrigin.hs:7:5) - foo :: (a # p -> b) -> a # q -> b (bound at LinearErrOrigin.hs:7:1) + f :: a %p -> b (bound at LinearErrOrigin.hs:7:5) + foo :: (a %p -> b) -> a %q -> b (bound at LinearErrOrigin.hs:7:1) diff --git a/testsuite/tests/linear/should_fail/LinearPartialSig.stderr b/testsuite/tests/linear/should_fail/LinearPartialSig.stderr index 704fcb258c..cc302ec4b6 100644 --- a/testsuite/tests/linear/should_fail/LinearPartialSig.stderr +++ b/testsuite/tests/linear/should_fail/LinearPartialSig.stderr @@ -3,5 +3,5 @@ LinearPartialSig.hs:5:9: error: • Found type wildcard ‘_’ standing for ‘'Many :: GHC.Types.Multiplicity’ To use the inferred type, enable PartialTypeSignatures - • In the type ‘a # _ -> a’ - In the type signature: f :: a # _ -> a + • In the type ‘a %_ -> a’ + In the type signature: f :: a %_ -> a diff --git a/testsuite/tests/linear/should_fail/LinearVar.stderr b/testsuite/tests/linear/should_fail/LinearVar.stderr index cdbb4de1c9..85a9cff899 100644 --- a/testsuite/tests/linear/should_fail/LinearVar.stderr +++ b/testsuite/tests/linear/should_fail/LinearVar.stderr @@ -1,13 +1,13 @@ LinearVar.hs:5:5: error: • Couldn't match type ‘m’ with ‘'Many’ - Expected: a # m -> b + Expected: a %m -> b Actual: a -> b ‘m’ is a rigid type variable bound by the type signature for: - f :: forall a b (m :: GHC.Types.Multiplicity). a # m -> b + f :: forall a b (m :: GHC.Types.Multiplicity). a %m -> b at LinearVar.hs:4:1-14 • In the expression: undefined :: a -> b In an equation for ‘f’: f = undefined :: a -> b • Relevant bindings include - f :: a # m -> b (bound at LinearVar.hs:5:1) + f :: a %m -> b (bound at LinearVar.hs:5:1) diff --git a/testsuite/tests/roles/should_compile/Roles13.stderr b/testsuite/tests/roles/should_compile/Roles13.stderr index 8b55b600a5..1a5a04b37f 100644 --- a/testsuite/tests/roles/should_compile/Roles13.stderr +++ b/testsuite/tests/roles/should_compile/Roles13.stderr @@ -14,7 +14,7 @@ convert :: Wrap Age -> Int convert = convert1 `cast` (<Wrap Age>_R - # <'Many>_N ->_R Roles13.N:Wrap[0] (Roles13.N:Age[0]) + %<'Many>_N ->_R Roles13.N:Wrap[0] (Roles13.N:Age[0]) :: (Wrap Age -> Wrap Age) ~R# (Wrap Age -> Int)) -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} diff --git a/testsuite/tests/simplCore/should_compile/T4201.stdout b/testsuite/tests/simplCore/should_compile/T4201.stdout index 14c7c957de..d6c3879899 100644 --- a/testsuite/tests/simplCore/should_compile/T4201.stdout +++ b/testsuite/tests/simplCore/should_compile/T4201.stdout @@ -1,4 +1,4 @@ [HasNoCafRefs, LambdaFormInfo: LFReEntrant 1, Arity: 1, Strictness: <S,1*U>, Unfolding: InlineRule (0, True, True) - bof `cast` (Sym (N:Foo[0]) # <'Many>_N ->_R <T>_R)] + bof `cast` (Sym (N:Foo[0]) %<'Many>_N ->_R <T>_R)] |