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

[Ben Gamari]

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


Commits:
e512d310 by Vladislav Zavialov at 2020-08-29T17:03:38+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
=====================================
@@ -203,6 +203,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 GHC.StgToCmm.ExtCode
 import CmmCallConv


=====================================
compiler/parser/Parser.y
=====================================
@@ -42,7 +42,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/hsSyn
 import GHC.Hs



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e512d310e668b77a9d1e022dbff45050f69032f5
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/cb2c80cf/attachment-0001.html>