umgeher/jsx
0
Fork 0
Code Issues Pull requests Activity

Merge branch 'develop'

Browse source
This commit is contained in:
alisdair sullivan 2012-03-27 16:58:20 -07:00
commit 7687a0de97
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.markdown
View file

@ -1,4 +1,4 @@
# <a name="introduction">jsx (v1.1)</a> # # <a name="introduction">jsx (v1.1.1)</a> #
a sane [json][json] implementation for erlang, inspired by [yajl][yajl] a sane [json][json] implementation for erlang, inspired by [yajl][yajl]
@ -8,7 +8,7 @@ jsx is released under the terms of the [MIT][MIT] license
jsx uses [rebar][rebar] for it's build chain and [meck][meck] for it's test suite jsx uses [rebar][rebar] for it's build chain and [meck][meck] for it's test suite
[![Build Status](https://secure.travis-ci.org/talentdeficit/jsx.png?branch=master)](http://travis-ci.org/talentdeficit/jsx) [![Build Status](https://secure.travis-ci.org/talentdeficit/jsx.png?branch=develop)](http://travis-ci.org/talentdeficit/jsx)
## index ## ## index ##

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, "1.1"}, {vsn, "1.1.1"},
{modules, [ {modules, [
jsx, jsx,
jsx_encoder, jsx_encoder,

2
src/jsx_decoder.erl
View file

@ -1265,7 +1265,7 @@ surrogates() -> lists:seq(16#d800, 16#dfff).
control_characters() -> lists:seq(1, 31). control_characters() -> lists:seq(1, 31).
good() -> [32, 33] ++ lists:seq(16#23, 16#5b) ++ lists:seq(16#5d, 16#d7ff) ++ lists:seq(16#e000, 16#ffff). good() -> [32, 33] ++ lists:seq(16#23, 16#5b) ++ lists:seq(16#5d, 16#d7ff) ++ lists:seq(16#e000, 16#fffd).
good_extended() -> lists:seq(16#100000, 16#10ffff). good_extended() -> lists:seq(16#100000, 16#10ffff).

2
src/jsx_encoder.erl
View file

@ -292,7 +292,7 @@ check([H|T], Opts, Acc) ->
surrogates() -> lists:seq(16#d800, 16#dfff). surrogates() -> lists:seq(16#d800, 16#dfff).
good() -> lists:seq(1, 16#d7ff) ++ lists:seq(16#e000, 16#ffff). good() -> lists:seq(1, 16#d7ff) ++ lists:seq(16#e000, 16#fffd).
good_extended() -> lists:seq(16#100000, 16#10ffff). good_extended() -> lists:seq(16#100000, 16#10ffff).