Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Propagate src encoding to values made from it (fixes 1.9 mode converting ↵ | Thomas E. Enebo | 2012-02-11 | 1 | -0/+1 |
| | | | | everything to ascii-8bit; harmless for 1.8 mode too) | ||||
* | Merge branch 'more_jruby_tweaks' of https://github.com/headius/json into ↵ | Florian Frank | 2011-12-21 | 2 | -88/+94 |
|\ | | | | | | | headius-more_jruby_tweaks | ||||
| * | Only allocate a single "view" bytelist, and update it as needed. | Charles Oliver Nutter | 2011-12-20 | 2 | -88/+94 |
| | | | | | | | | | | | | | | Conflicts: java/src/json/ext/Parser.java java/src/json/ext/Parser.rl | ||||
* | | Remove superflous comment | Florian Frank | 2011-12-21 | 2 | -4/+0 |
|/ | |||||
* | Support duck typed ruby array in JRuby as well | Florian Frank | 2011-12-20 | 2 | -16/+16 |
| | |||||
* | Support hash ducktype objects on JRuby as well | Florian Frank | 2011-12-20 | 3 | -49/+58 |
| | |||||
* | Only allocate a single ParserResult, and pass it along the stack.headius-jruby_perf_tweaks | Charles Oliver Nutter | 2011-12-20 | 2 | -141/+170 |
| | |||||
* | Better ByteList subsequence and break up some parse methods. | Charles Oliver Nutter | 2011-12-20 | 2 | -84/+126 |
| | |||||
* | Use appropriate byteListToInum for Ruby version. | Charles Oliver Nutter | 2011-12-20 | 1 | -1/+3 |
| | |||||
* | Minor tweaks to Java ext for performance. | Charles Oliver Nutter | 2011-12-20 | 2 | -116/+128 |
| | | | | | | | * Avoid full newInstance logic if constructing normal Array or Hash * Skip intermediate RubyString for float and integer parsing * Avoid toString for comparison with "-Infinity" * Avoid repeated class.getName().equals() calls | ||||
* | support buffer length settings | Florian Frank | 2011-11-23 | 1 | -0/+21 |
| | |||||
* | Extract utils out of this library into json-utilsv1.6.0 | Florian Frank | 2011-09-13 | 1 | -80/+84 |
| | |||||
* | Add some documentationv1.5.4 | Florian Frank | 2011-08-31 | 2 | -1/+6 |
| | |||||
* | Merge branch 'quirks-mode-parser' into quirks-mode | Florian Frank | 2011-07-31 | 3 | -131/+470 |
|\ | | | | | | | | | | | | | | | | | Conflicts: java/src/json/ext/Parser.java java/src/json/ext/Parser.rl json.gemspec json_pure.gemspec tests/test_json.rb | ||||
| * | Implement quirks_mode | Florian Frank | 2011-07-31 | 3 | -109/+448 |
| | | | | | | | | This allows parsing of primitive values | ||||
* | | started quirks mode for generator | Florian Frank | 2011-07-27 | 9 | -72/+96 |
|/ | |||||
* | Ported fixes from fix_memory_leak into Parser.rl | Florian Frank | 2011-07-08 | 2 | -85/+107 |
| | | | | | Ported semantic of the desired behaviour in ruby-core:35079 to java as well. | ||||
* | Merge branch 'fix_memory_leak' of https://github.com/bigfix/json into ↵ | Florian Frank | 2011-07-04 | 9 | -46/+51 |
|\ | | | | | | | development | ||||
| * | Fix memory leak when used from multiple JRuby runtimes. | John Firebaugh | 2011-05-18 | 9 | -46/+51 |
| | | |||||
* | | Don't optimize calls for ducktypes | Florian Frank | 2011-05-12 | 2 | -27/+35 |
| | | |||||
* | | Merge branch 'master' of gate.dyna.ping.de:/git/json | Florian Frank | 2011-05-12 | 2 | -17/+25 |
|\ \ | |/ |/| | |||||
| * | use []= method if objectClass isn't a Hash | Florian Frank | 2011-05-11 | 2 | -17/+25 |
| | | |||||
* | | flori/json#60: Incorrect pretty-print indentation | Clemens Fuchslocher | 2011-02-26 | 1 | -1/+1 |
| | | |||||
* | | flori/json#60: Incorrect pretty-print indentation | Clemens Fuchslocher | 2011-02-26 | 1 | -5/+1 |
|/ | |||||
* | renamed :match argument to :match_stringv1.5.0 | Florian Frank | 2011-01-05 | 2 | -10/+10 |
| | |||||
* | avoid object creation | Florian Frank | 2011-01-03 | 2 | -42/+38 |
| | |||||
* | implement string matching for java parser | Florian Frank | 2011-01-02 | 3 | -102/+169 |
| | |||||
* | started to build jruby extension with Rakefile | Florian Frank | 2010-09-23 | 13 | -0/+5044 |