2f9afbe · elk · git.iko.soy

git.iko.soy/elk

on master help sign in

Switch Json/ over to Data.Name

2f9afbeEvan Czaplicki8 years ago

compiler/src/Json/Decode/Internals.hs+3−3

compare with master

unifiedsplit

@@ -22,9 +22,9 @@ import Prelude hiding (fail, map, maybe)

23import qualified Data.List as List

24import qualified Data.Map.Strict as Map

25+import qualified Data.Name as Name

25import qualified Data.Scientific as Sci

26import qualified Data.Scientific as Sci

26import qualified Data.Text as Text

27import qualified Data.Text as Text

27−import qualified Elm.Name as N

28import qualified Json.Encode as E

@@ -93,9 +93,9 @@ text =

93 Left (expecting value TString)

96−name :: Decoder e N.Name

96+name :: Decoder e Name.Name

97name =

98− N.fromText <$> text

98+ Name.fromString <$> string

100

101bool :: Decoder e Bool

compiler/src/Json/Encode.hs+3−4

@@ -30,13 +30,12 @@ import Data.ByteString.Builder.Prim ((>*<))

30import qualified Data.Map as Map

31import qualified Data.Scientific as Sci

32import Data.Monoid ((<>))

33+import qualified Data.Name as Name

33import qualified Data.Text as Text

34import qualified Data.Text as Text

34import qualified Data.Text.Encoding as Text

35import qualified Data.Text.Encoding as Text

35import qualified Data.Word as W

36import qualified Data.Word as W

36import System.IO (IOMode(WriteMode), withBinaryFile)

37import System.IO (IOMode(WriteMode), withBinaryFile)

38−import qualified Elm.Name as N

39−

42-- VALUES

41-- VALUES

@@ -67,9 +66,9 @@ text txt =

67 String (encodeText txt)

66 String (encodeText txt)

70−name :: N.Name -> Value

69+name :: Name.Name -> Value

71name nm =

70name nm =

72− String ("\"" <> N.toBuilder nm <> "\"")

71+ String ("\"" <> Name.toBuilder nm <> "\"")

75bool :: Bool -> Value

74bool :: Bool -> Value