summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Zavialov <vlad.z.4096@gmail.com>2020-08-20 14:40:15 +0300
committerVladislav Zavialov <vlad.z.4096@gmail.com>2020-08-20 14:40:15 +0300
commit18f55529a1341ca5d5fed8fb166d6dd7afa576e0 (patch)
tree1f16f576ce13efed2d5799834d7a54af8a2a802a
parenteb9bdaef6024558696e1e50b12d7fefb70483a9f (diff)
downloadhaskell-wip/parser-qualified-prelude.tar.gz
Import qualified Prelude in Cmm/Parser.ywip/parser-qualified-prelude
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.
-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 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