summaryrefslogtreecommitdiff
path: root/ext
Commit message (Collapse)AuthorAgeFilesLines
* keep track of depth correctlyFlorian Frank2010-08-181-2/+2
|
* do not forget to dup the stateFlorian Frank2010-08-071-2/+3
| | | | use state for depth checking in pure as well
* mange depth in stateFlorian Frank2010-08-072-59/+117
|
* cleaned up code a bitFlorian Frank2010-08-061-12/+6
|
* Revert "use method dispatch for generation again"Florian Frank2010-08-052-252/+245
| | | | | | | | This reverts commit 59eab2b7ad1b44dc424fb3fffa5520947f7360f3. Conflicts: ext/json/ext/generator/generator.c
* Revert "use method dispatch for generation again"Florian Frank2010-08-051-1/+1
| | | | This reverts commit f0a14faf1d59a5ea86a79d3a5780e8433bfc9e16.
* use method dispatch for generation againFlorian Frank2010-08-031-1/+1
|
* use rb_funcall for dupingFlorian Frank2010-08-031-3/+4
| | | | rbx doesn't support rb_obj_dup :-(
* Merge branch 'master' of github.com:/flori/jsonFlorian Frank2010-08-032-3/+8
|\
| * Zero out the generator struct to avoid GC problemsJake Douglas2010-08-031-0/+1
| |
| * Fix header conflict problem with OSX's ruby.frameworkEvan Phoenix2010-08-031-2/+6
| | | | | | | | | | Only look for ruby/re.h if compiling under 1.9, otherwise OS X stupidly picks up ruby/re.h from the ruby.framework, which conflicts.
| * fix tha use of REALLOC_N.NARUSE, Yui2010-05-091-1/+1
| | | | | | | | | | From Ruby r27694 [ruby-dev:41227]. This caused build failure with SunStudio on sparc Solaris.
* | use method dispatch for generation againFlorian Frank2010-07-242-188/+261
|/
* Fix for subclassed core classes, github issue 20v1.4.3Florian Frank2010-05-051-135/+117
| | | | | Fixed a problem in the 1.4.x versions, that caused subclasses of core classes to miss calling their to_json methods.
* Revert "simplified build structure"v1.4.2Joshua Peek2010-04-287-2/+2
| | | | This reverts 76e017a1b8a042bcb682b68821cc33f29788cd9a commit.
* 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.
* 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-252-7/+7
|
* Merge branch 'rbx-fix'v1.4.0Florian Frank2010-04-236-74/+27
|\ | | | | | | Supports rubinius now. Avoided depending on MRI internals too much.
| * does compile now, but causes a crashFlorian Frank2010-03-203-21/+32
| |
* | Merged in const_missing triggering from v1.2Florian Frank2010-04-082-4/+6
|\ \ | |/ |/| | | | | | | | | | | Merge commit 'a294a83f4d22901651d09c06063eb20d3b2290b8' Conflicts: VERSION lib/json/version.rb
| * Trigger const_missing mechanism for RailsFlorian Frank2010-04-082-4/+6
| | | | | | | | | | 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-134-73/+141
|\ \ | |/ | | | | Merged in some additional features from the v1.2 branch.
| * added [] method to State objectsv1.2.3Florian Frank2010-03-111-1/+20
| |
| * Compatibility to Rubiniusv1.2.2Florian Frank2010-02-273-113/+98
| | | | | | | | Bumped the version number to 1.2.2 and fixed some tests, too.
| * implemented symbolize_names feature, #8Florian Frank2009-11-252-94/+132
| |
* | Improved some testsFlorian Frank2010-02-277-38/+19
| | | | | | | | First stab at Rubinius compatibility
* | deleted lineFlorian Frank2009-11-221-1/+0
| |
* | comment init_copyFlorian Frank2009-11-201-1/+5
| |
* | some more optimizationsFlorian Frank2009-11-204-4/+40
| |
* | implemented prototype featureFlorian Frank2009-11-202-8/+50
| |
* | some more optimisationFlorian Frank2009-11-202-10/+23
| |
* | do not forget to check the versionFlorian Frank2009-11-201-0/+3
| |
* | simplified build structure, tweak bs iterationsFlorian Frank2009-11-077-0/+0
| |
* | 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
|\ \
| * | optimise execution pathFlorian Frank2009-11-071-34/+40
| | |
| * | avoid warningFlorian Frank2009-11-072-92/+98
| | |
| * | make inc function static, optimised a bitFlorian Frank2009-11-073-8/+9
| | |
| * | prebuild delimitersFlorian Frank2009-11-073-40/+58
| | |
* | | avoid warningFlorian Frank2009-11-062-92/+98
| | |
* | | make inc function static, optimised a bitFlorian Frank2009-11-063-8/+9
| | |
* | | prebuild delimitersFlorian Frank2009-11-053-40/+58
| | |
* | | avoid copying from buffer ptr to rstring ptrFlorian Frank2009-11-053-5/+25
|/ /
* | optimised a bit moreFlorian Frank2009-11-052-16/+15
| |
* | added docu, some methods renamedFlorian Frank2009-11-053-9/+12
| |
View Lorry Controller Status