Split Dhall.Syntax

dhall/dhall.cabal

@@ -360,6 +360,30 @@ Library
         Dhall.Parser.Combinators
         Dhall.Pretty.Internal
         Dhall.Syntax
+        Dhall.Syntax.Binding
+        Dhall.Syntax.Chunks
+        Dhall.Syntax.Const
+        Dhall.Syntax.Expr
+        Dhall.Syntax.FunctionBinding
+        Dhall.Syntax.Import
+        Dhall.Syntax.Instances.Applicative
+        Dhall.Syntax.Instances.Bifunctor
+        Dhall.Syntax.Instances.Data
+        Dhall.Syntax.Instances.Eq
+        Dhall.Syntax.Instances.Foldable
+        Dhall.Syntax.Instances.Functor
+        Dhall.Syntax.Instances.Lift
+        Dhall.Syntax.Instances.Monad
+        Dhall.Syntax.Instances.NFData
+        Dhall.Syntax.Instances.Ord
+        Dhall.Syntax.Instances.Pretty
+        Dhall.Syntax.Instances.Show
+        Dhall.Syntax.Instances.Traversable
+        Dhall.Syntax.MultiLet
+        Dhall.Syntax.Operations
+        Dhall.Syntax.RecordField
+        Dhall.Syntax.Types
+        Dhall.Syntax.Var
         Dhall.URL
         Paths_dhall
     Autogen-Modules:

dhall/src/Dhall.hs

@@ -1,15 +1,15 @@
-{-# LANGUAGE ApplicativeDo              #-}
-{-# LANGUAGE ConstraintKinds            #-}
-{-# LANGUAGE FlexibleContexts           #-}
-{-# LANGUAGE FlexibleInstances          #-}
-{-# LANGUAGE MultiParamTypeClasses      #-}
-{-# LANGUAGE OverloadedStrings          #-}
-{-# LANGUAGE PolyKinds                  #-}
-{-# LANGUAGE RankNTypes                 #-}
-{-# LANGUAGE RecordWildCards            #-}
-{-# LANGUAGE ScopedTypeVariables        #-}
-{-# LANGUAGE TypeFamilies               #-}
-{-# LANGUAGE UndecidableInstances       #-}
+{-# LANGUAGE ApplicativeDo         #-}
+{-# LANGUAGE ConstraintKinds       #-}
+{-# LANGUAGE FlexibleContexts      #-}
+{-# LANGUAGE FlexibleInstances     #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE PolyKinds             #-}
+{-# LANGUAGE RankNTypes            #-}
+{-# LANGUAGE RecordWildCards       #-}
+{-# LANGUAGE ScopedTypeVariables   #-}
+{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE UndecidableInstances  #-}
 
 {-| Please read the "Dhall.Tutorial" module, which contains a tutorial explaining
     how to use the language, the compiler, and this library

dhall/src/Dhall/Core.hs

@@ -92,7 +92,7 @@ import Prettyprinter          (Pretty)
 
 import qualified Control.Exception
 import qualified Data.Text
-import qualified Dhall.Eval         as Eval
+import qualified Dhall.Eval        as Eval
 
 -- | Pretty-print a value
 pretty :: Pretty a => a -> Text

dhall/src/Dhall/Import.hs

@@ -235,8 +235,8 @@ import qualified System.AtomicWrite.Writer.ByteString.Binary as AtomicWrite.Bina
 import qualified System.Directory                            as Directory
 import qualified System.Environment
 import qualified System.FilePath                             as FilePath
-import qualified System.IO
 import qualified System.Info
+import qualified System.IO
 import qualified Text.Megaparsec
 import qualified Text.Parser.Combinators
 import qualified Text.Parser.Token

dhall/src/Dhall/Import/Headers.hs

@@ -9,26 +9,23 @@ module Dhall.Import.Headers
     , toOriginHeaders
     ) where
 
-import Control.Applicative     (Alternative (..), liftA2)
-import Control.Exception       (SomeException)
-import Control.Monad.Catch     (handle, throwM)
-import Data.Text               (Text)
-import Data.Void               (Void)
-import Dhall.Core
-    ( Chunks (..)
-    , Expr (..)
-    )
-import Dhall.Import.Types      (HTTPHeader , OriginHeaders)
-import Dhall.Parser            (Src (..))
+import Control.Applicative (Alternative (..), liftA2)
+import Control.Exception   (SomeException)
+import Control.Monad.Catch (handle, throwM)
+import Data.Text           (Text)
+import Data.Void           (Void)
+import Dhall.Core          (Chunks (..), Expr (..))
+import Dhall.Import.Types  (HTTPHeader, OriginHeaders)
+import Dhall.Parser        (Src (..))
 
 import qualified Data.CaseInsensitive
 import qualified Data.Foldable
-import qualified Data.HashMap.Strict    as HashMap
+import qualified Data.HashMap.Strict   as HashMap
 import qualified Data.Text.Encoding
-import qualified Dhall.Core             as Core
+import qualified Dhall.Core            as Core
 import qualified Dhall.Map
-import qualified Dhall.TypeCheck
 import qualified Dhall.Pretty.Internal
+import qualified Dhall.TypeCheck
 
 -- | Given a well-typed (of type `List { header : Text, value Text }` or
 -- `List { mapKey : Text, mapValue Text }`) headers expressions in normal form

dhall/src/Dhall/Normalize.hs

@@ -38,8 +38,8 @@ import Dhall.Syntax
     , FunctionBinding (..)
     , PreferAnnotation (..)
     , RecordField (..)
-    , WithComponent (..)
     , Var (..)
+    , WithComponent (..)
     )
 
 import qualified Data.Sequence

dhall/src/Dhall/Pretty/Internal.hs

@@ -72,21 +72,25 @@ module Dhall.Pretty.Internal (
     , temporalToText
     ) where
 
-import Control.DeepSeq            (NFData)
-import Data.Aeson                 (FromJSON (..), Value (String))
-import Data.Aeson.Types           (typeMismatch, unexpected)
-import Data.Data                  (Data)
-import Data.Foldable
-import Data.List.NonEmpty         (NonEmpty (..))
-import Data.Text                  (Text)
-import Dhall.Map                  (Map)
-import Dhall.Optics               (cosmosOf, foldOf, to)
-import Dhall.Src                  (Src (..))
-import Dhall.Syntax
-import GHC.Generics               (Generic)
-import Language.Haskell.TH.Syntax (Lift)
-import Numeric.Natural            (Natural)
-import Prettyprinter              (Doc, Pretty, space)
+import                Control.DeepSeq               (NFData)
+import                Data.Aeson
+    ( FromJSON (..)
+    , Value (String)
+    )
+import                Data.Aeson.Types              (typeMismatch, unexpected)
+import                Data.Data                     (Data)
+import                Data.Foldable
+import                Data.List.NonEmpty            (NonEmpty (..))
+import                Data.Text                     (Text)
+import                Dhall.Map                     (Map)
+import                Dhall.Optics                  (cosmosOf, foldOf, to)
+import                Dhall.Src                     (Src (..))
+import                Dhall.Syntax
+import {-# SOURCE #-} Dhall.Syntax.Instances.Pretty ()
+import                GHC.Generics                  (Generic)
+import                Language.Haskell.TH.Syntax    (Lift)
+import                Numeric.Natural               (Natural)
+import                Prettyprinter                 (Doc, Pretty, space)
 
 import qualified Data.Char
 import qualified Data.HashSet

dhall/src/Dhall/Pretty/Internal.hs-boot

@@ -7,7 +7,9 @@ import Prettyprinter (Pretty, Doc)
 import Dhall.Src (Src)
 import Language.Haskell.TH.Syntax (Lift)
 
-import {-# SOURCE #-} Dhall.Syntax
+import {-# SOURCE #-} Dhall.Syntax.Expr
+import Dhall.Syntax.Const
+import Dhall.Syntax.Var
 
 data Ann