summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Zavialov <vlad.z.4096@gmail.com>2020-08-20 14:40:15 +0300
committerKrzysztof Gogolewski <krzysztof.gogolewski@tweag.io>2020-08-29 16:54:45 +0200
commit29e9d2d106082ce435a24ec46c48f257f53a16f6 (patch)
tree57f6919959653c51a4e5c4093a873aecaf059403
parent5ccf44c6f0e27e83bf2828f0834bb790b1834929 (diff)
downloadhaskell-29e9d2d106082ce435a24ec46c48f257f53a16f6.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/GHC/Cmm/Parser.y1
-rw-r--r--compiler/GHC/Parser.y2
2 files changed, 2 insertions, 1 deletions
diff --git a/compiler/GHC/Cmm/Parser.y b/compiler/GHC/Cmm/Parser.y
index eeab41df7b..061801dda4 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.StgToCmm.ExtCode
import GHC.Cmm.CallConv
diff --git a/compiler/GHC/Parser.y b/compiler/GHC/Parser.y
index b84d94b3d8..a5adaf9219 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