diff options
| author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2020-08-29 17:10:01 +0200 |
|---|---|---|
| committer | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2020-08-29 17:10:01 +0200 |
| commit | d6cbfd9a29452b3d4d0ccf17f0f68e472842b6e9 (patch) | |
| tree | 7db28ecb77036eb293b493866df4604a40f5cce8 | |
| parent | 27ddc306f26d981bb7de1abbf63b36b16a6302dd (diff) | |
| download | haskell-d6cbfd9a29452b3d4d0ccf17f0f68e472842b6e9.tar.gz | |
Import qualified Prelude in Cmm/Parser.y
In preparation for the next version of 'happy', c95920 added a qualified
import to GHC/Parser.y but for some reason neglected GHC/Cmm/Parser.y
This patch adds the missing qualified import to GHC/Cmm/Parser.y and
also adds a clarifying comment to explain why this import is needed.
(cherry picked from commit fddddbf47d6ba2b1b3b6ec89bd40c8fa020e6606)
| -rw-r--r-- | compiler/cmm/CmmParse.y | 1 | ||||
| -rw-r--r-- | compiler/parser/Parser.y | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index dda3238987..d15c60aa3a 100644 --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -201,6 +201,7 @@ necessary to the stack to accommodate it (e.g. 2). module CmmParse ( parseCmmFile ) where import GhcPrelude +import qualified Prelude -- for happy-generated code import StgCmmExtCode import CmmCallConv diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y index e72bd00f9f..b5c63b77fa 100644 --- a/compiler/parser/Parser.y +++ b/compiler/parser/Parser.y @@ -37,7 +37,7 @@ import GHC.Exts import Data.Char import Control.Monad ( mplus ) import Control.Applicative ((<$)) -import qualified Prelude +import qualified Prelude -- for happy-generated code -- compiler/hsSyn import HsSyn |