tests/test_jjrb_offsets.rb @@ -1,2 +1,2 @@ #! /bin/sh -jruby -v -I lib tests/runner.rb +exec jruby -v -I lib tests/runner.rb run-tests @@ -508,7 +508,7 @@ case 1: // line 296 "src/json/ext/Parser.rl" { if (pe > p + 9 && - byteList.subSequence(p, p + 9).toString().equals(JSON_MINUS_INFINITY)) { + absSubSequence(p, p + 9).toString().equals(JSON_MINUS_INFINITY)) { if (parser.allowNaN) { result = getConstant(CONST_MINUS_INFINITY); @@ -838,7 +838,7 @@ case 5: return null; } - ByteList num = (ByteList)byteList.subSequence(memo, p); + ByteList num = absSubSequence(memo, p); // note: this is actually a shared string, but since it is temporary and // read-only, it doesn't really matter RubyString expr = RubyString.newStringLight(runtime, num); @@ -1077,7 +1077,7 @@ case 5: return null; } - ByteList num = (ByteList)byteList.subSequence(memo, p); + ByteList num = absSubSequence(memo, p); // note: this is actually a shared string, but since it is temporary and // read-only, it doesn't really matter RubyString expr = RubyString.newStringLight(runtime, num); @@ -2314,6 +2314,18 @@ case 5: } /** + * Returns a subsequence of the source ByteList, based on source + * array byte offsets (i.e., the ByteList's own begin offset is not + * automatically added). + * @param start + * @param end + */ + private ByteList absSubSequence(int absStart, int absEnd) { + int offset = byteList.begin(); + return (ByteList)byteList.subSequence(absStart - offset, absEnd - offset); + } + + /** * Retrieves a constant directly descended from the <code>JSON</code> module. * @param name The constant name */ src/json/ext/Parser.java @@ -295,7 +295,7 @@ public class Parser extends RubyObject { } action parse_number { if (pe > fpc + 9 && - byteList.subSequence(fpc, fpc + 9).toString().equals(JSON_MINUS_INFINITY)) { + absSubSequence(fpc, fpc + 9).toString().equals(JSON_MINUS_INFINITY)) { if (parser.allowNaN) { result = getConstant(CONST_MINUS_INFINITY); @@ -413,7 +413,7 @@ public class Parser extends RubyObject { return null; } - ByteList num = (ByteList)byteList.subSequence(memo, p); + ByteList num = absSubSequence(memo, p); // note: this is actually a shared string, but since it is temporary and // read-only, it doesn't really matter RubyString expr = RubyString.newStringLight(runtime, num); @@ -449,7 +449,7 @@ public class Parser extends RubyObject { return null; } - ByteList num = (ByteList)byteList.subSequence(memo, p); + ByteList num = absSubSequence(memo, p); // note: this is actually a shared string, but since it is temporary and // read-only, it doesn't really matter RubyString expr = RubyString.newStringLight(runtime, num); @@ -844,6 +844,18 @@ public class Parser extends RubyObject { } /** + * Returns a subsequence of the source ByteList, based on source + * array byte offsets (i.e., the ByteList's own begin offset is not + * automatically added). + * @param start + * @param end + */ + private ByteList absSubSequence(int absStart, int absEnd) { + int offset = byteList.begin(); + return (ByteList)byteList.subSequence(absStart - offset, absEnd - offset); + } + + /** * Retrieves a constant directly descended from the <code>JSON</code> module. * @param name The constant name */ src/json/ext/Parser.rl @@ -10,6 +10,7 @@ require 'test_json_unicode' require 'test_json_addition' require 'test_json_rails' require 'test_json_fixtures' +require 'test_jjrb_offsets' class TS_AllTests def self.suite @@ -20,6 +21,7 @@ class TS_AllTests suite << TC_JSONAddition.suite suite << TC_JSONRails.suite suite << TC_JSONFixtures.suite + suite << TestJjrbOffsets.suite end end Test::Unit::UI::Console::TestRunner.run(TS_AllTests) tests/runner.rb 32b5a3a525fe95f4e149d9b67a27f61804310914 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/62cec7eef11c380b9691d23e8be0000eabf68b1f 62cec7eef11c380b9691d23e8be0000eabf68b1f 2009-05-12T14:00:45-07:00 2009-05-12T13:40:57-07:00 Fixed the calculation of ranges when dealing with non-zero ByteList offsets. Thanks to Julio Castillo for the report. 2587a0ce3ad0af2dfe18dbe70747a540c50627c4 Daniel Luz dev@mernen.com