summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into merge-master-into-MagLev-mastermerge-master-into-MagLev-masterFlorian Frank2011-12-2111-321/+480
|\
| * Merge branch 'more_jruby_tweaks' of https://github.com/headius/json into head...Florian Frank2011-12-212-88/+94
| |\
| | * Only allocate a single "view" bytelist, and update it as needed.Charles Oliver Nutter2011-12-202-88/+94
| * | 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-204-22/+50
| * Support hash ducktype objects on JRuby as wellFlorian Frank2011-12-204-54/+63
| * only masterFlorian Frank2011-12-201-1/+1
| * Support object class with duck type hashFlorian Frank2011-12-205-80/+115
| * 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
* | Merge branch 'master' of https://github.com/MagLev/json into MagLev-masterMagLev-masterFlorian Frank2011-12-2128-365/+613
|\ \
| * \ Merge remote-tracking branch 'json/master'Tim Felgentreff2011-12-0927-350/+569
| |\ \ | | |/
| | * This makes all the difference, I am sure.v1.6.3Florian Frank2011-12-012-5/+5
| | * Small fix: JSON.load('') # => nilFlorian Frank2011-12-017-7/+12
| | * Create new gemspecsv1.6.2Florian Frank2011-11-282-4/+4
| | * Move fbuffer in its own directoryFlorian Frank2011-11-284-3/+3
| | * Add change to CHANGESFlorian Frank2011-11-281-0/+3
| | * Merge branch 'extract-fbuffer'Florian Frank2011-11-2313-305/+408
| | |\
| | | * support buffer length settingsFlorian Frank2011-11-231-0/+21
| | | * avoid symlinkFlorian Frank2011-11-235-4/+3
| | | * Extract fbuffer and use it in parser and generatorFlorian Frank2011-11-239-253/+271
| | | * change documentationFlorian Frank2011-11-102-3/+5
| | | * Merge branch 'configurable-initial-buffer-length' of gate.dyna.ping.de:/git/j...Florian Frank2011-11-101-0/+20
| | | |\
| | | | * start to make buffer_initial_length configurableFlorian Frank2011-11-091-0/+2
| | | | * start to make buffer_initial_length configurableFlorian Frank2011-11-098-65/+126
| | | * | start to make buffer_initial_length configurableFlorian Frank2011-11-098-65/+128
| | * | | Use git ls-files to determine package filesFlorian Frank2011-11-233-6/+5
| | * | | Change the CHANGESFlorian Frank2011-11-221-0/+2
| | * | | Merge branch 'master' of https://github.com/jpartlow/json into jpartlow-masterFlorian Frank2011-11-222-3/+3
| | |\ \ \
| | | * | | Fix for Time.json_create ensures == Time instances for roundtrip through JSON...Josh Partlow2011-11-182-3/+3
| | | | |/ | | | |/|
| | * | | Make JSON.dump and JSON.load support Rails betterFlorian Frank2011-11-224-5/+56
| | * | | Prepare new version 1.6.2Florian Frank2011-11-225-6/+9
| | * | | Add support for OpenStructFlorian Frank2011-11-217-29/+84
| | |/ /
| * | | MEMZERO effectively sets everything to Qfalse, not QnilTim Felgentreff2011-11-162-12/+12
| * | | Merge remote-tracking branch 'json/master'Tim Felgentreff2011-11-166-20/+49
| |\ \ \ | | |/ /
| | * | Add testcase for a possible crash with bignumFlorian Frank2011-11-091-0/+20
| | |/
| | * probe for read before calling itFlorian Frank2011-11-031-1/+1
| | * always raise type error when parsing nilFlorian Frank2011-11-034-19/+28
| * | Merge remote-tracking branch 'json/master'Tim Felgentreff2011-10-028-19/+31
| |\ \ | | |/
* | | Merge branch 'master' of https://github.com/MagLev/json into MagLev-masterFlorian Frank2011-10-024-43/+78
|\ \ \ | |/ / | | / | |/ |/|
| * change source so that it'll work on all implsTim Felgentreff2011-09-273-125/+131
| * Merge remote-tracking branch 'json/master'Tim Felgentreff2011-09-2756-4005/+1673
| |\
| * | remove reimplementation of rb_obj_is_kind_of and add some RTESTAllen Otis2011-09-011-9/+2
| * | json.gemspec is referencing build product mkmf.logTim Felgentreff2011-08-091-1/+1
| * | try to keep the diff to flori/json smallTim Felgentreff2011-08-091-1/+0
| * | Merge branch 'master' of https://github.com/MagLev/jsonTim Felgentreff2011-08-090-0/+0
| |\ \