Skip to content

Commit

Permalink
Fixes (cabal, stack, pattern synonym)
Browse files Browse the repository at this point in the history
  • Loading branch information
wismill committed Jul 7, 2022
1 parent 6496f5d commit 5e6912b
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
7 changes: 5 additions & 2 deletions Data/Unicode/Internal/Char/DerivedNormalizationProperties.hs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
module Data.Unicode.Internal.Char.DerivedNormalizationProperties
( pattern YesStarter
, pattern MaybeStarterNoDecomp
, pattern Decomposable, pattern Combining
, pattern Decomposable
, pattern Combining
, isNFKC_QC, isNFKD_QC, isNFC_QC, isNFD_QC)
where

Expand All @@ -25,8 +26,10 @@ pattern MaybeStarterNoDecomp = 2
pattern YesStarter :: Int
pattern YesStarter = 3

pattern Decomposable, Combining :: Int
pattern Decomposable :: Int
pattern Decomposable = 0

pattern Combining :: Int
pattern Combining = 1

{-# INLINE isNFKC_QC #-}
Expand Down
7 changes: 6 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ packages:
- '.'
resolver: lts-18.18
extra-deps:
- unicode-data-0.2.0
# [TODO] re-enable once unicode-data is released with quick check
# - unicode-data-XXX
- git: https://github.com/composewell/unicode-data.git
commit: dffcca331e4c8479c75983cfc8ce2591e9bad601
subdirs:
- unicode-data
- tasty-bench-0.3

# Look at https://stackoverflow.com/questions/70045586/could-not-find-module-system-console-mintty-win32-when-compiling-test-framework
Expand Down
7 changes: 5 additions & 2 deletions ucd2haskell/Parser/Text.hs
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ genNormalizationPropertiesModule moduleName =
, "( pattern YesStarter"
-- , ", pattern MaybeCombiningStarter, pattern MaybeStarterNoDecomp"
, ", pattern MaybeStarterNoDecomp"
, ", pattern Decomposable, pattern Combining"
, ", pattern Decomposable"
, ", pattern Combining"
-- , "( pattern Decomposable, pattern Combining, pattern CombiningStarter"
-- , ", pattern Starter, pattern Stable"
, ", " <> mconcat (intersperse ", " (prop2FuncName <$> exports)) <> ")"
Expand Down Expand Up @@ -239,8 +240,10 @@ genNormalizationPropertiesModule moduleName =
, "pattern YesStarter = " <> show yesStarter
-- , "pattern YesStable = " <> show yesStable
, ""
, "pattern Decomposable, Combining :: Int"
, "pattern Decomposable :: Int"
, "pattern Decomposable = " <> show decomposable
, ""
, "pattern Combining :: Int"
, "pattern Combining = " <> show combining
, ""
, mconcat bitmaps
Expand Down
2 changes: 1 addition & 1 deletion ucd2haskell/ucd2haskell.cabal
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cabal-version: 3.4
cabal-version: 3.0
name: ucd2haskell
version: 0.1.0.0
-- synopsis:
Expand Down
1 change: 0 additions & 1 deletion unicode-transforms.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ extra-source-files:
MAINTAINING.md
NOTES.md
README.md
download-ucd-files.sh
benchmark/README.md
benchmark/NormalizeFile.hs
benchmark/data/AllChars.txt
Expand Down

0 comments on commit 5e6912b

Please sign in to comment.