diff options
| author | Daniel Luz <dev@mernen.com> | 2010-08-09 05:03:36 -0300 |
|---|---|---|
| committer | Daniel Luz <dev@mernen.com> | 2010-08-09 05:03:36 -0300 |
| commit | c6b99666806c387a061f589dd88a8638758c8e90 (patch) | |
| tree | 8976a51a97bfd5a289330a3e9a0d699987386ff5 | |
| parent | 4223670e9cc38f46e08726162b14a2d0d8e94fd2 (diff) | |
| parent | ae7a01f43d24dfe84b8ac2e2de505538e6011710 (diff) | |
| download | json-c6b99666806c387a061f589dd88a8638758c8e90.tar.gz | |
Merge branch 'master' (early part) into unified
| -rw-r--r-- | ext/json/ext/generator/generator.c | 4 | ||||
| -rwxr-xr-x | tests/test_json_generate.rb | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c index 0617466..ca82363 100644 --- a/ext/json/ext/generator/generator.c +++ b/ext/json/ext/generator/generator.c @@ -748,7 +748,7 @@ static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_S VALUE key, key_to_s, keys; if (max_nesting != 0 && depth > max_nesting) { fbuffer_free(buffer); - rb_raise(eNestingError, "nesting of %ld is too deep", depth); + rb_raise(eNestingError, "nesting of %ld is too deep", --state->depth); } fbuffer_append_char(buffer, '{'); keys = rb_funcall(obj, i_keys, 0); @@ -794,7 +794,7 @@ static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_St int i, j; if (max_nesting != 0 && depth > max_nesting) { fbuffer_free(buffer); - rb_raise(eNestingError, "nesting of %ld is too deep", depth); + rb_raise(eNestingError, "nesting of %ld is too deep", --state->depth); } fbuffer_append_char(buffer, '['); if (array_nl) fbuffer_append(buffer, array_nl, array_nl_len); diff --git a/tests/test_json_generate.rb b/tests/test_json_generate.rb index d67a4b2..69c967e 100755 --- a/tests/test_json_generate.rb +++ b/tests/test_json_generate.rb @@ -170,9 +170,6 @@ EOT assert_equal 0, JSON::SAFE_STATE_PROTOTYPE.depth assert_raises(JSON::NestingError) { JSON.generate(ary) } assert_equal 0, JSON::SAFE_STATE_PROTOTYPE.depth - assert_equal 0, JSON::FAST_STATE_PROTOTYPE.depth - assert_raises(JSON::NestingError) { JSON.fast_generate(ary) } - assert_equal 0, JSON::FAST_STATE_PROTOTYPE.depth assert_equal 0, JSON::PRETTY_STATE_PROTOTYPE.depth assert_raises(JSON::NestingError) { JSON.pretty_generate(ary) } assert_equal 0, JSON::PRETTY_STATE_PROTOTYPE.depth |