git.iko.soy/elk
on master help sign in
Switch Json/ over to Data.Name
commit2f9afbe46a9de9ef73db2985869b529b3af3a4e4 authorEvan Czaplicki <evancz@users.noreply.github.com> dateMon 19 Nov 2018, 12:42 (8 years ago) parent42f3721
2 files changed+6−7
compare with master
unifiedsplit
compiler/src/Json/Decode/Internals.hs+3−3 compiler/src/Json/Encode.hs+3−4
compiler/src/Json/Decode/Internals.hs+3−3
@@ -22,9 +22,9 @@ import Prelude hiding (fail, map, maybe)
2222
2323import qualified Data.List as List
2424import qualified Data.Map.Strict as Map
25+import qualified Data.Name as Name
2526import qualified Data.Scientific as Sci
2627import qualified Data.Text as Text
27−import qualified Elm.Name as N
2828import qualified Json.Encode as E
2929
3030
@@ -93,9 +93,9 @@ text =
9393 Left (expecting value TString)
9494
9595
96−name :: Decoder e N.Name
96+name :: Decoder e Name.Name
9797name =
98− N.fromText <$> text
98+ Name.fromString <$> string
9999
100100
101101bool :: Decoder e Bool
compiler/src/Json/Encode.hs+3−4
@@ -30,13 +30,12 @@ import Data.ByteString.Builder.Prim ((>*<))
3030import qualified Data.Map as Map
3131import qualified Data.Scientific as Sci
3232import Data.Monoid ((<>))
33+import qualified Data.Name as Name
3334import qualified Data.Text as Text
3435import qualified Data.Text.Encoding as Text
3536import qualified Data.Word as W
3637import System.IO (IOMode(WriteMode), withBinaryFile)
3738
38−import qualified Elm.Name as N
39−
4039
4140
4241-- VALUES
@@ -67,9 +66,9 @@ text txt =
6766 String (encodeText txt)
6867
6968
70−name :: N.Name -> Value
69+name :: Name.Name -> Value
7170name nm =
72− String ("\"" <> N.toBuilder nm <> "\"")
71+ String ("\"" <> Name.toBuilder nm <> "\"")
7372
7473
7574bool :: Bool -> Value