Merge branch 'develop'

This commit is contained in:
alisdair sullivan 2017-10-22 13:56:38 -07:00
commit 45ffea21a6
2 changed files with 5 additions and 1 deletions

View file

@ -440,7 +440,7 @@ additional options beyond these. see
escape sequences not adhering to the json spec result in a `badarg` error escape sequences not adhering to the json spec result in a `badarg` error
any combination of these can be passed to **jsx** by using `{strict, [strict_option()]}`. any combination of these can be passed to **jsx** by using `{strict, [strict_option()]}`.
`strict` is equivalent to `{strict, [comments, bad_utf8, single_quotes, escapes]}` `strict` is equivalent to `{strict, [comments, trailing_commas, utf8, single_quotes, escapes]}`
- `return_tail` - `return_tail`

View file

@ -423,6 +423,10 @@ return_maps_test_() ->
[{}], [{}],
jsx:decode(<<"{}">>, []) jsx:decode(<<"{}">>, [])
)}, )},
{"an empty map", ?_assertEqual(
[{}],
jsx:decode(<<"{}">>, [{return_maps, false}])
)},
{"a small map", ?_assertEqual( {"a small map", ?_assertEqual(
#{<<"awesome">> => true, <<"library">> => <<"jsx">>}, #{<<"awesome">> => true, <<"library">> => <<"jsx">>},
jsx:decode(<<"{\"library\": \"jsx\", \"awesome\": true}">>, [return_maps]) jsx:decode(<<"{\"library\": \"jsx\", \"awesome\": true}">>, [return_maps])