diff options
| author | Florian Frank <flori@ping.de> | 2011-12-21 10:55:48 +0100 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2011-12-21 10:55:48 +0100 |
| commit | c0c0f834e9b6bcc166e3f19c7766c03230126384 (patch) | |
| tree | 48265721550c9b2cc03c6b21679a2b4a979b90c4 /java | |
| parent | 6506aa32d5b7c56dc478cba2158e7ac7c2364be7 (diff) | |
| parent | 0eda56f86ff4d04ddabf15721ad0cc39c2218a6d (diff) | |
| download | json-c0c0f834e9b6bcc166e3f19c7766c03230126384.tar.gz | |
Merge branch 'hash-duckyped-object_classes'
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/json/ext/Parser.java | 2 | ||||
| -rw-r--r-- | java/src/json/ext/Parser.rl | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/java/src/json/ext/Parser.java b/java/src/json/ext/Parser.java index 579b047..b0573f4 100644 --- a/java/src/json/ext/Parser.java +++ b/java/src/json/ext/Parser.java @@ -1606,8 +1606,6 @@ static final int JSON_array_en_main = 1; "nesting of " + currentNesting + " is too deep"); } - // this is guaranteed to be a RubyArray due to the earlier - // allocator test at OptionsReader#getClass IRubyObject result; if (parser.arrayClass == getRuntime().getArray()) { result = RubyArray.newArray(getRuntime()); diff --git a/java/src/json/ext/Parser.rl b/java/src/json/ext/Parser.rl index fd759f5..1c0222c 100644 --- a/java/src/json/ext/Parser.rl +++ b/java/src/json/ext/Parser.rl @@ -698,8 +698,6 @@ public class Parser extends RubyObject { "nesting of " + currentNesting + " is too deep"); } - // this is guaranteed to be a RubyArray due to the earlier - // allocator test at OptionsReader#getClass IRubyObject result; if (parser.arrayClass == getRuntime().getArray()) { result = RubyArray.newArray(getRuntime()); |