Skip to content

Commit a60b7be

Browse files
HeinrichApfelmusHeinrichApfelmus
committed
Anchor imports at Agda2Hs.Language.Haskell 
1 parent df6a8a6 commit a60b7be

File tree

18 files changed

+45
-64
lines changed

18 files changed

+45
-64
lines changed

‎src/Agda2Hs/Compile.hs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ import Agda2Hs.Compile.Types
3131
import Agda2Hs.Compile.Utils
3232
import Agda2Hs.Pragma
3333

34-
import qualified Language.Haskell.Exts.Extension as Hs
35-
import qualified Language.Haskell.Exts.Syntax as Hs
36-
import qualified Language.Haskell.Exts.Pretty as Hs
37-
34+
import qualified Agda2Hs.Language.Haskell as Hs
3835

3936
initCompileEnv :: TopLevelModuleName -> SpecialRules -> CompileEnv
4037
initCompileEnv tlm rewrites = CompileEnv

‎src/Agda2Hs/Compile/ClassInstance.hs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ import Data.List ( nub )
88
import Data.Maybe ( isNothing, mapMaybe )
99
import qualified Data.HashMap.Strict as HMap
1010

11-
import qualified Language.Haskell.Exts.Extension as Hs
12-
import qualified Language.Haskell.Exts.Syntax as Hs
13-
1411
import Agda.Compiler.Backend
1512
import Agda.Compiler.Common ( curDefs, sortDefs )
1613

@@ -40,8 +37,9 @@ import Agda2Hs.Compile.Term
4037
import Agda2Hs.Compile.Type
4138
import Agda2Hs.Compile.Types
4239
import Agda2Hs.Compile.Utils
43-
import Agda2Hs.Language.Haskell.Utils
4440

41+
import qualified Agda2Hs.Language.Haskell as Hs
42+
import Agda2Hs.Language.Haskell.Utils ( hsName, pp, replaceName, unQual )
4543

4644
enableCopatterns :: C a -> C a
4745
enableCopatterns = local $ \e -> e { copatternsEnabled = True }

‎src/Agda2Hs/Compile/Data.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
module Agda2Hs.Compile.Data where
22

3-
import qualified Language.Haskell.Exts.Syntax as Hs
4-
53
import Control.Monad ( when )
64
import Agda.Compiler.Backend
75
import Agda.Syntax.Common
@@ -18,7 +16,9 @@ import Agda.Utils.Impossible ( __IMPOSSIBLE__ )
1816
import Agda2Hs.Compile.Type ( compileDomType, compileTeleBinds )
1917
import Agda2Hs.Compile.Types
2018
import Agda2Hs.Compile.Utils
21-
import Agda2Hs.Language.Haskell.Utils
19+
20+
import qualified Agda2Hs.Language.Haskell as Hs
21+
import Agda2Hs.Language.Haskell.Utils ( hsName )
2222

2323
checkNewtype :: Hs.Name () -> [Hs.QualConDecl ()] -> C ()
2424
checkNewtype name cs = do

‎src/Agda2Hs/Compile/Function.hs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ import Data.List
1010
import Data.Maybe ( fromMaybe, isJust )
1111
import qualified Data.Text as Text
1212

13-
import qualified Language.Haskell.Exts.Build as Hs (charP)
14-
import qualified Language.Haskell.Exts.Syntax as Hs
15-
import qualified Language.Haskell.Exts.Pretty as Hs
16-
1713
import Agda.Compiler.Backend
1814
import Agda.Compiler.Common
1915

@@ -48,8 +44,10 @@ import Agda2Hs.Compile.TypeDefinition ( compileTypeDef )
4844
import Agda2Hs.Compile.Types
4945
import Agda2Hs.Compile.Utils
5046
import Agda2Hs.Compile.Var ( compileDBVar )
51-
import Agda2Hs.Language.Haskell.Utils
5247

48+
import qualified Agda2Hs.Language.Haskell as Hs
49+
import Agda2Hs.Language.Haskell.Utils
50+
( Strictness, hsName, pApp, patToExp, constrainType, qualifyType )
5351

5452
-- | Compilation rules for specific constructors in patterns.
5553
isSpecialCon :: QName -> Maybe (Type -> NAPs -> C (Hs.Pat ()))

‎src/Agda2Hs/Compile/Function.hs-boot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Agda2Hs.Compile.Function where
22

3-
import qualified Language.Haskell.Exts.Syntax as Hs ( Match, Name )
3+
import qualified Agda2Hs.Language.Haskell as Hs ( Match, Name )
44
import Agda.Syntax.Internal ( Clause, ModuleName, QName, Type )
55
import Agda2Hs.Compile.Types ( C )
66

‎src/Agda2Hs/Compile/Imports.hs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ module Agda2Hs.Compile.Imports ( compileImports, preludeImportDecl ) where
22

33
import Data.Char ( isUpper )
44
import Data.List ( isPrefixOf )
5+
import qualified Data.List as L
56
import Data.Map ( Map )
67
import qualified Data.Map as Map
78
import Data.Set ( Set )
89
import qualified Data.Set as Set
910

10-
import qualified Language.Haskell.Exts.Pretty as Hs
11-
import qualified Language.Haskell.Exts.Syntax as Hs
11+
import qualified Agda2Hs.Language.Haskell as Hs
12+
import Agda2Hs.Language.Haskell.Utils ( validVarId, validConId, pp )
1213

1314
import Agda.Compiler.Backend
1415
import Agda.TypeChecking.Pretty ( text )
@@ -18,8 +19,6 @@ import Agda2Hs.AgdaUtils
1819
import Agda2Hs.Compile.Name
1920
import Agda2Hs.Compile.Types
2021
import Agda2Hs.Compile.Utils
21-
import Agda2Hs.Language.Haskell.Utils
22-
import qualified Data.List as L
2322

2423
type ImportSpecMap = Map NamespacedName (Set NamespacedName)
2524
type ImportDeclMap = Map (Hs.ModuleName (), Qualifier) ImportSpecMap

‎src/Agda2Hs/Compile/Name.hs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ import Data.List ( intercalate, isPrefixOf, stripPrefix )
1212
import Data.Text ( unpack )
1313
import qualified Data.Map.Strict as Map
1414

15-
import qualified Language.Haskell.Exts.Pretty as Hs
16-
import qualified Language.Haskell.Exts.Syntax as Hs
17-
1815
import Agda.Compiler.Backend hiding ( topLevelModuleName )
1916
import Agda.Compiler.Common ( topLevelModuleName )
2017

@@ -41,7 +38,9 @@ import Agda.Utils.Monad ( orM, whenM )
4138
import Agda2Hs.AgdaUtils
4239
import Agda2Hs.Compile.Types
4340
import Agda2Hs.Compile.Utils
44-
import Agda2Hs.Language.Haskell.Utils
41+
42+
import qualified Agda2Hs.Language.Haskell as Hs
43+
import Agda2Hs.Language.Haskell.Utils ( hsName, hsModuleName, pp )
4544

4645

4746
isSpecialCon :: QName -> Maybe (Hs.QName ())

‎src/Agda2Hs/Compile/Postulate.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
module Agda2Hs.Compile.Postulate where
22

3-
import qualified Language.Haskell.Exts.Syntax as Hs
4-
53
import Agda.Compiler.Backend
64

75
import Agda.Syntax.Internal
@@ -10,7 +8,9 @@ import Agda.Syntax.Common.Pretty ( prettyShow )
108
import Agda2Hs.Compile.Type ( compileType )
119
import Agda2Hs.Compile.Types
1210
import Agda2Hs.Compile.Utils
13-
import Agda2Hs.Language.Haskell.Utils
11+
12+
import qualified Agda2Hs.Language.Haskell as Hs
13+
import Agda2Hs.Language.Haskell.Utils ( hsName, pp, hsError )
1414

1515
compilePostulate :: Definition -> C [Hs.Decl ()]
1616
compilePostulate def = do

‎src/Agda2Hs/Compile/Record.hs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ import Data.List.NonEmpty ( NonEmpty(..) )
88
import Data.Map ( Map )
99
import qualified Data.Map as Map
1010

11-
import qualified Language.Haskell.Exts.Pretty as Hs
12-
import qualified Language.Haskell.Exts.Syntax as Hs
13-
1411
import Agda.Compiler.Backend
1512

1613
import Agda.Syntax.Common ( Arg(unArg), defaultArg )
@@ -30,7 +27,9 @@ import Agda2Hs.Compile.Function ( compileFun )
3027
import Agda2Hs.Compile.Type ( compileDomType, compileTeleBinds, compileDom, DomOutput(..) )
3128
import Agda2Hs.Compile.Types
3229
import Agda2Hs.Compile.Utils
33-
import Agda2Hs.Language.Haskell.Utils
30+
31+
import qualified Agda2Hs.Language.Haskell as Hs
32+
import Agda2Hs.Language.Haskell.Utils ( hsName, definedName, pp )
3433

3534
-- | Primitive fields and default implementations
3635
type MinRecord = ([Hs.Name ()], Map (Hs.Name ()) (Hs.Decl ()))

‎src/Agda2Hs/Compile/Term.hs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ import Data.Maybe ( fromMaybe, isJust )
1212
import qualified Data.Text as Text ( unpack )
1313
import qualified Data.Set as Set ( singleton )
1414

15-
import qualified Language.Haskell.Exts.Build as Hs
16-
import qualified Language.Haskell.Exts.Extension as Hs
17-
import qualified Language.Haskell.Exts.Pretty as Hs
18-
import qualified Language.Haskell.Exts.Syntax as Hs
19-
2015
import Agda.Syntax.Common.Pretty ( prettyShow )
2116
import qualified Agda.Syntax.Common.Pretty as P
2217
import Agda.Syntax.Common
@@ -50,7 +45,10 @@ import Agda2Hs.Compile.Type ( compileType, compileDom, DomOutput(..), compileTel
5045
import Agda2Hs.Compile.Types
5146
import Agda2Hs.Compile.Utils
5247
import Agda2Hs.Compile.Var ( compileDBVar )
48+
49+
import qualified Agda2Hs.Language.Haskell as Hs
5350
import Agda2Hs.Language.Haskell.Utils
51+
( hsName, pp, eApp, hsLambda, hsUnqualName, hsVar )
5452

5553
import {-# SOURCE #-} Agda2Hs.Compile.Function ( compileClause' )
5654
import qualified Data.List as L

0 commit comments

Comments
 (0)