diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-05-26 16:11:58 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-01-17 19:04:50 -0500 |
| commit | 4322de246d35091e5e95a3a87fb4c1f9b7a61ee9 (patch) | |
| tree | 092cd0e518b59d5fc0d666c6f1bf56e0b3c421c2 /compiler/GHC/HsToCore | |
| parent | f4d50bafb7e14f76273aaf6f634815d5628ccc86 (diff) | |
| download | haskell-wip/rules-module.tar.gz | |
Split up `GHC.Core` somewhatwip/rules-module
- `GHC.Core.Annotated` now contains annotated Core
- `GHC.Core.Rules` now contains the rules definitions
- `GHC.Core.Orphans` now contains the orphans *something*
- `GHC.Core.Unfoldings` now contains the unfoldings defintions
- The old `GHC.Core.Rules`, which was about applying rules, is now
`GHC.Core.Rules.Apply`. Compare with `GHC.Core.Simplify.Inlin` which was also
about operations not the data structures and simple predictes
themselves (which is `GHC.Core.Unfold`).
Diffstat (limited to 'compiler/GHC/HsToCore')
| -rw-r--r-- | compiler/GHC/HsToCore/Binds.hs | 5 | ||||
| -rw-r--r-- | compiler/GHC/HsToCore/Errors/Types.hs | 3 | ||||
| -rw-r--r-- | compiler/GHC/HsToCore/Pmc/Solver.hs | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/compiler/GHC/HsToCore/Binds.hs b/compiler/GHC/HsToCore/Binds.hs index 4d594e833f..263ef8632d 100644 --- a/compiler/GHC/HsToCore/Binds.hs +++ b/compiler/GHC/HsToCore/Binds.hs @@ -39,6 +39,9 @@ import GHC.HsToCore.Pmc ( addTyCs, pmcGRHSs ) import GHC.Hs -- lots of things import GHC.Core -- lots of things +import GHC.Core.Rules +import GHC.Core.Orphans +import GHC.Core.Unfoldings import GHC.Core.SimpleOpt ( simpleOptExpr ) import GHC.Core.Opt.OccurAnal ( occurAnalyseExpr ) import GHC.Core.Make @@ -51,7 +54,7 @@ import GHC.Core.TyCon import GHC.Core.Type import GHC.Core.Coercion import GHC.Core.Multiplicity -import GHC.Core.Rules +import GHC.Core.Rules.Apply import GHC.Core.TyCo.Compare( eqType ) import GHC.Builtin.Names diff --git a/compiler/GHC/HsToCore/Errors/Types.hs b/compiler/GHC/HsToCore/Errors/Types.hs index 8f6586fb45..5f7723e937 100644 --- a/compiler/GHC/HsToCore/Errors/Types.hs +++ b/compiler/GHC/HsToCore/Errors/Types.hs @@ -6,7 +6,8 @@ module GHC.HsToCore.Errors.Types where import GHC.Prelude -import GHC.Core (CoreRule, CoreExpr, RuleName) +import GHC.Core (CoreExpr) +import GHC.Core.Rules (CoreRule, RuleName) import GHC.Core.DataCon import GHC.Core.Type import GHC.Driver.Session diff --git a/compiler/GHC/HsToCore/Pmc/Solver.hs b/compiler/GHC/HsToCore/Pmc/Solver.hs index b70c868c2f..0c520cdd24 100644 --- a/compiler/GHC/HsToCore/Pmc/Solver.hs +++ b/compiler/GHC/HsToCore/Pmc/Solver.hs @@ -59,6 +59,7 @@ import GHC.Types.Var.Set import GHC.Types.Unique.Supply import GHC.Core +import GHC.Core.Unfoldings import GHC.Core.FVs (exprFreeVars) import GHC.Core.TyCo.Compare( eqType ) import GHC.Core.Map.Expr |