diff options
| author | Sylvain Henry <hsyl20@gmail.com> | 2018-11-22 11:31:16 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-11-22 12:11:15 -0500 |
| commit | 13bb4bf44e6e690133be334bbf0c63fcae5db34a (patch) | |
| tree | ee7a9a9f60ca936b16cc15a46c758d4dc51abfd7 /compiler/stgSyn | |
| parent | f5fbecc85967218fd8ba6512f10eea2daf2812ac (diff) | |
| download | haskell-13bb4bf44e6e690133be334bbf0c63fcae5db34a.tar.gz | |
Rename literal constructors
In a previous patch we replaced some built-in literal constructors
(MachInt, MachWord, etc.) with a single LitNumber constructor.
In this patch we replace the `Mach` prefix of the remaining constructors
with `Lit` for consistency (e.g., LitChar, LitLabel, etc.).
Sadly the name `LitString` was already taken for a kind of FastString
and it would become misleading to have both `LitStr` (literal
constructor renamed after `MachStr`) and `LitString` (FastString
variant). Hence this patch renames the FastString variant `PtrString`
(which is more accurate) and the literal string constructor now uses the
least surprising `LitString` name.
Both `Literal` and `LitString/PtrString` have recently seen breaking
changes so doing this kind of renaming now shouldn't harm much.
Reviewers: hvr, goldfire, bgamari, simonmar, jrtc27, tdammers
Subscribers: tdammers, rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D4881
Diffstat (limited to 'compiler/stgSyn')
| -rw-r--r-- | compiler/stgSyn/CoreToStg.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/stgSyn/CoreToStg.hs b/compiler/stgSyn/CoreToStg.hs index 1b1d4639f2..74bb7b6014 100644 --- a/compiler/stgSyn/CoreToStg.hs +++ b/compiler/stgSyn/CoreToStg.hs @@ -371,8 +371,8 @@ coreToStgExpr coreToStgExpr (Lit (LitNumber LitNumInteger _ _)) = panic "coreToStgExpr: LitInteger" coreToStgExpr (Lit (LitNumber LitNumNatural _ _)) = panic "coreToStgExpr: LitNatural" coreToStgExpr (Lit l) = return (StgLit l) -coreToStgExpr (App (Lit RubbishLit) _some_unlifted_type) - -- We lower 'RubbishLit' to @()@ here, which is much easier than doing it in +coreToStgExpr (App (Lit LitRubbish) _some_unlifted_type) + -- We lower 'LitRubbish' to @()@ here, which is much easier than doing it in -- a STG to Cmm pass. = coreToStgExpr (Var unitDataConId) coreToStgExpr (Var v) = coreToStgApp Nothing v [] [] |