3a_asm: ghc flags

diff --git a/3a_asm/Control/Monad/Error/Class.hs b/3a_asm/Control/Monad/Error/Class.hs
index 6646dcbf6de3ba909ac4e94d4c07a8d5b55d9d0f..c42f18c7081d294955aa29d7da7efa006e6da1bf 100644 (file)
--- a/3a_asm/Control/Monad/Error/Class.hs
+++ b/3a_asm/Control/Monad/Error/Class.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE UndecidableInstances, MultiParamTypeClasses, FunctionalDependencies, TypeSynonymInstances #-}
 -- Needed for the same reasons as in Reader, State etc
 
 {- |

diff --git a/3a_asm/Control/Monad/Reader/Class.hs b/3a_asm/Control/Monad/Reader/Class.hs
index c0a9bd428b174f7cdbbf4c4816bc42d3237ddd20..8dd94c159fc91cd86cfa7d27f64dd5d3b313d2dd 100644 (file)
--- a/3a_asm/Control/Monad/Reader/Class.hs
+++ b/3a_asm/Control/Monad/Reader/Class.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE FlexibleInstances, UndecidableInstances, MultiParamTypeClasses, FunctionalDependencies, TypeSynonymInstances #-}
 {- |
 Module      :  Control.Monad.Reader.Class
 Copyright   :  (c) Andy Gill 2001,

diff --git a/3a_asm/Control/Monad/State/Class.hs b/3a_asm/Control/Monad/State/Class.hs
index 22bd85ebeac78101bbb541245459c74eb98f817e..c41f4099a5e72deec3bd7ddb92c8ad2514819c11 100644 (file)
--- a/3a_asm/Control/Monad/State/Class.hs
+++ b/3a_asm/Control/Monad/State/Class.hs
@@ -18,6 +18,7 @@
 --          Advanced School of Functional Programming, 1995.
 
 -----------------------------------------------------------------------------
+{-# LANGUAGE FunctionalDependencies, MultiParamTypeClasses #-}
 
 module Control.Monad.State.Class (
     -- * MonadState class

diff --git a/3a_asm/Makefile b/3a_asm/Makefile
index 1aa7edd96a4c7c90bf1188bb440a2dd1d3efe9a2..c38230d22d8586cb7f3e842c89537955d6700afe 100644 (file)
--- a/3a_asm/Makefile
+++ b/3a_asm/Makefile
@@ -1,8 +1,7 @@
 SHELL := zsh
-GHCOPT = -XMultiParamTypeClasses -XFunctionalDependencies -XTypeSynonymInstances -XFlexibleInstances
 
 all:
-       @ghc --make Main.hs $(GHCOPT) -o dtas
+       @ghc --make Main.hs -o dtas
 
 .PHONY: clean test
 clean:

diff --git a/3a_asm/Text/Parsec/ByteString/Lazy.hs b/3a_asm/Text/Parsec/ByteString/Lazy.hs
index ce930cf17ef6ab88e18c816ea942366b46feebb1..cb93603ce43321ca85bc911558322a5b527394cf 100644 (file)
--- a/3a_asm/Text/Parsec/ByteString/Lazy.hs
+++ b/3a_asm/Text/Parsec/ByteString/Lazy.hs
@@ -12,7 +12,7 @@
 --
 -----------------------------------------------------------------------------
 
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Text.Parsec.ByteString.Lazy

diff --git a/3a_asm/Text/Parsec/Prim.hs b/3a_asm/Text/Parsec/Prim.hs
index 81ab28996465d61af76d079e6986a1e445986e5d..79e16063f56a4990a5e0d598c4e6fe11a4f5cb71 100644 (file)
--- a/3a_asm/Text/Parsec/Prim.hs
+++ b/3a_asm/Text/Parsec/Prim.hs
@@ -13,7 +13,7 @@
 -----------------------------------------------------------------------------   
 
 {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleContexts,
-             UndecidableInstances #-}
+             FlexibleInstances, UndecidableInstances #-}
 
 module Text.Parsec.Prim where
 

diff --git a/3a_asm/Text/Parsec/String.hs b/3a_asm/Text/Parsec/String.hs
index a5d482e84b08bde2fae68030a7afd4f534dea89c..ec6306b4abec249b56e5418dddfacce2b3e8cb7f 100644 (file)
--- a/3a_asm/Text/Parsec/String.hs
+++ b/3a_asm/Text/Parsec/String.hs
@@ -12,7 +12,7 @@
 --
 -----------------------------------------------------------------------------
 
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Text.Parsec.String

diff --git a/3a_asm/Text/Parsec/Token.hs b/3a_asm/Text/Parsec/Token.hs
index 2b1c03254938c05a9614f6b8d04607922c4c75b6..9436e28bb03259fdb9ab1e8db85a746ff54e0e26 100644 (file)
--- a/3a_asm/Text/Parsec/Token.hs
+++ b/3a_asm/Text/Parsec/Token.hs
@@ -15,6 +15,7 @@
 
 {-# LANGUAGE PolymorphicComponents #-}
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
+{-# OPTIONS_GHC -XFlexibleContexts #-}
 
 module Text.Parsec.Token
     ( LanguageDef