From: Bernhard Urban <lewurm@gmail.com>
Date: Sun, 31 Oct 2010 23:40:43 +0000 (+0100)
Subject: 3a_asm: ghc flags
X-Git-Tag: bootrom_v1~209
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=calu.git;a=commitdiff_plain;h=7c3fe14158249ed8068a42d3dfc9cd7b4b539b82

3a_asm: ghc flags
---

diff --git a/3a_asm/Control/Monad/Error/Class.hs b/3a_asm/Control/Monad/Error/Class.hs
index 6646dcb..c42f18c 100644
--- 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 c0a9bd4..8dd94c1 100644
--- 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 22bd85e..c41f409 100644
--- 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 1aa7edd..c38230d 100644
--- 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 ce930cf..cb93603 100644
--- 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 81ab289..79e1606 100644
--- 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 a5d482e..ec6306b 100644
--- 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 2b1c032..9436e28 100644
--- 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