Skip to content

Commit e9efecb

Browse files
mmhatmmhat
authored
Split Dhall.Syntax (#2449)
Split Dhall.Syntax into several modules: Moved instances for the following classes to own modules in Dhall.Syntax.Instances: - Applicative - Bifunctor - Data - Eq - Foldable - Functor - Lift - Monad - Monoid - NFData - Ord - Pretty - Semigroup - Show - Traversable Moved some types to own modules: - Expr -> Dhall.Syntax.Expr - Import and friends -> Dhall.Syntax.Import - Const -> Dhall.Syntax.Const - Var -> Dhall.Syntax.Var - MultiLet -> Dhall.Syntax.MultiLet - Binding -> Dhall.Syntax.Binding - Chunks and Text-related functions -> Dhall.Syntax.Chunks - RecordField -> Dhall.Syntax.RecordField - FunctionBinding -> Dhall.Syntax.FunctionBinding Moved remaining types to Dhall.Syntax.Types Also removed superfluous PreferFromWith data constructor and made CI a bit more chatty in haddockPhase.
1 parent 7fdc723 commit e9efecb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2007
-1557
lines changed

‎dhall/dhall.cabal‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,30 @@ Library
360360
Dhall.Parser.Combinators
361361
Dhall.Pretty.Internal
362362
Dhall.Syntax
363+
Dhall.Syntax.Binding
364+
Dhall.Syntax.Chunks
365+
Dhall.Syntax.Const
366+
Dhall.Syntax.Expr
367+
Dhall.Syntax.FunctionBinding
368+
Dhall.Syntax.Import
369+
Dhall.Syntax.Instances.Applicative
370+
Dhall.Syntax.Instances.Bifunctor
371+
Dhall.Syntax.Instances.Data
372+
Dhall.Syntax.Instances.Eq
373+
Dhall.Syntax.Instances.Foldable
374+
Dhall.Syntax.Instances.Functor
375+
Dhall.Syntax.Instances.Lift
376+
Dhall.Syntax.Instances.Monad
377+
Dhall.Syntax.Instances.NFData
378+
Dhall.Syntax.Instances.Ord
379+
Dhall.Syntax.Instances.Pretty
380+
Dhall.Syntax.Instances.Show
381+
Dhall.Syntax.Instances.Traversable
382+
Dhall.Syntax.MultiLet
383+
Dhall.Syntax.Operations
384+
Dhall.Syntax.RecordField
385+
Dhall.Syntax.Types
386+
Dhall.Syntax.Var
363387
Dhall.URL
364388
Paths_dhall
365389
Autogen-Modules:

‎dhall/src/Dhall.hs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
{-# LANGUAGE ApplicativeDo #-}
2-
{-# LANGUAGE ConstraintKinds #-}
3-
{-# LANGUAGE FlexibleContexts #-}
4-
{-# LANGUAGE FlexibleInstances #-}
5-
{-# LANGUAGE MultiParamTypeClasses #-}
6-
{-# LANGUAGE OverloadedStrings #-}
7-
{-# LANGUAGE PolyKinds #-}
8-
{-# LANGUAGE RankNTypes #-}
9-
{-# LANGUAGE RecordWildCards #-}
10-
{-# LANGUAGE ScopedTypeVariables #-}
11-
{-# LANGUAGE TypeFamilies #-}
12-
{-# LANGUAGE UndecidableInstances #-}
1+
{-# LANGUAGE ApplicativeDo #-}
2+
{-# LANGUAGE ConstraintKinds #-}
3+
{-# LANGUAGE FlexibleContexts #-}
4+
{-# LANGUAGE FlexibleInstances #-}
5+
{-# LANGUAGE MultiParamTypeClasses #-}
6+
{-# LANGUAGE OverloadedStrings #-}
7+
{-# LANGUAGE PolyKinds #-}
8+
{-# LANGUAGE RankNTypes #-}
9+
{-# LANGUAGE RecordWildCards #-}
10+
{-# LANGUAGE ScopedTypeVariables #-}
11+
{-# LANGUAGE TypeFamilies #-}
12+
{-# LANGUAGE UndecidableInstances #-}
1313

1414
{-| Please read the "Dhall.Tutorial" module, which contains a tutorial explaining
1515
how to use the language, the compiler, and this library

‎dhall/src/Dhall/Core.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ import Prettyprinter (Pretty)
9292

9393
import qualified Control.Exception
9494
import qualified Data.Text
95-
import qualified Dhall.Eval as Eval
95+
import qualified Dhall.Eval as Eval
9696

9797
-- | Pretty-print a value
9898
pretty :: Pretty a => a -> Text

‎dhall/src/Dhall/Import.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ import qualified System.AtomicWrite.Writer.ByteString.Binary as AtomicWrite.Bina
235235
import qualified System.Directory as Directory
236236
import qualified System.Environment
237237
import qualified System.FilePath as FilePath
238-
import qualified System.IO
239238
import qualified System.Info
239+
import qualified System.IO
240240
import qualified Text.Megaparsec
241241
import qualified Text.Parser.Combinators
242242
import qualified Text.Parser.Token

‎dhall/src/Dhall/Import/Headers.hs‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,23 @@ module Dhall.Import.Headers
99
, toOriginHeaders
1010
) where
1111

12-
import Control.Applicative (Alternative (..), liftA2)
13-
import Control.Exception (SomeException)
14-
import Control.Monad.Catch (handle, throwM)
15-
import Data.Text (Text)
16-
import Data.Void (Void)
17-
import Dhall.Core
18-
( Chunks (..)
19-
, Expr (..)
20-
)
21-
import Dhall.Import.Types (HTTPHeader , OriginHeaders)
22-
import Dhall.Parser (Src (..))
12+
import Control.Applicative (Alternative (..), liftA2)
13+
import Control.Exception (SomeException)
14+
import Control.Monad.Catch (handle, throwM)
15+
import Data.Text (Text)
16+
import Data.Void (Void)
17+
import Dhall.Core (Chunks (..), Expr (..))
18+
import Dhall.Import.Types (HTTPHeader, OriginHeaders)
19+
import Dhall.Parser (Src (..))
2320

2421
import qualified Data.CaseInsensitive
2522
import qualified Data.Foldable
26-
import qualified Data.HashMap.Strict as HashMap
23+
import qualified Data.HashMap.Strict as HashMap
2724
import qualified Data.Text.Encoding
28-
import qualified Dhall.Core as Core
25+
import qualified Dhall.Core as Core
2926
import qualified Dhall.Map
30-
import qualified Dhall.TypeCheck
3127
import qualified Dhall.Pretty.Internal
28+
import qualified Dhall.TypeCheck
3229

3330
-- | Given a well-typed (of type `List { header : Text, value Text }` or
3431
-- `List { mapKey : Text, mapValue Text }`) headers expressions in normal form

‎dhall/src/Dhall/Normalize.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ import Dhall.Syntax
3838
, FunctionBinding (..)
3939
, PreferAnnotation (..)
4040
, RecordField (..)
41-
, WithComponent (..)
4241
, Var (..)
42+
, WithComponent (..)
4343
)
4444

4545
import qualified Data.Sequence

‎dhall/src/Dhall/Pretty/Internal.hs‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,25 @@ module Dhall.Pretty.Internal (
7272
, temporalToText
7373
) where
7474

75-
import Control.DeepSeq (NFData)
76-
import Data.Aeson (FromJSON (..), Value (String))
77-
import Data.Aeson.Types (typeMismatch, unexpected)
78-
import Data.Data (Data)
79-
import Data.Foldable
80-
import Data.List.NonEmpty (NonEmpty (..))
81-
import Data.Text (Text)
82-
import Dhall.Map (Map)
83-
import Dhall.Optics (cosmosOf, foldOf, to)
84-
import Dhall.Src (Src (..))
85-
import Dhall.Syntax
86-
import GHC.Generics (Generic)
87-
import Language.Haskell.TH.Syntax (Lift)
88-
import Numeric.Natural (Natural)
89-
import Prettyprinter (Doc, Pretty, space)
75+
import Control.DeepSeq (NFData)
76+
import Data.Aeson
77+
( FromJSON (..)
78+
, Value (String)
79+
)
80+
import Data.Aeson.Types (typeMismatch, unexpected)
81+
import Data.Data (Data)
82+
import Data.Foldable
83+
import Data.List.NonEmpty (NonEmpty (..))
84+
import Data.Text (Text)
85+
import Dhall.Map (Map)
86+
import Dhall.Optics (cosmosOf, foldOf, to)
87+
import Dhall.Src (Src (..))
88+
import Dhall.Syntax
89+
import {-# SOURCE #-} Dhall.Syntax.Instances.Pretty ()
90+
import GHC.Generics (Generic)
91+
import Language.Haskell.TH.Syntax (Lift)
92+
import Numeric.Natural (Natural)
93+
import Prettyprinter (Doc, Pretty, space)
9094

9195
import qualified Data.Char
9296
import qualified Data.HashSet

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import Prettyprinter (Pretty, Doc)
77
import Dhall.Src (Src)
88
import Language.Haskell.TH.Syntax (Lift)
99

10-
import {-# SOURCE #-} Dhall.Syntax
10+
import {-# SOURCE #-} Dhall.Syntax.Expr
11+
import Dhall.Syntax.Const
12+
import Dhall.Syntax.Var
1113

1214
data Ann
1315

0 commit comments

Comments
 (0)