diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-13 12:08:28 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-13 12:08:28 +0000 |
| commit | 8f37674ffd5f4fd7ef581f4c5055b0b4f5acb763 (patch) | |
| tree | 9dd61b6810e68aa3e01cd9fa6b566d24952aa4fb /ext/json | |
| parent | 6a852f7ab800dae868e2246b890a66c6dc07aead (diff) | |
| download | ruby-8f37674ffd5f4fd7ef581f4c5055b0b4f5acb763.tar.gz | |
* ext/json, test/json: merge JSON HEAD(259dee6)
separate imprementation of Typed_Data macro.
https://github.com/flori/json/compare/v1.8.1...v1.8.2
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/json')
| -rw-r--r-- | ext/json/generator/generator.c | 1 | ||||
| -rw-r--r-- | ext/json/parser/parser.rl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c index aee385e08b..7805cde960 100644 --- a/ext/json/generator/generator.c +++ b/ext/json/generator/generator.c @@ -901,6 +901,7 @@ static FBuffer *cState_prepare_buffer(VALUE self) } else { state->object_delim2 = fbuffer_alloc(16); } + if (state->space_before) fbuffer_append(state->object_delim2, state->space_before, state->space_before_len); fbuffer_append_char(state->object_delim2, ':'); if (state->space) fbuffer_append(state->object_delim2, state->space, state->space_len); diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl index 9bc5efb66c..e29f46d336 100644 --- a/ext/json/parser/parser.rl +++ b/ext/json/parser/parser.rl @@ -611,7 +611,7 @@ static VALUE convert_encoding(VALUE source) * the default. * * *create_additions*: If set to false, the Parser doesn't create * additions even if a matching class and create_id was found. This option - * defaults to true. + * defaults to false. * * *object_class*: Defaults to Hash * * *array_class*: Defaults to Array */ |