Skip to content

Commit 2459feb

Browse files
wismillwismill
committed
Fix references to unicode-data package
1 parent 803bb04 commit 2459feb

12 files changed

Lines changed: 72 additions & 72 deletions

File tree

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
This repository provides packages to use the
66
[Unicode character database](https://www.unicode.org/ucd/) (UCD):
77

8-
- [`unicode-data`](#unicode-data) for general character properties.
8+
- [`unicode-data-core`](#unicode-data-core) for general character properties.
99
- [`unicode-data-names`](#unicode-data-names) for characters names and aliases.
1010
- [`unicode-data-scripts`](#unicode-data-scripts) for characters scripts.
1111
- [`unicode-data-security`](#unicode-data-security) for security mechanisms.
@@ -14,14 +14,14 @@ The Haskell data structures are generated programmatically from the UCD files.
1414
The latest Unicode version supported by these libraries is
1515
[`15.0.0`](https://www.unicode.org/versions/Unicode15.0.0/).
1616

17-
### `unicode-data`
17+
### `unicode-data-core`
1818

19-
[`unicode-data`](unicode-data#readme) provides Haskell APIs to efficiently
19+
[`unicode-data-core`](unicode-data-core#readme) provides Haskell APIs to efficiently
2020
access the Unicode character database.
2121
Performance is the primary goal in the design of this package.
2222

2323
Please see the
24-
[Haddock documentation](https://hackage.haskell.org/package/unicode-data)
24+
[Haddock documentation](https://hackage.haskell.org/package/unicode-data-core)
2525
for reference documentation.
2626

2727
### `unicode-data-names`
@@ -56,12 +56,12 @@ for reference documentation.
5656

5757
## Performance
5858

59-
`unicode-data` is up to [_5 times faster_](unicode-data#performance)
59+
`unicode-data-core` is up to [_5 times faster_](unicode-data-core#performance)
6060
than `base`.
6161

6262
## Unicode database version update
6363

64-
See `unicode-data`’s [guide](unicode-data/README.md#unicode-database-version-update).
64+
See `unicode-data-core`’s [guide](unicode-data-core/README.md#unicode-database-version-update).
6565

6666
## Licensing
6767

‎experimental/unicode-data-text/unicode-data-text.cabal‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ library
6666

6767
hs-source-dirs: lib
6868
build-depends:
69-
base >= 4.7 && < 4.18,
70-
text >= 1.2.4 && < 2.1,
71-
unicode-data >= 0.3 && < 0.5
69+
base >= 4.7 && < 4.18,
70+
text >= 1.2.4 && < 2.1,
71+
unicode-data-core >= 0.3 && < 0.5
7272

7373
test-suite test
7474
import: default-extensions, compile-options
@@ -79,9 +79,9 @@ test-suite test
7979
other-modules:
8080
Unicode.Text.CaseSpec
8181
build-depends:
82-
base >= 4.7 && < 4.18,
83-
hspec >= 2.0 && < 2.11,
84-
text >= 1.2.4 && < 2.1,
82+
base >= 4.7 && < 4.18,
83+
hspec >= 2.0 && < 2.11,
84+
text >= 1.2.4 && < 2.1,
8585
unicode-data-text
8686
build-tool-depends:
8787
hspec-discover:hspec-discover >= 2.0 && < 2.11
@@ -95,11 +95,11 @@ benchmark bench
9595
hs-source-dirs: bench
9696
main-is: Main.hs
9797
build-depends:
98-
base >= 4.7 && < 4.18,
99-
deepseq >= 1.1 && < 1.5,
100-
tasty-bench >= 0.2.5 && < 0.4,
101-
tasty >= 1.4.1,
102-
text >= 1.2.4 && < 2.1,
103-
unicode-data >= 0.3 && < 0.5,
98+
base >= 4.7 && < 4.18,
99+
deepseq >= 1.1 && < 1.5,
100+
tasty-bench >= 0.2.5 && < 0.4,
101+
tasty >= 1.4.1,
102+
text >= 1.2.4 && < 2.1,
103+
unicode-data-core >= 0.3 && < 0.5,
104104
unicode-data-text
105105
ghc-options: -O2 -fdicts-strict -rtsopts

‎stack.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
resolver: lts-18.18
22
packages:
3-
- './unicode-data'
3+
- './unicode-data-core'
44
- './unicode-data-names'
55
- './unicode-data-scripts'
66
- './unicode-data-security'

‎ucd.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ run_generator() {
8282
# Compile and run ucd2haskell
8383
cabal run --flag ucd2haskell ucd2haskell -- \
8484
--input "./data/$VERSION" \
85-
--output-core ./unicode-data/lib/ \
85+
--output-core ./unicode-data-core/lib/ \
8686
--output-names ./unicode-data-names/lib/ \
8787
--output-scripts ./unicode-data-scripts/lib/ \
8888
--output-security ./unicode-data-security/lib/ \
@@ -98,7 +98,7 @@ run_generator() {
9898
--core-prop Pattern_White_Space
9999
# Update unicodeVersion in Unicode.Char
100100
VERSION_AS_LIST=$(echo "$VERSION" | sed "s/\./, /g")
101-
sed -ri "s/^(unicodeVersion = makeVersion \[)[^]]*\]/\1$VERSION_AS_LIST\]/" "unicode-data/lib/Unicode/Char.hs"
101+
sed -ri "s/^(unicodeVersion = makeVersion \[)[^]]*\]/\1$VERSION_AS_LIST\]/" "unicode-data-core/lib/Unicode/Char.hs"
102102
}
103103

104104
# Print help text

‎unicode-data-core/NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
unicode-data
1+
unicode-data-core
22
Copyright 2020 Composewell Technologies and Contributors
33

44
This product includes software developed at

‎unicode-data-core/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# README
22

3-
`unicode-data` provides Haskell APIs to efficiently access the Unicode
3+
`unicode-data-core` provides Haskell APIs to efficiently access the Unicode
44
character database. [Performance](#performance) is the primary goal in the
55
design of this package.
66

@@ -10,7 +10,7 @@ The latest Unicode version supported by this library is
1010
[`15.0.0`](https://www.unicode.org/versions/Unicode15.0.0/).
1111

1212
Please see the
13-
[Haddock documentation](https://hackage.haskell.org/package/unicode-data)
13+
[Haddock documentation](https://hackage.haskell.org/package/unicode-data-core)
1414
for reference documentation.
1515

1616
## Performance

‎unicode-data-core/exe/UCD2Haskell.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ data CLIOptions =
1616
CLIOptions
1717
{ input :: FilePath
1818
, output_core :: FilePath
19-
-- ^ `unicode-data`
19+
-- ^ @unicode-data-core@
2020
, output_names :: FilePath
21-
-- ^ `unicode-data-names`
21+
-- ^ @unicode-data-names@
2222
, output_scripts :: FilePath
23-
-- ^ `unicode-data-scripts`
23+
-- ^ @unicode-data-scripts@
2424
, output_security :: FilePath
25-
-- ^ `unicode-data-security`
25+
-- ^ @unicode-data-security@
2626
, core_prop :: [String]
2727
}
2828
deriving (Show, Generic, HasArguments)

‎unicode-data-core/lib/Unicode/Char.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import Unicode.Char.Identifiers
5151
import Unicode.Char.Numeric
5252
import Unicode.Char.Normalization
5353

54-
-- | Version of Unicode standard used by @unicode-data@.
54+
-- | Version of Unicode standard used by @unicode-data-core@.
5555
--
5656
-- @since 0.3.0
5757
unicodeVersion :: Version

unicode-data-core/unicode-data.cabal renamed to unicode-data-core/unicode-data-core.cabal

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
cabal-version: 2.2
2-
name: unicode-data
2+
name: unicode-data-core
33
version: 0.4.0
44
synopsis: Access Unicode Character Database (UCD)
55
description:
6-
@unicode-data@ provides Haskell APIs to efficiently access the
6+
@unicode-data-core@ provides Haskell APIs to efficiently access the
77
<https://www.unicode.org/ucd/ Unicode character database> (UCD).
88
Performance is the primary goal in the design of this package.
99
.
@@ -127,12 +127,12 @@ executable ucd2haskell
127127
if flag(ucd2haskell)
128128
buildable: True
129129
build-depends:
130-
base >= 4.7 && < 4.18
131-
, containers >= 0.5 && < 0.7
132-
, directory >= 1.3.6 && < 1.3.9
133-
, filepath >= 1.4.100 && < 1.5
134-
, getopt-generics >= 0.13 && < 0.14
135-
, streamly >= 0.8.0 && < 0.8.1
130+
base >= 4.7 && < 4.18
131+
, containers >= 0.5 && < 0.7
132+
, directory >= 1.3.6 && < 1.3.9
133+
, filepath >= 1.4.100 && < 1.5
134+
, getopt-generics >= 0.13 && < 0.14
135+
, streamly >= 0.8.0 && < 0.8.1
136136
else
137137
buildable: False
138138

@@ -145,9 +145,9 @@ test-suite test
145145
other-modules:
146146
Unicode.CharSpec
147147
build-depends:
148-
base >= 4.7 && < 4.18
149-
, hspec >= 2.0 && < 2.11
150-
, unicode-data
148+
base >= 4.7 && < 4.18
149+
, hspec >= 2.0 && < 2.11
150+
, unicode-data-core
151151
build-tool-depends:
152152
hspec-discover:hspec-discover >= 2.0 && < 2.11
153153
-- We need to match a GHC version with the same Unicode version.
@@ -162,9 +162,9 @@ benchmark bench
162162
hs-source-dirs: bench
163163
main-is: Main.hs
164164
build-depends:
165-
base >= 4.7 && < 4.18,
166-
deepseq >= 1.1 && < 1.5,
167-
tasty-bench >= 0.2.5 && < 0.4,
168-
tasty >= 1.4.1,
169-
unicode-data
165+
base >= 4.7 && < 4.18,
166+
deepseq >= 1.1 && < 1.5,
167+
tasty-bench >= 0.2.5 && < 0.4,
168+
tasty >= 1.4.1,
169+
unicode-data-core
170170
ghc-options: -O2 -fdicts-strict -rtsopts

‎unicode-data-names/unicode-data-names.cabal‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ library
8383

8484
hs-source-dirs: lib
8585
build-depends:
86-
base >= 4.7 && < 4.18
86+
base >= 4.7 && < 4.18
8787

8888
test-suite test
8989
import: default-extensions, compile-options
@@ -94,9 +94,9 @@ test-suite test
9494
other-modules:
9595
Unicode.Char.General.NamesSpec
9696
build-depends:
97-
base >= 4.7 && < 4.18
98-
, hspec >= 2.0 && < 2.11
99-
, unicode-data >= 0.4 && < 0.5
97+
base >= 4.7 && < 4.18
98+
, hspec >= 2.0 && < 2.11
99+
, unicode-data-core >= 0.4 && < 0.5
100100
, unicode-data-names
101101
build-tool-depends:
102102
hspec-discover:hspec-discover >= 2.0 && < 2.11
@@ -112,7 +112,7 @@ executable export-all-chars
112112
buildable: True
113113
build-depends:
114114
base
115-
, unicode-data
115+
, unicode-data-core
116116
, unicode-data-names
117117
else
118118
buildable: False
@@ -123,9 +123,9 @@ benchmark bench
123123
hs-source-dirs: bench
124124
main-is: Main.hs
125125
build-depends:
126-
base >= 4.7 && < 4.18,
127-
deepseq >= 1.1 && < 1.5,
128-
tasty-bench >= 0.2.5 && < 0.4,
129-
tasty >= 1.4.1,
126+
base >= 4.7 && < 4.18,
127+
deepseq >= 1.1 && < 1.5,
128+
tasty-bench >= 0.2.5 && < 0.4,
129+
tasty >= 1.4.1,
130130
unicode-data-names
131131
ghc-options: -O2 -fdicts-strict -rtsopts

0 commit comments

Comments
 (0)