summaryrefslogtreecommitdiff
path: root/compiler/parser
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2010-11-17 12:49:26 +0000
committerSimon Marlow <marlowsd@gmail.com>2010-11-17 12:49:26 +0000
commit8350c21760d8610b0b2f329095ffb80bb1bc20d9 (patch)
treee9dbef92f138b8ef6e6805b603a3e5b2e7de5798 /compiler/parser
parent8b104b69acda45c272a2faed0f1a2dd7e6972d87 (diff)
downloadhaskell-8350c21760d8610b0b2f329095ffb80bb1bc20d9.tar.gz
remove -XNoMonomorphismRestriction
This was apparently needed at some point during the new typechecker development, but does not seem to be required now.
Diffstat (limited to 'compiler/parser')
-rw-r--r--compiler/parser/Parser.y.pp10
-rw-r--r--compiler/parser/ParserCore.y10
2 files changed, 2 insertions, 18 deletions
diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 5441299ff5..8d561bab9f 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -9,15 +9,7 @@
{
{-# LANGUAGE BangPatterns #-} -- required for versions of Happy before 1.18.6
-{-# OPTIONS -Wwarn -w -XNoMonomorphismRestriction #-}
--- The NoMonomorphismRestriction deals with a Happy infelicity
--- With OutsideIn's more conservativ monomorphism restriction
--- we aren't generalising
--- notHappyAtAll = error "urk"
--- which is terrible. Switching off the restriction allows
--- the generalisation. Better would be to make Happy generate
--- an appropriate signature.
-
+{-# OPTIONS -Wwarn -w #-}
-- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See
diff --git a/compiler/parser/ParserCore.y b/compiler/parser/ParserCore.y
index 7c22e2105a..8bf94539fa 100644
--- a/compiler/parser/ParserCore.y
+++ b/compiler/parser/ParserCore.y
@@ -1,14 +1,6 @@
{
{-# LANGUAGE BangPatterns #-} -- required for versions of Happy before 1.18.6
-{-# OPTIONS -Wwarn -w -XNoMonomorphismRestriction #-}
--- The NoMonomorphismRestriction deals with a Happy infelicity
--- With OutsideIn's more conservativ monomorphism restriction
--- we aren't generalising
--- notHappyAtAll = error "urk"
--- which is terrible. Switching off the restriction allows
--- the generalisation. Better would be to make Happy generate
--- an appropriate signature.
---
+{-# OPTIONS -Wwarn -w #-}
-- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See