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/coreSyn/CoreUtils.hs | |
| 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/coreSyn/CoreUtils.hs')
| -rw-r--r-- | compiler/coreSyn/CoreUtils.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs index c39e681ccb..aa77592ef0 100644 --- a/compiler/coreSyn/CoreUtils.hs +++ b/compiler/coreSyn/CoreUtils.hs @@ -1527,7 +1527,7 @@ expr_ok primop_ok other_expr | (expr, args) <- collectArgs other_expr = case stripTicksTopE (not . tickishCounts) expr of Var f -> app_ok primop_ok f args - -- 'RubbishLit' is the only literal that can occur in the head of an + -- 'LitRubbish' is the only literal that can occur in the head of an -- application and will not be matched by the above case (Var /= Lit). Lit lit -> ASSERT( lit == rubbishLit ) True _ -> False @@ -1853,7 +1853,7 @@ exprIsTickedString = isJust . exprIsTickedString_maybe -- different shape. -- Used to "look through" Ticks in places that need to handle literal strings. exprIsTickedString_maybe :: CoreExpr -> Maybe ByteString -exprIsTickedString_maybe (Lit (MachStr bs)) = Just bs +exprIsTickedString_maybe (Lit (LitString bs)) = Just bs exprIsTickedString_maybe (Tick t e) -- we don't tick literals with CostCentre ticks, compare to mkTick | tickishPlace t == PlaceCostCentre = Nothing @@ -2489,9 +2489,9 @@ rhsIsStatic platform is_dynamic_name cvt_literal rhs = is_static False rhs is_static in_arg (Lit (LitNumber nt i _)) = case cvt_literal nt i of Just e -> is_static in_arg e Nothing -> True - is_static _ (Lit (MachLabel {})) = False + is_static _ (Lit (LitLabel {})) = False is_static _ (Lit _) = True - -- A MachLabel (foreign import "&foo") in an argument + -- A LitLabel (foreign import "&foo") in an argument -- prevents a constructor application from being static. The -- reason is that it might give rise to unresolvable symbols -- in the object file: under Linux, references to "weak" |