Permalink
Browse files

Updated for GHC 7.2 (thanks to Sebastian Fischer)

  • Loading branch information...
1 parent 36b36de commit 21dcadb541f83bd1a48fce36faddf210b878ac5c Edwin Brady committed Aug 17, 2011
Showing with 7 additions and 7 deletions.
  1. +1 −1 Ivor/Datatype.lhs
  2. +1 −1 Ivor/Evaluator.lhs
  3. +1 −1 Ivor/PMComp.lhs
  4. +1 −1 Ivor/Values.lhs
  5. +3 −3 ivor.cabal
View
2 Ivor/Datatype.lhs
@@ -9,7 +9,7 @@
> import Ivor.Values
> import Debug.Trace
-> import List
+> import Data.List
> data Datadecl = Datadecl {
> datatycon :: Name,
View
2 Ivor/Evaluator.lhs
@@ -12,7 +12,7 @@
> import Debug.Trace
> import Data.Typeable
> import Control.Monad.State
-> import List
+> import Data.List
> import qualified Data.Map as Map
data Machine = Machine { term :: (TT Name),
View
2 Ivor/PMComp.lhs
@@ -12,7 +12,7 @@ this. Let's just make it work first...)
> import Data.Typeable
> import Debug.Trace
> import Control.Monad.State
-> import List hiding (partition)
+> import Data.List hiding (partition)
> data CS = CS Int
View
2 Ivor/Values.lhs
@@ -11,7 +11,7 @@ FIXME: Most of this stuff and Ivor.Nobby have GOT TO GO!!!
> import Debug.Trace
> import Data.Typeable
> import Control.Monad.State
-> import List
+> import Data.List
> import qualified Data.Map as Map
To begin, we need to define the context in which normalisation takes place.
View
6 ivor.cabal
@@ -7,7 +7,7 @@ Author: Edwin Brady
Maintainer: Edwin Brady <eb@dcs.st-and.ac.uk>
Homepage: http://www.dcs.st-and.ac.uk/~eb/Ivor/
Stability: experimental
-Build-depends: base, haskell98, parsec, mtl, directory, containers
+-- Build-depends: base, haskell98, parsec, mtl, directory, containers
Extensions: MultiParamTypeClasses, FunctionalDependencies,
ExistentialQuantification, OverlappingInstances
Category: Theorem provers, Dependent Types
@@ -59,12 +59,12 @@ Extra-source-files: emacs/ivor-mode.el, examplett/staged.tt, examplett/test.c, e
-Build-depends: base >=3 && <5, parsec, mtl, directory, binary
+Build-depends: base >=3 && <5, parsec, mtl, directory, binary, containers
Build-type: Simple
Extensions: MultiParamTypeClasses, FunctionalDependencies,
ExistentialQuantification, OverlappingInstances,
- TypeSynonymInstances, PatternGuards
+ TypeSynonymInstances, FlexibleInstances, PatternGuards
-- Needs some -Wall cleanup
-- GHC-options: -Wall

0 comments on commit 21dcadb

Please sign in to comment.