diff options
-rw-r--r-- | lambdacube-compiler.cabal | 2 | ||||
-rw-r--r-- | src/LambdaCube/Compiler.hs (renamed from src/LambdaCube/Compiler/Driver.hs) | 5 | ||||
-rw-r--r-- | test/runTests.hs | 4 | ||||
-rw-r--r-- | tool/Compiler.hs | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/lambdacube-compiler.cabal b/lambdacube-compiler.cabal index 5e667c30..67054501 100644 --- a/lambdacube-compiler.cabal +++ b/lambdacube-compiler.cabal | |||
@@ -39,12 +39,12 @@ source-repository head | |||
39 | library | 39 | library |
40 | exposed-modules: | 40 | exposed-modules: |
41 | -- Compiler | 41 | -- Compiler |
42 | LambdaCube.Compiler | ||
42 | LambdaCube.Compiler.Pretty | 43 | LambdaCube.Compiler.Pretty |
43 | LambdaCube.Compiler.Lexer | 44 | LambdaCube.Compiler.Lexer |
44 | LambdaCube.Compiler.Parser | 45 | LambdaCube.Compiler.Parser |
45 | LambdaCube.Compiler.Infer | 46 | LambdaCube.Compiler.Infer |
46 | LambdaCube.Compiler.CoreToIR | 47 | LambdaCube.Compiler.CoreToIR |
47 | LambdaCube.Compiler.Driver | ||
48 | other-extensions: | 48 | other-extensions: |
49 | LambdaCase | 49 | LambdaCase |
50 | PatternSynonyms | 50 | PatternSynonyms |
diff --git a/src/LambdaCube/Compiler/Driver.hs b/src/LambdaCube/Compiler.hs index ef856112..d8b09431 100644 --- a/src/LambdaCube/Compiler/Driver.hs +++ b/src/LambdaCube/Compiler.hs | |||
@@ -6,7 +6,7 @@ | |||
6 | {-# LANGUAGE FlexibleContexts #-} | 6 | {-# LANGUAGE FlexibleContexts #-} |
7 | {-# LANGUAGE ScopedTypeVariables #-} | 7 | {-# LANGUAGE ScopedTypeVariables #-} |
8 | {-# OPTIONS_GHC -fno-warn-orphans #-} -- instance MonadMask m => MonadMask (ExceptT e m) | 8 | {-# OPTIONS_GHC -fno-warn-orphans #-} -- instance MonadMask m => MonadMask (ExceptT e m) |
9 | module LambdaCube.Compiler.Driver | 9 | module LambdaCube.Compiler |
10 | ( Backend(..) | 10 | ( Backend(..) |
11 | , Pipeline | 11 | , Pipeline |
12 | , Infos, listInfos, Range(..) | 12 | , Infos, listInfos, Range(..) |
@@ -20,6 +20,9 @@ module LambdaCube.Compiler.Driver | |||
20 | , ioFetch | 20 | , ioFetch |
21 | , getDef, compileMain, preCompile | 21 | , getDef, compileMain, preCompile |
22 | , removeFromCache | 22 | , removeFromCache |
23 | |||
24 | , compilePipeline | ||
25 | , ppShow | ||
23 | ) where | 26 | ) where |
24 | 27 | ||
25 | import Data.List | 28 | import Data.List |
diff --git a/test/runTests.hs b/test/runTests.hs index 88c2f89f..c9375d5d 100644 --- a/test/runTests.hs +++ b/test/runTests.hs | |||
@@ -24,9 +24,7 @@ import qualified Data.Text as T | |||
24 | import qualified Data.Text.IO as TIO | 24 | import qualified Data.Text.IO as TIO |
25 | import Text.Printf | 25 | import Text.Printf |
26 | 26 | ||
27 | import LambdaCube.Compiler.Pretty (ppShow) | 27 | import LambdaCube.Compiler |
28 | import LambdaCube.Compiler.CoreToIR (compilePipeline) | ||
29 | import LambdaCube.Compiler.Driver | ||
30 | 28 | ||
31 | ------------------------------------------ utils | 29 | ------------------------------------------ utils |
32 | 30 | ||
diff --git a/tool/Compiler.hs b/tool/Compiler.hs index aa5a0e60..0723c0c8 100644 --- a/tool/Compiler.hs +++ b/tool/Compiler.hs | |||
@@ -2,9 +2,10 @@ | |||
2 | import Options.Applicative | 2 | import Options.Applicative |
3 | import Data.Aeson | 3 | import Data.Aeson |
4 | import qualified Data.ByteString.Lazy as B | 4 | import qualified Data.ByteString.Lazy as B |
5 | import LambdaCube.Compiler.Driver | ||
6 | import System.FilePath | 5 | import System.FilePath |
6 | |||
7 | import Paths_lambdacube_compiler (getDataDir) | 7 | import Paths_lambdacube_compiler (getDataDir) |
8 | import LambdaCube.Compiler | ||
8 | 9 | ||
9 | data Config | 10 | data Config |
10 | = Config | 11 | = Config |