diff options
Diffstat (limited to 'src/Language/Fiddle/Compiler/ImportResolution.hs')
-rw-r--r-- | src/Language/Fiddle/Compiler/ImportResolution.hs | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/Language/Fiddle/Compiler/ImportResolution.hs b/src/Language/Fiddle/Compiler/ImportResolution.hs index aacf27e..4d4bd32 100644 --- a/src/Language/Fiddle/Compiler/ImportResolution.hs +++ b/src/Language/Fiddle/Compiler/ImportResolution.hs @@ -8,33 +8,32 @@ module Language.Fiddle.Compiler.ImportResolution ) where -import qualified Codec.Compression.GZip as GZip import Control.Arrow (Arrow (second)) import Control.Monad (filterM) import Control.Monad.Identity (Identity) import Control.Monad.Trans.Maybe (MaybeT (MaybeT, runMaybeT)) -import Control.Monad.Writer.Lazy (MonadTrans (lift), MonadWriter (tell), WriterT (WriterT, runWriterT), execWriterT) -import Data.Aeson (decode, eitherDecode, encode) -import qualified Data.ByteString.Lazy as BL +import Control.Monad.Writer.Lazy (MonadTrans (lift), MonadWriter (tell), WriterT (..), execWriterT) +import Data.Aeson (eitherDecode, encode) import Data.Map (Map) -import qualified Data.Map as Map import Data.Maybe (fromMaybe) import Data.Text (Text) -import qualified Data.Text as Text import Data.Tuple (swap) import Data.Typeable import Language.Fiddle.Ast -import Language.Fiddle.Ast.FileInterface (ResolvedImport) import Language.Fiddle.Compiler -import Language.Fiddle.Compiler.Expansion +import Language.Fiddle.Compiler.Expansion () import Language.Fiddle.Internal.UnitInterface import Language.Fiddle.Types import Options.Applicative import System.Directory import System.FilePath -import System.IO import Text.Printf (printf) +import qualified Codec.Compression.GZip as GZip +import qualified Data.ByteString.Lazy as BL +import qualified Data.Map as Map +import qualified Data.Text as Text + newtype Flags = Flags { importDirectories :: [FilePath] } @@ -70,8 +69,6 @@ type M = Compile GlobalState type Annot = Commented SourceSpan -newtype ImportError = ImportError [Diagnostic] - newtype ResolvedImports = ResolvedImports { importMap :: Map Text ([Diagnostic], Maybe UnitInterface) } |