umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
alisdair sullivan 2015-03-15 12:28:54 -07:00
commit eb8dab979b
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.md
View file

@ -1,3 +1,7 @@
v2.5.2
* fix regression parsing <<"-0e...">> (thanks @c-bik)
v2.5.1 v2.5.1
* assume all datetimes are UTC time and add `Z` designator to indicate * assume all datetimes are UTC time and add `Z` designator to indicate

5
README.md
View file

@ -1,4 +1,5 @@
# jsx (v2.5.1) # # jsx (v2.5.2) #
an erlang application for consuming, producing and manipulating [json][json]. an erlang application for consuming, producing and manipulating [json][json].
inspired by [yajl][yajl] inspired by [yajl][yajl]
@ -707,7 +708,7 @@ following events must be handled:
## acknowledgements ## ## acknowledgements ##
jsx wouldn't be what it is without the contributions of [paul davis](https://github.com/davisp), [lloyd hilaiel](https://github.com/lloyd), [john engelhart](https://github.com/johnezang), [bob ippolito](https://github.com/etrepum), [fernando benavides](https://github.com/elbrujohalcon), [alex kropivny](https://github.com/amtal), [steve strong](https://github.com/srstrong), [michael truog](https://github.com/okeuday), [devin torres](https://github.com/devinus), [dmitry kolesnikov](https://github.com/fogfish), [emptytea](https://github.com/emptytea), [john daily](https://github.com/macintux), [ola bäckström](https://github.com/olabackstrom), [joseph crowe](https://github.com/JosephCrowe), [patrick gombert](https://github.com/patrickgombert), [eskuat](https://github.com/eskuat) and [max lapshin](https://github.com/maxlapshin) jsx wouldn't be what it is without the contributions of [paul davis](https://github.com/davisp), [lloyd hilaiel](https://github.com/lloyd), [john engelhart](https://github.com/johnezang), [bob ippolito](https://github.com/etrepum), [fernando benavides](https://github.com/elbrujohalcon), [alex kropivny](https://github.com/amtal), [steve strong](https://github.com/srstrong), [michael truog](https://github.com/okeuday), [devin torres](https://github.com/devinus), [dmitry kolesnikov](https://github.com/fogfish), [emptytea](https://github.com/emptytea), [john daily](https://github.com/macintux), [ola bäckström](https://github.com/olabackstrom), [joseph crowe](https://github.com/JosephCrowe), [patrick gombert](https://github.com/patrickgombert), [eskuat](https://github.com/eskuat), [max lapshin](https://github.com/maxlapshin) and [bikram chatterjee](https://github.com/c-bik)
[json]: http://json.org [json]: http://json.org
[yajl]: http://lloyd.github.com/yajl [yajl]: http://lloyd.github.com/yajl

2
src/jsx.app.src
View file

@ -1,7 +1,7 @@
{application, jsx, {application, jsx,
[ [
{description, "a streaming, evented json parsing toolkit"}, {description, "a streaming, evented json parsing toolkit"},
{vsn, "2.5.1"}, {vsn, "2.5.2"},
{modules, [ {modules, [
jsx, jsx,
jsx_encoder, jsx_encoder,

3
src/jsx_decoder.erl
View file

@ -892,6 +892,8 @@ number(Bin, Handler, Acc, [State|Stack], Config) ->
zero(<<?decimalpoint, Rest/binary>>, N) -> initialdecimal(Rest, N + 1); zero(<<?decimalpoint, Rest/binary>>, N) -> initialdecimal(Rest, N + 1);
zero(<<$e, _/binary>>, N) -> {integer, N};
zero(<<$E, _/binary>>, N) -> {integer, N};
zero(<<>>, N) -> {zero, N}; zero(<<>>, N) -> {zero, N};
zero(_, N) -> {finish_integer, N}. zero(_, N) -> {finish_integer, N}.
@ -1171,6 +1173,7 @@ special_number_test_() ->
{"0e4", [{float, 0.0}, end_json], <<"0e4">>}, {"0e4", [{float, 0.0}, end_json], <<"0e4">>},
{"1e0", [{float, 1.0}, end_json], <<"1e0">>}, {"1e0", [{float, 1.0}, end_json], <<"1e0">>},
{"-1e0", [{float, -1.0}, end_json], <<"-1e0">>}, {"-1e0", [{float, -1.0}, end_json], <<"-1e0">>},
{"-0e0", [{float, -0.0}, end_json], <<"-0e0">>},
{"1e4", [{float, 1.0e4}, end_json], <<"1e4">>}, {"1e4", [{float, 1.0e4}, end_json], <<"1e4">>},
{"number terminated by whitespace", {"number terminated by whitespace",
[start_array, {integer, 1}, end_array, end_json], [start_array, {integer, 1}, end_array, end_json],