Skip to content

Commit a33b8d7

Browse files
CarstenKoenigkritzcreek
authored andcommitted
changed Char to CodePoint
1 parent c331803 commit a33b8d7

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/Data/Argonaut/Decode/Class.purs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import Data.Int (fromNumber)
1212
import Data.List (List(..), (:), fromFoldable)
1313
import Data.Map as M
1414
import Data.Maybe (maybe, Maybe(..))
15-
import Data.String.CodeUnits (charAt)
15+
import Data.String (CodePoint)
16+
import Data.String.CodePoints (codePointAt)
1617
import Data.Traversable (traverse)
1718
import Data.Tuple (Tuple(..))
1819
import Foreign.Object as FO
@@ -63,10 +64,10 @@ instance decodeJsonString :: DecodeJson String where
6364
instance decodeJsonJson :: DecodeJson Json where
6465
decodeJson = Right
6566

66-
instance decodeJsonChar :: DecodeJson Char where
67+
instance decodeJsonChar :: DecodeJson CodePoint where
6768
decodeJson j =
6869
maybe (Left $ "Expected character but found: " <> stringify j) Right
69-
=<< charAt 0 <$> decodeJson j
70+
=<< codePointAt 0 <$> decodeJson j
7071

7172
instance decodeForeignObject :: DecodeJson a => DecodeJson (FO.Object a) where
7273
decodeJson

src/Data/Argonaut/Encode/Class.purs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Data.Int (toNumber)
88
import Data.List (List(..), (:), toUnfoldable)
99
import Data.Map as M
1010
import Data.Maybe (Maybe(..))
11-
import Data.String.CodeUnits (singleton)
11+
import Data.String.CodePoints (CodePoint, codePointFromChar, singleton)
1212
import Data.Tuple (Tuple(..))
1313
import Foreign.Object as FO
1414

@@ -48,9 +48,12 @@ instance encodeJsonJString :: EncodeJson String where
4848
instance encodeJsonJson :: EncodeJson Json where
4949
encodeJson = identity
5050

51-
instance encodeJsonChar :: EncodeJson Char where
51+
instance encodeJsonCodePoint :: EncodeJson CodePoint where
5252
encodeJson = encodeJson <<< singleton
5353

54+
instance encodeJsonChar :: EncodeJson Char where
55+
encodeJson = encodeJson <<< codePointFromChar
56+
5457
instance encodeJsonArray :: EncodeJson a => EncodeJson (Array a) where
5558
encodeJson json = fromArray (encodeJson <$> json)
5659

0 commit comments

Comments
 (0)