From d6cbfd9a29452b3d4d0ccf17f0f68e472842b6e9 Mon Sep 17 00:00:00 2001 From: Krzysztof Gogolewski Date: Sat, 29 Aug 2020 17:10:01 +0200 Subject: 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) --- compiler/cmm/CmmParse.y | 1 + compiler/parser/Parser.y | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1