summaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* Change actual rl filessferik-max_nestingFlorian Frank2012-10-072-3/+3
|
* Increase default max_nesting to 100Erik Michaels-Ober2012-10-052-2/+2
| | | | See discussion at https://github.com/intridea/multi_json/pull/59.
* enforce utf8 encoding in parsed stringsjruby-fix-encodingFlorian Frank2012-05-103-37/+52
|
* force jruby encoding after generationFlorian Frank2012-05-091-0/+4
|
* Propagate src encoding to values made from it (fixes 1.9 mode converting ↵Thomas E. Enebo2012-02-111-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 Frank2011-12-212-88/+94
|\ | | | | | | headius-more_jruby_tweaks
| * Only allocate a single "view" bytelist, and update it as needed.Charles Oliver Nutter2011-12-202-88/+94
| | | | | | | | | | | | | | Conflicts: java/src/json/ext/Parser.java java/src/json/ext/Parser.rl
* | Merge branch 'hash-duckyped-object_classes'Florian Frank2011-12-212-4/+0
|\ \ | |/ |/|
| * Remove superflous commentFlorian Frank2011-12-212-4/+0
| |
* | Fix #109Florian Frank2011-12-202-0/+0
|/
* Support duck typed ruby array in JRuby as wellFlorian Frank2011-12-202-16/+16
|
* Support hash ducktype objects on JRuby as wellFlorian Frank2011-12-203-49/+58
|
* Only allocate a single ParserResult, and pass it along the stack.headius-jruby_perf_tweaksCharles Oliver Nutter2011-12-202-141/+170
|
* Better ByteList subsequence and break up some parse methods.Charles Oliver Nutter2011-12-202-84/+126
|
* Use appropriate byteListToInum for Ruby version.Charles Oliver Nutter2011-12-201-1/+3
|
* Minor tweaks to Java ext for performance.Charles Oliver Nutter2011-12-202-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 settingsFlorian Frank2011-11-231-0/+21
|
* Extract utils out of this library into json-utilsv1.6.0Florian Frank2011-09-131-80/+84
|
* Add some documentationv1.5.4Florian Frank2011-08-312-1/+6
|
* Merge branch 'quirks-mode-parser' into quirks-modeFlorian Frank2011-07-313-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_modeFlorian Frank2011-07-313-109/+448
| | | | | | | | This allows parsing of primitive values
* | started quirks mode for generatorFlorian Frank2011-07-279-72/+96
|/
* Ported fixes from fix_memory_leak into Parser.rlFlorian Frank2011-07-082-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 Frank2011-07-049-46/+51
|\ | | | | | | development
| * Fix memory leak when used from multiple JRuby runtimes.John Firebaugh2011-05-189-46/+51
| |
* | Don't optimize calls for ducktypesFlorian Frank2011-05-122-27/+35
| |
* | Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2011-05-122-17/+25
|\ \ | |/ |/|
| * use []= method if objectClass isn't a HashFlorian Frank2011-05-112-17/+25
| |
* | flori/json#60: Incorrect pretty-print indentationClemens Fuchslocher2011-02-261-1/+1
| |
* | flori/json#60: Incorrect pretty-print indentationClemens Fuchslocher2011-02-261-5/+1
|/
* renamed :match argument to :match_stringv1.5.0Florian Frank2011-01-052-10/+10
|
* avoid object creationFlorian Frank2011-01-032-42/+38
|
* implement string matching for java parserFlorian Frank2011-01-023-102/+169
|
* started to build jruby extension with RakefileFlorian Frank2010-09-2315-0/+5044