country 0.1.5 → 0.1.6
raw patch · 3 files changed
+21/−4 lines, 3 filesdep +deepseqdep ~aesondep ~basedep ~hashablePVP ok
version bump matches the API change (PVP)
Dependencies added: deepseq
Dependency ranges changed: aeson, base, hashable, primitive
API changes (from Hackage documentation)
Files
- country.cabal +4/−3
- src/Country/Unexposed/Alias.hs +13/−0
- src/Country/Unexposed/Names.hs +4/−1
country.cabal view
@@ -1,5 +1,5 @@ name: country-version: 0.1.5+version: 0.1.6 synopsis: Country data type and functions description: The `country` library provides a data type for dealing with@@ -40,14 +40,15 @@ Country.Unexposed.TrieByte Country.Unexposed.Alias build-depends:- base >= 4.9 && < 4.12+ base >= 4.9.1.0 && < 4.12 , text >= 1.2 && < 1.3 , bytestring >= 0.10 && < 0.11+ , deepseq >= 1.3.0.2 && < 1.5 , primitive >= 0.6.1 && < 0.7 , unordered-containers >= 0.2 && < 0.3 , ghc-prim >= 0.5 && < 0.6 , hashable >= 1.2 && < 1.3- , aeson >= 0.11 && < 1.4+ , aeson >= 0.11 && < 1.5 , scientific >= 0.3 && < 0.4 , attoparsec >= 0.13 && < 0.14 default-language: Haskell2010
src/Country/Unexposed/Alias.hs view
@@ -60,7 +60,9 @@ , (204, T.pack "Benin") , (60, T.pack "Bermuda") , (64, T.pack "Bhutan")+ , (68, T.pack "Bolivia") , (68, T.pack "Bolivia (Plurinational State of)")+ , (68, T.pack "Plurinational State of Bolivia") , (535, T.pack "Bonaire, Sint Eustatius and Saba") , (70, T.pack "Bosnia and Herzegovina") , (72, T.pack "Botswana")@@ -237,7 +239,9 @@ , (404, T.pack "Republic of Kenya") , (296, T.pack "Kiribati") , (408, T.pack "Korea (Democratic People's Republic of)")+ , (408, T.pack "North Korea") , (410, T.pack "Korea (Republic of)")+ , (410, T.pack "South Korea") , (414, T.pack "Kuwait") , (417, T.pack "Kyrgyzstan") , (418, T.pack "Lao People's Democratic Republic")@@ -266,6 +270,7 @@ , (442, T.pack "Luxemburg") , (442, T.pack "Luxemburgo") , (446, T.pack "Macao")+ , (807, T.pack "Macedonia") , (807, T.pack "Macedonia (the former Yugoslav Republic of)") , (450, T.pack "Madagascar") , (454, T.pack "Malawi")@@ -306,6 +311,8 @@ , (583, T.pack "Micronesia (Federated States of)") , (498, T.pack "Moldova (Republic of)") , (492, T.pack "Monaco")+ , (492, T.pack "Principality of Monaco")+ , (492, T.pack "Principauté de Monaco") , (496, T.pack "Mongolia") , (499, T.pack "Montenegro") , (499, T.pack "Republic of Singapore")@@ -333,6 +340,7 @@ , (586, T.pack "Pakistan") , (585, T.pack "Palau") , (275, T.pack "Palestine, State of")+ , (275, T.pack "Palestine") , (591, T.pack "Panama") , (598, T.pack "Papua New Guinea") , (600, T.pack "Paraguay")@@ -413,6 +421,7 @@ , (710, T.pack "South Africa") , (239, T.pack "South Georgia and the South Sandwich Islands") , (728, T.pack "South Sudan")+ , (728, T.pack "Republic of South Sudan") , (724, T.pack "Spain") , (724, T.pack "Espainia") , (724, T.pack "Espanya")@@ -490,6 +499,7 @@ , (784, T.pack "U.A.E.") , (784, T.pack "UAE") , (826, T.pack "United Kingdom of Great Britain and Northern Ireland")+ , (826, T.pack "United Kingdom") , (840, T.pack "United States of America") , (840, T.pack "Estados Unidos de América") , (840, T.pack "The United States")@@ -505,7 +515,10 @@ , (548, T.pack "Vanuatu") , (548, T.pack "Ripablik blong Vanuatu") , (548, T.pack "République de Vanuatu")+ , (862, T.pack "Venezuela") , (862, T.pack "Venezuela (Bolivarian Republic of)")+ , (862, T.pack "Bolivarian Republic of Venezuela")+ , (862, T.pack "República Bolivariana de Venezuela") , (704, T.pack "Viet Nam") , (92, T.pack "Virgin Islands (British)") , (850, T.pack "Virgin Islands (U.S.)")
src/Country/Unexposed/Names.hs view
@@ -4,6 +4,7 @@ {-# LANGUAGE UnboxedTuples #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE TypeInType #-}+{-# LANGUAGE DeriveGeneric #-} {-# OPTIONS_HADDOCK not-home #-} @@ -20,6 +21,7 @@ , Country(..) ) where +import Control.DeepSeq (NFData) import Data.Word (Word16) import Data.Hashable (Hashable) import Data.Primitive.Types (Prim)@@ -46,6 +48,7 @@ writeByteArray,indexByteArray,unsafeFreezeByteArray,newByteArray,sizeOf) import qualified Data.Text as T import qualified Data.Scientific as SCI+import GHC.Generics (Generic) -- | The name of a country given in English encodeEnglish :: Country -> Text@@ -106,7 +109,7 @@ -- | A country recognized by ISO 3166. newtype Country = Country Word16- deriving (Eq,Ord,Prim,Hashable,Storable)+ deriving (Eq,Ord,Prim,Hashable,Storable,NFData,Generic) instance Show Country where show (Country n) = T.unpack (indexArray englishIdentifierNamesText (word16ToInt n))