From fddddbf47d6ba2b1b3b6ec89bd40c8fa020e6606 Mon Sep 17 00:00:00 2001 From: Vladislav Zavialov Date: Thu, 20 Aug 2020 14:40:15 +0300 Subject: [PATCH] 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. --- compiler/GHC/Cmm/Parser.y | 1 + compiler/GHC/Parser.y | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/GHC/Cmm/Parser.y b/compiler/GHC/Cmm/Parser.y index 0be73b66f8..b2c107d429 100644 --- a/compiler/GHC/Cmm/Parser.y +++ b/compiler/GHC/Cmm/Parser.y @@ -203,6 +203,7 @@ necessary to the stack to accommodate it (e.g. 2). module GHC.Cmm.Parser ( parseCmmFile ) where import GHC.Prelude +import qualified Prelude -- for happy-generated code import GHC.Platform import GHC.Platform.Profile diff --git a/compiler/GHC/Parser.y b/compiler/GHC/Parser.y index 185dc362ea..0cd8f29cac 100644 --- a/compiler/GHC/Parser.y +++ b/compiler/GHC/Parser.y @@ -46,7 +46,7 @@ import Data.Char import Data.Maybe ( maybeToList ) import Control.Monad ( mplus ) import Control.Applicative ((<$)) -import qualified Prelude +import qualified Prelude -- for happy-generated code -- compiler import GHC.Hs -- GitLab