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/nativeGen/SPARC | |
| 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/nativeGen/SPARC')
| -rw-r--r-- | compiler/nativeGen/SPARC/Ppr.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/nativeGen/SPARC/Ppr.hs b/compiler/nativeGen/SPARC/Ppr.hs index eb401fff06..b4cdbda369 100644 --- a/compiler/nativeGen/SPARC/Ppr.hs +++ b/compiler/nativeGen/SPARC/Ppr.hs @@ -572,7 +572,7 @@ pprRI (RIImm r) = pprImm r -- | Pretty print a two reg instruction. -pprFormatRegReg :: LitString -> Format -> Reg -> Reg -> SDoc +pprFormatRegReg :: PtrString -> Format -> Reg -> Reg -> SDoc pprFormatRegReg name format reg1 reg2 = hcat [ char '\t', @@ -589,7 +589,7 @@ pprFormatRegReg name format reg1 reg2 -- | Pretty print a three reg instruction. -pprFormatRegRegReg :: LitString -> Format -> Reg -> Reg -> Reg -> SDoc +pprFormatRegRegReg :: PtrString -> Format -> Reg -> Reg -> Reg -> SDoc pprFormatRegRegReg name format reg1 reg2 reg3 = hcat [ char '\t', @@ -607,7 +607,7 @@ pprFormatRegRegReg name format reg1 reg2 reg3 -- | Pretty print an instruction of two regs and a ri. -pprRegRIReg :: LitString -> Bool -> Reg -> RI -> Reg -> SDoc +pprRegRIReg :: PtrString -> Bool -> Reg -> RI -> Reg -> SDoc pprRegRIReg name b reg1 ri reg2 = hcat [ char '\t', @@ -621,7 +621,7 @@ pprRegRIReg name b reg1 ri reg2 ] {- -pprRIReg :: LitString -> Bool -> RI -> Reg -> SDoc +pprRIReg :: PtrString -> Bool -> RI -> Reg -> SDoc pprRIReg name b ri reg1 = hcat [ char '\t', |