Encode 1.3.2 → 1.3.3

raw patch · 3 files changed

+13/−12 lines, 3 filesdep +containersPVP ok

version bump matches the API change (PVP)

Dependencies added: containers

API changes (from Hackage documentation)

Files

• Encode.cabal +2/−2
• Encode.hs +3/−3
• Encode/Arabic/Buckwalter.hs +8/−7

@@ -1,5 +1,5 @@ name:               Encode
-version:            1.3.2
+version:            1.3.3
 license:            GPL
 license-file:       LICENSE
 extra-source-files: INSTALL, LicenseBSD, LicenseGPL, Setup.PL
@@ -9,7 +9,7 @@ homepage:           http://ufal.mff.cuni.cz/~smrz/
 package-url:        http://sourceforge.net/projects/encode-arabic/
 category:           Text, Codec
-build-depends:      Cabal, base <= 4.2, mtl
+build-depends:      Cabal, base <= 4.2, mtl, containers
 build-type:         Simple
 synopsis:           Encoding character data
 description:        The "Encode" library provides a unified interface for

@@ -1,5 +1,5 @@ -- --------------------------------------------------------------------------
---  $Revision: 937 $ $Date: 2010-02-14 13:54:54 +0100 (Sun, 14 Feb 2010) $
+--  $Revision: 972 $ $Date: 2010-06-20 01:49:29 +0200 (Sun, 20 Jun 2010) $
 -- --------------------------------------------------------------------------
 
 -- |
@@ -43,9 +43,9 @@ 
 import Version
 
-version = Version [1, 3, min build 2] []
+version = Version [1, 3, min build 3] []
 
-    where Version [build] [] = revised "$Revision: 937 $"
+    where Version [build] [] = revised "$Revision: 972 $"
 
 
 -- | The datatype introduced for the internal representation of Unicode code

@@ -1,5 +1,5 @@ -- --------------------------------------------------------------------------
---  $Revision: 971 $ $Date: 2010-06-20 00:49:34 +0200 (Sun, 20 Jun 2010) $
+--  $Revision: 972 $ $Date: 2010-06-20 01:49:29 +0200 (Sun, 20 Jun 2010) $
 -- --------------------------------------------------------------------------
 
 -- |
@@ -37,11 +37,12 @@ 
 import Encode
 
-import PureFP.OrdMap
+import Data.Map (Map)
+import qualified Data.Map as Map
 
 import Version
 
-version = revised "$Revision: 971 $"
+version = revised "$Revision: 972 $"
 
 
 data Buckwalter = Buckwalter | Tim
@@ -56,14 +57,14 @@     decode _ = recode decoder
 
 
-recode :: (Eq a, Enum a, Enum b, Ord a, OrdMap m) => m a b -> [a] -> [b]
+recode :: (Ord a, Enum b, Enum a) => Map a b -> [a] -> [b]
 
-recode xry xs = [ lookupWith ((toEnum . fromEnum) x) xry x | x <- xs ]
+recode xry xs = [ Map.findWithDefault ((toEnum . fromEnum) x) x xry | x <- xs ]
 
 
 recoder :: Ord a => [a] -> [b] -> Map a b
 
-recoder xs ys = makeMapWith const (zip xs ys)
+recoder xs ys = Map.fromList (zip xs ys)
 
 
 encoder :: Map UPoint Char
@@ -97,7 +98,7 @@ 
 encoded = map id ( []
 
-            ++ "OWI" ++ ">&<"
+            ++ ">&<" ++ "OWI"
             ++ ",;?"
             ++ "'|" ++ "}AbptvjHxd*rzs$SDTZEg" ++ "fqklmnhwYy"
             ++ "PJVG"