summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "simplified build structure"v1.4.2Joshua Peek2010-04-289-17/+20
| | | | This reverts 76e017a1b8a042bcb682b68821cc33f29788cd9a commit.
* new versionFlorian Frank2010-04-281-1/+1
|
* changed the CHANGESFlorian Frank2010-04-281-0/+2
|
* Free the buffer content as well.Florian Frank2010-04-281-1/+1
| | | | | Forgot to change back to the regular fbuffer_free function after ending the nocopying experiment. This of course caused a memory leak.
* prepare for 1.4.2 releaseFlorian Frank2010-04-262-1/+6
|
* allow building of json_pure if extensiontask is not presentdevrandom2010-04-261-1/+3
|
* Get rid of a warning.NARUSE, Yui2010-04-261-1/+1
| | | | | Merged from Ruby r27502, fixed by usa. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27502
* Fix mixed declarations and code.NARUSE, Yui2010-04-263-11/+20
| | | | ISO C90 forbids mixed declarations and code, and this breaks VC++.
* Fixed T_FIXNUM bug on 64bit architectures.v1.4.1Florian Frank2010-04-257-14/+30
|
* Forgot to add the changes.Florian Frank2010-04-231-0/+4
|
* Merge branch 'rbx-fix'v1.4.0Florian Frank2010-04-2310-88/+41
|\ | | | | | | Supports rubinius now. Avoided depending on MRI internals too much.
| * does compile now, but causes a crashFlorian Frank2010-03-203-21/+32
| |
* | Prepare for version 1.4.0 releaseFlorian Frank2010-04-232-2/+2
| |
* | avoid superflous ifFlorian Frank2010-04-081-3/+3
| |
* | Merged in const_missing triggering from v1.2Florian Frank2010-04-084-7/+15
|\ \ | |/ |/| | | | | | | | | | | Merge commit 'a294a83f4d22901651d09c06063eb20d3b2290b8' Conflicts: VERSION lib/json/version.rb
| * Trigger const_missing mechanism for RailsFlorian Frank2010-04-086-9/+17
| | | | | | | | | | In order to allow Rails' dynamic class loading to work, the const_missing callback must be called.
* | Merge commit 'v1.2.3'Florian Frank2010-03-1310-75/+171
|\ \ | |/ | | | | Merged in some additional features from the v1.2 branch.
| * added [] method to State objectsv1.2.3Florian Frank2010-03-116-5/+34
| |
| * Compatibility to Rubiniusv1.2.2Florian Frank2010-02-278-128/+112
| | | | | | | | Bumped the version number to 1.2.2 and fixed some tests, too.
| * avoid rdoc issue, thx to github user spier.v1.2.1Florian Frank2009-12-071-3/+3
| |
| * serialise symbols in add/coreFlorian Frank2009-12-031-0/+13
| |
| * benchmark symbolized namesFlorian Frank2009-12-031-0/+14
| |
| * implemented symbolize_names feature, #8Florian Frank2009-11-258-97/+154
| |
* | Improved some testsFlorian Frank2010-02-2710-50/+33
| | | | | | | | First stab at Rubinius compatibility
* | avoid rdoc issue, thx to github user spier.Florian Frank2009-12-071-3/+3
| |
* | benchmark symbolize_namesFlorian Frank2009-12-032-0/+28
| |
* | serialise symbols in add/coreFlorian Frank2009-12-031-0/+13
| |
* | deleted lineFlorian Frank2009-11-221-1/+0
| |
* | comment init_copyFlorian Frank2009-11-201-1/+5
| |
* | some more optimizationsFlorian Frank2009-11-204-4/+40
| |
* | use smaller iteration valusFlorian Frank2009-11-204-18/+30
| |
* | implemented prototype featureFlorian Frank2009-11-204-34/+92
| |
* | check circular is deprecatedFlorian Frank2009-11-201-4/+2
| |
* | some more optimisationFlorian Frank2009-11-202-10/+23
| |
* | do not forget to check the versionFlorian Frank2009-11-201-0/+3
| |
* | Merge commit '31132c364e92eb887f7d1c4178f71930a8e35c5d'Florian Frank2009-11-181-2/+2
|\ \ | |/ | | | | | | Conflicts: Rakefile
| * skip the... andFlorian Frank2009-11-181-2/+2
| |
* | bumped version to 2.0.0Florian Frank2009-11-182-2/+2
| |
* | Merge commit 'ed5ba79525c1c957483b3378f1956b58d55faf27'Florian Frank2009-11-181-2/+2
|\ \ | |/ | | | | | | Conflicts: Rakefile
| * added support for mingwFlorian Frank2009-11-181-2/+2
| |
* | Merge commit '35368ebef6f787be793d79d278b8ce44d3889ebb'Florian Frank2009-11-182-9/+9
|\ \ | |/
| * Make json/add/[core|rails].rb respect JSON.create_idSebastian Cohnen2009-11-182-9/+9
| |
| * don't use rubyforge as home any moreFlorian Frank2009-11-081-2/+2
| |
* | don't use rubyforge as home any moreFlorian Frank2009-11-081-2/+2
| |
* | simplified build structure, tweak bs iterationsFlorian Frank2009-11-0712-37/+35
| |
* | some more docu, support inline functions in parserFlorian Frank2009-11-077-269/+307
| |
* | optimise code path for ascii mode, tooFlorian Frank2009-11-071-27/+31
| |
* | use one compilation unit to support inliningFlorian Frank2009-11-076-476/+516
| |
* | avoid copying from buffer ptr to rstring ptrFlorian Frank2009-11-072-0/+42
| |
* | Merge branch 'opti'Florian Frank2009-11-071-34/+40
|\ \