From 54ae70a81e338fd05397ab22890b3ca36284be54 Mon Sep 17 00:00:00 2001
From: hallgren <hallgren@chalmers.se>
Date: Mon, 16 Feb 2015 15:05:06 +0000
Subject: Changes for compatibility with ghc-7.10-rc2

2 modules: Name clashes caused by Applicative-Monad change in Prelude
2 modules: Ambiguities caused by Foldable/Traversable in Prelude
2 modules: Backwards incompatible changes in time-1.5 for defaultTimeLocale
9 modules: {-# LANGUAGE FlexibleContexts #-} (because GHC checks inferred types
           now, in addition to explicitly given type signatures)

Also silenced warnings about tab characters in source files.
---
 src/runtime/c/INSTALL                | 2 +-
 src/runtime/haskell/PGF/Linearize.hs | 1 +
 src/runtime/haskell/PGF/Parse.hs     | 2 +-
 src/runtime/haskell/PGF/Printer.hs   | 1 +
 src/runtime/haskell/PGF/Tokenizer.hs | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/runtime')

diff --git a/src/runtime/c/INSTALL b/src/runtime/c/INSTALL
index e2bae218a..7f2e1a6ee 100644
--- a/src/runtime/c/INSTALL
+++ b/src/runtime/c/INSTALL
@@ -12,7 +12,7 @@ grammar you also have to add the option '-literal=Symb' while compiling.
 For Linux users
 ---------------
 
-You will need the package: libtool
+You will need the package: autoconf, libtool
 
 The compilation steps are:
 
diff --git a/src/runtime/haskell/PGF/Linearize.hs b/src/runtime/haskell/PGF/Linearize.hs
index 3f11f93d1..2393010b7 100644
--- a/src/runtime/haskell/PGF/Linearize.hs
+++ b/src/runtime/haskell/PGF/Linearize.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE FlexibleContexts #-}
 module PGF.Linearize
             ( linearize
             , linearizeAll
diff --git a/src/runtime/haskell/PGF/Parse.hs b/src/runtime/haskell/PGF/Parse.hs
index 11705f326..c62522c1e 100644
--- a/src/runtime/haskell/PGF/Parse.hs
+++ b/src/runtime/haskell/PGF/Parse.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE BangPatterns, RankNTypes #-}
+{-# LANGUAGE BangPatterns, RankNTypes, FlexibleContexts #-}
 module PGF.Parse
           ( ParseState
           , ErrorState
diff --git a/src/runtime/haskell/PGF/Printer.hs b/src/runtime/haskell/PGF/Printer.hs
index 2013a3c9c..5022cbb82 100644
--- a/src/runtime/haskell/PGF/Printer.hs
+++ b/src/runtime/haskell/PGF/Printer.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE FlexibleContexts #-}
 module PGF.Printer (ppPGF,ppCat,ppFId,ppFunId,ppSeqId,ppSeq,ppFun) where
 
 import PGF.CId
diff --git a/src/runtime/haskell/PGF/Tokenizer.hs b/src/runtime/haskell/PGF/Tokenizer.hs
index ec75853aa..2fa6bcd48 100644
--- a/src/runtime/haskell/PGF/Tokenizer.hs
+++ b/src/runtime/haskell/PGF/Tokenizer.hs
@@ -9,6 +9,7 @@ module PGF.Tokenizer
        ( mkTokenizer
        ) where
 
+import Prelude hiding ((<*>))
 --import Data.List (intercalate)
 --import Test.QuickCheck
 import FST.TransducerInterface
-- 
cgit v1.2.3