summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPéter Diviánszky <divipp@gmail.com>2016-01-25 23:44:33 +0100
committerPéter Diviánszky <divipp@gmail.com>2016-01-25 23:44:33 +0100
commitab5913ad707452e9037f1d498ff231faf4c0066f (patch)
treed10971d99d042f8914a3b34dc5c03e619ef2cc4e
parent8cf45b115f3858cbcf3ed9fe89cb96ec265e8d79 (diff)
make the code more warning free
-rw-r--r--Makefile2
-rw-r--r--src/LambdaCube/Compiler/CoreToIR.hs13
-rw-r--r--src/LambdaCube/Compiler/Driver.hs5
-rw-r--r--src/LambdaCube/Compiler/Infer.hs3
-rw-r--r--test/runTests.hs20
5 files changed, 20 insertions, 23 deletions
diff --git a/Makefile b/Makefile
index 70257fed..4ae63821 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ all:
3 cabal install --constraint="indentation -trifecta" 3 cabal install --constraint="indentation -trifecta"
4 4
5repl: 5repl:
6 cd test && ghci -i../src runTests.hs 6 cd test && ghci -Wall -fno-warn-name-shadowing -fno-warn-unused-matches -fno-warn-missing-signatures -fno-warn-incomplete-patterns -fno-warn-overlapping-patterns -fno-warn-type-defaults -i../src runTests.hs
7 7
8coverage: 8coverage:
9 ./run-test-suite.sh --coverage 9 ./run-test-suite.sh --coverage
diff --git a/src/LambdaCube/Compiler/CoreToIR.hs b/src/LambdaCube/Compiler/CoreToIR.hs
index c13c63c3..6db2d3a2 100644
--- a/src/LambdaCube/Compiler/CoreToIR.hs
+++ b/src/LambdaCube/Compiler/CoreToIR.hs
@@ -7,6 +7,7 @@
7{-# LANGUAGE DeriveFunctor #-} 7{-# LANGUAGE DeriveFunctor #-}
8{-# LANGUAGE DeriveFoldable #-} 8{-# LANGUAGE DeriveFoldable #-}
9{-# LANGUAGE DeriveTraversable #-} 9{-# LANGUAGE DeriveTraversable #-}
10{-# OPTIONS_GHC -fno-warn-unused-binds #-} -- TODO: remove
10module LambdaCube.Compiler.CoreToIR 11module LambdaCube.Compiler.CoreToIR
11 ( compilePipeline 12 ( compilePipeline
12 , Exp, toExp, tyOf, outputType, boolType, trueExp 13 , Exp, toExp, tyOf, outputType, boolType, trueExp
@@ -20,17 +21,17 @@ import Data.Set (Set)
20import qualified Data.Set as Set 21import qualified Data.Set as Set
21import Data.Map (Map) 22import Data.Map (Map)
22import qualified Data.Map as Map 23import qualified Data.Map as Map
23import Data.Vector (Vector,(!)) 24import Data.Vector ((!))
24import qualified Data.Vector as Vector 25import qualified Data.Vector as Vector
25import Control.Applicative 26--import Control.Applicative
26import Control.Arrow hiding ((<+>)) 27import Control.Arrow hiding ((<+>))
27import Control.Monad.Writer 28import Control.Monad.Writer
28import Control.Monad.State 29import Control.Monad.State
29import Control.Monad.Reader 30import Control.Monad.Reader
30import Control.Monad.Except 31--import Control.Monad.Except
31import Control.Monad.Identity 32--import Control.Monad.Identity
32import Text.Parsec.Pos 33--import Text.Parsec.Pos
33import Debug.Trace 34--import Debug.Trace
34 35
35import IR(Backend(..)) 36import IR(Backend(..))
36import qualified IR as IR 37import qualified IR as IR
diff --git a/src/LambdaCube/Compiler/Driver.hs b/src/LambdaCube/Compiler/Driver.hs
index db19c0ef..6d54393c 100644
--- a/src/LambdaCube/Compiler/Driver.hs
+++ b/src/LambdaCube/Compiler/Driver.hs
@@ -4,6 +4,7 @@
4{-# LANGUAGE GeneralizedNewtypeDeriving #-} 4{-# LANGUAGE GeneralizedNewtypeDeriving #-}
5{-# LANGUAGE FlexibleContexts #-} 5{-# LANGUAGE FlexibleContexts #-}
6{-# LANGUAGE ScopedTypeVariables #-} 6{-# LANGUAGE ScopedTypeVariables #-}
7{-# OPTIONS_GHC -fno-warn-orphans #-} -- instance MonadMask m => MonadMask (ExceptT e m)
7module LambdaCube.Compiler.Driver 8module LambdaCube.Compiler.Driver
8 ( Backend(..) 9 ( Backend(..)
9 , Pipeline 10 , Pipeline
@@ -18,10 +19,10 @@ module LambdaCube.Compiler.Driver
18 , catchMM, catchErr 19 , catchMM, catchErr
19 , ioFetch 20 , ioFetch
20 , getDef, compileMain, preCompile 21 , getDef, compileMain, preCompile
22 , removeFromCache
21 ) where 23 ) where
22 24
23import Data.List 25import Data.List
24import Data.Maybe
25import Data.Map (Map) 26import Data.Map (Map)
26import qualified Data.Map as Map 27import qualified Data.Map as Map
27import Control.Monad.State 28import Control.Monad.State
@@ -35,7 +36,7 @@ import Control.Exception hiding (catch, bracket, finally, mask)
35import Control.Arrow hiding ((<+>)) 36import Control.Arrow hiding ((<+>))
36import System.Directory 37import System.Directory
37import System.FilePath 38import System.FilePath
38import Debug.Trace 39--import Debug.Trace
39import qualified Data.Text as T 40import qualified Data.Text as T
40import qualified Data.Text.IO as TIO 41import qualified Data.Text.IO as TIO
41 42
diff --git a/src/LambdaCube/Compiler/Infer.hs b/src/LambdaCube/Compiler/Infer.hs
index ebc27035..b3c0fbf6 100644
--- a/src/LambdaCube/Compiler/Infer.hs
+++ b/src/LambdaCube/Compiler/Infer.hs
@@ -10,6 +10,8 @@
10{-# LANGUAGE RecursiveDo #-} 10{-# LANGUAGE RecursiveDo #-}
11{-# LANGUAGE RankNTypes #-} 11{-# LANGUAGE RankNTypes #-}
12{-# LANGUAGE GeneralizedNewtypeDeriving #-} 12{-# LANGUAGE GeneralizedNewtypeDeriving #-}
13{-# OPTIONS_GHC -fno-warn-unused-binds #-} -- TODO: remove
14{-# OPTIONS_GHC -fno-warn-orphans #-} -- instance NFData SourcePos
13module LambdaCube.Compiler.Infer 15module LambdaCube.Compiler.Infer
14 ( Binder (..), SName, Lit(..), Visibility(..), FunName(..), CaseFunName(..), ConName(..), TyConName(..), Export(..), ModuleR(..) 16 ( Binder (..), SName, Lit(..), Visibility(..), FunName(..), CaseFunName(..), ConName(..), TyConName(..), Export(..), ModuleR(..)
15 , Exp (..), GlobalEnv 17 , Exp (..), GlobalEnv
@@ -40,7 +42,6 @@ import Control.Monad.State
40import Control.Monad.Identity 42import Control.Monad.Identity
41import Control.Arrow hiding ((<+>)) 43import Control.Arrow hiding ((<+>))
42import Control.Applicative 44import Control.Applicative
43import Control.Exception hiding (try)
44import Control.DeepSeq 45import Control.DeepSeq
45 46
46import Text.Parsec hiding (label, Empty, State, (<|>), many, try) 47import Text.Parsec hiding (label, Empty, State, (<|>), many, try)
diff --git a/test/runTests.hs b/test/runTests.hs
index 5cbb01bc..9c494db4 100644
--- a/test/runTests.hs
+++ b/test/runTests.hs
@@ -7,33 +7,27 @@ module Main where
7import Data.List 7import Data.List
8import Data.Time.Clock 8import Data.Time.Clock
9import Control.Applicative 9import Control.Applicative
10import Control.Arrow
11import Control.Concurrent 10import Control.Concurrent
12import Control.Concurrent.Async 11import Control.Concurrent.Async
13import Control.Monad 12import Control.Monad
14import Control.Monad.Reader 13import Control.Monad.Reader
15 14import Control.Exception hiding (catch)
16import System.Environment 15import Control.Monad.Trans.Control
16import Control.DeepSeq
17import System.Exit 17import System.Exit
18import System.Directory 18import System.Directory
19import System.FilePath 19import System.FilePath
20import System.IO 20import System.IO
21import Control.Exception hiding (catch)
22import Control.Monad.Trans.Control
23import Control.Monad.Catch
24import Control.DeepSeq
25import Options.Applicative 21import Options.Applicative
26import Options.Applicative.Types
27import Text.Printf
28 22
29import qualified Data.Text as T 23import qualified Data.Text as T
30import qualified Data.Text.IO as TIO 24import qualified Data.Text.IO as TIO
25import Text.Printf
26import Text.Parsec.Pos
31 27
32import LambdaCube.Compiler.Pretty hiding ((</>)) 28import LambdaCube.Compiler.Pretty (ppShow)
29import LambdaCube.Compiler.CoreToIR (compilePipeline)
33import LambdaCube.Compiler.Driver 30import LambdaCube.Compiler.Driver
34import LambdaCube.Compiler.CoreToIR
35import IR (Backend(..))
36import Text.Parsec.Pos
37 31
38------------------------------------------ utils 32------------------------------------------ utils
39 33