[Git][ghc/ghc][wip/int-index/thtohs-parens] 3 commits: Pass correct package db when testing stage1.

Vladislav Zavialov (@int-index) gitlab at gitlab.haskell.org
Fri Oct 28 17:50:57 UTC 2022



Vladislav Zavialov pushed to branch wip/int-index/thtohs-parens at Glasgow Haskell Compiler / GHC


Commits:
750846cd by Zubin Duggal at 2022-10-28T00:49:22-04:00
Pass correct package db when testing stage1.

It used to pick the db for stage-2 which obviously didn't work.

- - - - -
ad612f55 by Krzysztof Gogolewski at 2022-10-28T00:50:00-04:00
Minor SDoc-related cleanup

* Rename pprCLabel to pprCLabelStyle, and use the name pprCLabel
  for a function using CStyle (analogous to pprAsmLabel)
* Move LabelStyle to the CLabel module, it no longer needs to be in Outputable.
* Move calls to 'text' right next to literals, to make sure the text/str
  rule is triggered.
* Remove FastString/String roundtrip in Tc.Deriv.Generate
* Introduce showSDocForUser', which abstracts over a pattern in
  GHCi.UI

- - - - -
3baabdaa by Vladislav Zavialov at 2022-10-28T21:24:53+04:00
ThToHs: fix overzealous parenthesization

Before this patch, when converting from TH.Exp to LHsExpr GhcPs,
the compiler inserted more parentheses than required:

	((f a) (b + c)) d

This was happening because the LHS of the function application was
parenthesized as if it was the RHS.

Now we use funPrec and appPrec appropriately and produce sensibly
parenthesized expressions:

	f a (b + c) d

I also took the opportunity to remove the special case for LamE,
which was not special at all and simply duplicated code.

- - - - -


30 changed files:

- compiler/GHC/Cmm/CLabel.hs
- compiler/GHC/Cmm/CLabel.hs-boot
- compiler/GHC/Cmm/Parser.y
- compiler/GHC/CmmToAsm/Dwarf/Types.hs
- compiler/GHC/CmmToC.hs
- compiler/GHC/CmmToLlvm/Base.hs
- compiler/GHC/Core/Opt/SetLevels.hs
- compiler/GHC/Driver/CodeOutput.hs
- compiler/GHC/Driver/Main.hs
- compiler/GHC/Hs/Utils.hs
- compiler/GHC/HsToCore/Coverage.hs
- compiler/GHC/Iface/Tidy/StaticPtrTable.hs
- compiler/GHC/Linker/ExtraObj.hs
- compiler/GHC/Parser/Errors/Ppr.hs
- compiler/GHC/Stg/Lift/Monad.hs
- compiler/GHC/StgToCmm/InfoTableProv.hs
- compiler/GHC/Tc/Deriv.hs
- compiler/GHC/Tc/Deriv/Generate.hs
- compiler/GHC/ThToHs.hs
- compiler/GHC/Types/ForeignCall.hs
- compiler/GHC/Types/ForeignStubs.hs
- compiler/GHC/Utils/Outputable.hs
- ghc/GHCi/UI.hs
- hadrian/src/Rules/Test.hs
- hadrian/src/Settings/Default.hs
- testsuite/tests/th/T13776.stderr
- testsuite/tests/th/T14681.stderr
- testsuite/tests/th/T17608.stderr
- + testsuite/tests/th/TH_fun_par.hs
- + testsuite/tests/th/TH_fun_par.stderr


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ca30bf744e57d571332ae473362e6590208a88ae...3baabdaa05e37d7fc123568a2be408feec5d4d84

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ca30bf744e57d571332ae473362e6590208a88ae...3baabdaa05e37d7fc123568a2be408feec5d4d84
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221028/9623f75d/attachment.html>


More information about the ghc-commits mailing list