Skip to content

Commit 463969c

Browse files
committed
Rename the internal generated modules
1 parent 7a41914 commit 463969c

File tree

15 files changed

+49
-47
lines changed

15 files changed

+49
-47
lines changed

.hlint.ignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
lib/Unicode/Internal/Division.hs
2-
lib/Unicode/Internal/Generated/PropList.hs
2+
lib/Unicode/Internal/Char/PropList.hs

exe/Parser/Text.hs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -630,39 +630,39 @@ genModules indir outdir props = do
630630
where
631631

632632
propList =
633-
("Unicode.Internal.Generated.PropList"
633+
("Unicode.Internal.Char.PropList"
634634
, (`genCorePropertiesModule` (`elem` props)))
635635

636636
derivedCoreProperties =
637-
("Unicode.Internal.Generated.DerivedCoreProperties"
637+
("Unicode.Internal.Char.DerivedCoreProperties"
638638
, (`genCorePropertiesModule` (`elem` props)))
639639

640640
compositions exc non0 =
641-
( "Unicode.Internal.Generated.UnicodeData.Compositions"
641+
( "Unicode.Internal.Char.UnicodeData.Compositions"
642642
, \m -> genCompositionsModule m exc non0)
643643

644644
combiningClass =
645-
( "Unicode.Internal.Generated.UnicodeData.CombiningClass"
645+
( "Unicode.Internal.Char.UnicodeData.CombiningClass"
646646
, genCombiningClassModule)
647647

648648
decomposable =
649-
( "Unicode.Internal.Generated.UnicodeData.Decomposable"
649+
( "Unicode.Internal.Char.UnicodeData.Decomposable"
650650
, (`genDecomposableModule` Canonical))
651651

652652
decomposableK =
653-
( "Unicode.Internal.Generated.UnicodeData.DecomposableK"
653+
( "Unicode.Internal.Char.UnicodeData.DecomposableK"
654654
, (`genDecomposableModule` Kompat))
655655

656656
decompositions =
657-
( "Unicode.Internal.Generated.UnicodeData.Decompositions"
657+
( "Unicode.Internal.Char.UnicodeData.Decompositions"
658658
, \m -> genDecomposeDefModule m [] [] Canonical (const True))
659659

660660
decompositionsK2 =
661-
( "Unicode.Internal.Generated.UnicodeData.DecompositionsK2"
661+
( "Unicode.Internal.Char.UnicodeData.DecompositionsK2"
662662
, \m -> genDecomposeDefModule m [] [] Kompat (>= 60000))
663663

664664
decompositionsK =
665665
let pre = ["import qualified " <> fst decompositionsK2 <> " as DK2", ""]
666666
post = ["decompose c = DK2.decompose c"]
667-
in ( "Unicode.Internal.Generated.UnicodeData.DecompositionsK"
667+
in ( "Unicode.Internal.Char.UnicodeData.DecompositionsK"
668668
, \m -> genDecomposeDefModule m pre post Kompat (< 60000))

lib/Unicode/Char/Case.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module Unicode.Char.Case
1111
)
1212
where
1313

14-
import qualified Unicode.Internal.Generated.DerivedCoreProperties as P
14+
import qualified Unicode.Internal.Char.DerivedCoreProperties as P
1515

1616
-- | Returns 'True' for lower-case letters.
1717
--

lib/Unicode/Char/General.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ import Control.Exception (assert)
3838
import Data.Char (ord)
3939
import Unicode.Internal.Division (quotRem28)
4040

41-
import qualified Unicode.Internal.Generated.DerivedCoreProperties as P
42-
import qualified Unicode.Internal.Generated.PropList as P
41+
import qualified Unicode.Internal.Char.DerivedCoreProperties as P
42+
import qualified Unicode.Internal.Char.PropList as P
4343

4444
-- | Returns 'True' for alphabetic Unicode characters (lower-case, upper-case
4545
-- and title-case letters, plus letters of caseless scripts and modifiers

lib/Unicode/Char/Normalization.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ import Unicode.Internal.Division (quotRem21, quotRem28)
3131
import Unicode.Char.General
3232
(hangulFirst, jamoLFirst, jamoTCount, jamoTFirst, jamoVCount, jamoVFirst)
3333

34-
import qualified Unicode.Internal.Generated.UnicodeData.CombiningClass as CC
35-
import qualified Unicode.Internal.Generated.UnicodeData.Compositions as C
36-
import qualified Unicode.Internal.Generated.UnicodeData.Decomposable as D
37-
import qualified Unicode.Internal.Generated.UnicodeData.DecomposableK as K
38-
import qualified Unicode.Internal.Generated.UnicodeData.Decompositions as D
39-
import qualified Unicode.Internal.Generated.UnicodeData.DecompositionsK as K
34+
import qualified Unicode.Internal.Char.UnicodeData.CombiningClass as CC
35+
import qualified Unicode.Internal.Char.UnicodeData.Compositions as C
36+
import qualified Unicode.Internal.Char.UnicodeData.Decomposable as D
37+
import qualified Unicode.Internal.Char.UnicodeData.DecomposableK as K
38+
import qualified Unicode.Internal.Char.UnicodeData.Decompositions as D
39+
import qualified Unicode.Internal.Char.UnicodeData.DecompositionsK as K
4040

4141
-------------------------------------------------------------------------------
4242
-- Compose

lib/Unicode/Internal/Generated/DerivedCoreProperties.hs renamed to lib/Unicode/Internal/Char/DerivedCoreProperties.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-- autogenerated from https://www.unicode.org/Public/13.0.0/ucd/DerivedCoreProperties.txt
22
-- |
3-
-- Module : Unicode.Internal.Generated.DerivedCoreProperties
3+
-- Module : Unicode.Internal.Char.DerivedCoreProperties
44
-- Copyright : (c) 2020 Composewell Technologies and Contributors
55
-- License : Apache-2.0
66
-- Maintainer : [email protected]
77
-- Stability : experimental
88

9-
module Unicode.Internal.Generated.DerivedCoreProperties
9+
module Unicode.Internal.Char.DerivedCoreProperties
1010
(isUppercase , isLowercase , isAlphabetic)
1111
where
1212

lib/Unicode/Internal/Generated/PropList.hs renamed to lib/Unicode/Internal/Char/PropList.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-- autogenerated from https://www.unicode.org/Public/13.0.0/ucd/PropList.txt
22
-- |
3-
-- Module : Unicode.Internal.Generated.PropList
3+
-- Module : Unicode.Internal.Char.PropList
44
-- Copyright : (c) 2020 Composewell Technologies and Contributors
55
-- License : Apache-2.0
66
-- Maintainer : [email protected]
77
-- Stability : experimental
88

9-
module Unicode.Internal.Generated.PropList
9+
module Unicode.Internal.Char.PropList
1010
(isWhite_Space)
1111
where
1212

lib/Unicode/Internal/Generated/UnicodeData/CombiningClass.hs renamed to lib/Unicode/Internal/Char/UnicodeData/CombiningClass.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-- autogenerated from https://www.unicode.org/Public/13.0.0/ucd/UnicodeData.txt
22
-- |
3-
-- Module : Unicode.Internal.Generated.UnicodeData.CombiningClass
3+
-- Module : Unicode.Internal.Char.UnicodeData.CombiningClass
44
-- Copyright : (c) 2020 Composewell Technologies and Contributors
55
-- License : Apache-2.0
66
-- Maintainer : [email protected]
77
-- Stability : experimental
88

9-
module Unicode.Internal.Generated.UnicodeData.CombiningClass
9+
module Unicode.Internal.Char.UnicodeData.CombiningClass
1010
(combiningClass, isCombining)
1111
where
1212

lib/Unicode/Internal/Generated/UnicodeData/Compositions.hs renamed to lib/Unicode/Internal/Char/UnicodeData/Compositions.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
-- autogenerated from https://www.unicode.org/Public/13.0.0/ucd/UnicodeData.txt
22
-- |
3-
-- Module : Unicode.Internal.Generated.UnicodeData.Compositions
3+
-- Module : Unicode.Internal.Char.UnicodeData.Compositions
44
-- Copyright : (c) 2020 Composewell Technologies and Contributors
55
-- License : Apache-2.0
66
-- Maintainer : [email protected]
77
-- Stability : experimental
88

99
{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
10-
module Unicode.Internal.Generated.UnicodeData.Compositions
10+
module Unicode.Internal.Char.UnicodeData.Compositions
1111
(compose, composeStarters, isSecondStarter)
1212
where
1313

lib/Unicode/Internal/Generated/UnicodeData/Decomposable.hs renamed to lib/Unicode/Internal/Char/UnicodeData/Decomposable.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-- autogenerated from https://www.unicode.org/Public/13.0.0/ucd/UnicodeData.txt
22
-- |
3-
-- Module : Unicode.Internal.Generated.UnicodeData.Decomposable
3+
-- Module : Unicode.Internal.Char.UnicodeData.Decomposable
44
-- Copyright : (c) 2020 Composewell Technologies and Contributors
55
-- License : Apache-2.0
66
-- Maintainer : [email protected]
77
-- Stability : experimental
88

9-
module Unicode.Internal.Generated.UnicodeData.Decomposable
9+
module Unicode.Internal.Char.UnicodeData.Decomposable
1010
(isDecomposable)
1111
where
1212

0 commit comments

Comments
 (0)