[Git][ghc/ghc][ghc-8.8] Import qualified Prelude in Cmm/Parser.y

[Ben Gamari]

Ben Gamari pushed to branch ghc-8.8 at Glasgow Haskell Compiler / GHC


Commits:
d6cbfd9a by Krzysztof Gogolewski at 2020-08-29T17:10:01+02:00
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)

- - - - -


2 changed files:

- compiler/cmm/CmmParse.y
- compiler/parser/Parser.y


Changes:

=====================================
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


=====================================
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



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d6cbfd9a29452b3d4d0ccf17f0f68e472842b6e9

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d6cbfd9a29452b3d4d0ccf17f0f68e472842b6e9
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200831/99dea769/attachment.html>