Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | * ext/json/generator/ext/generator.c (fbuffer_free): unused. | nobu | 2011-07-07 | 1 | -5/+0 | |
| | | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | |||||
* | Alias State#configure method as State#merge | Florian Frank | 2011-06-20 | 1 | -0/+1 | |
| | | | | This increases duck type synonymy with Hash | |||||
* | clean up superflous tabs | Florian Frank | 2011-06-15 | 5 | -30/+30 | |
| | ||||||
* | Merge branch 'master' of gate.dyna.ping.de:/git/json | Florian Frank | 2011-06-09 | 2 | -30/+42 | |
|\ | ||||||
| * | Don't optimize calls for ducktypes | Florian Frank | 2011-05-12 | 2 | -30/+42 | |
| | | ||||||
* | | Apply patch by Cory Monty <cory.monty@gmail.com>. | Florian Frank | 2011-06-09 | 1 | -0/+1 | |
|/ | ||||||
* | If a custom :object_class is given, the C extension should not use ↵ | Jon Leighton | 2011-05-11 | 2 | -70/+78 | |
| | | | | rb_hash_aset - it should call the object's []= method instead. | |||||
* | renamed :match argument to :match_stringv1.5.0 | Florian Frank | 2011-01-05 | 3 | -19/+21 | |
| | ||||||
* | query if ruby/st.h exists | Florian Frank | 2011-01-02 | 2 | -0/+5 | |
| | ||||||
* | implement string matching for java parser | Florian Frank | 2011-01-02 | 2 | -79/+59 | |
| | ||||||
* | Added matching in pure/ext parser | Florian Frank | 2011-01-02 | 3 | -46/+135 | |
| | ||||||
* | started to build jruby extension with Rakefile | Florian Frank | 2010-09-23 | 1 | -68/+68 | |
| | ||||||
* | use long instead of int | Florian Frank | 2010-09-17 | 2 | -27/+27 | |
| | ||||||
* | keep track of depth correctly | Florian Frank | 2010-08-18 | 1 | -2/+2 | |
| | ||||||
* | do not forget to dup the state | Florian Frank | 2010-08-07 | 1 | -2/+3 | |
| | | | | use state for depth checking in pure as well | |||||
* | mange depth in state | Florian Frank | 2010-08-07 | 2 | -59/+117 | |
| | ||||||
* | cleaned up code a bit | Florian Frank | 2010-08-06 | 1 | -12/+6 | |
| | ||||||
* | Revert "use method dispatch for generation again" | Florian Frank | 2010-08-05 | 2 | -252/+245 | |
| | | | | | | | | This reverts commit 59eab2b7ad1b44dc424fb3fffa5520947f7360f3. Conflicts: ext/json/ext/generator/generator.c | |||||
* | Revert "use method dispatch for generation again" | Florian Frank | 2010-08-05 | 1 | -1/+1 | |
| | | | | This reverts commit f0a14faf1d59a5ea86a79d3a5780e8433bfc9e16. | |||||
* | use method dispatch for generation again | Florian Frank | 2010-08-03 | 1 | -1/+1 | |
| | ||||||
* | use rb_funcall for duping | Florian Frank | 2010-08-03 | 1 | -3/+4 | |
| | | | | rbx doesn't support rb_obj_dup :-( | |||||
* | Merge branch 'master' of github.com:/flori/json | Florian Frank | 2010-08-03 | 2 | -3/+8 | |
|\ | ||||||
| * | Zero out the generator struct to avoid GC problems | Jake Douglas | 2010-08-03 | 1 | -0/+1 | |
| | | ||||||
| * | Fix header conflict problem with OSX's ruby.framework | Evan Phoenix | 2010-08-03 | 1 | -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, Yui | 2010-05-09 | 1 | -1/+1 | |
| | | | | | | | | | | From Ruby r27694 [ruby-dev:41227]. This caused build failure with SunStudio on sparc Solaris. | |||||
* | | use method dispatch for generation again | Florian Frank | 2010-07-24 | 2 | -188/+261 | |
|/ | ||||||
* | Fix for subclassed core classes, github issue 20v1.4.3 | Florian Frank | 2010-05-05 | 1 | -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.2 | Joshua Peek | 2010-04-28 | 7 | -2/+2 | |
| | | | | This reverts 76e017a1b8a042bcb682b68821cc33f29788cd9a commit. | |||||
* | Free the buffer content as well. | Florian Frank | 2010-04-28 | 1 | -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, Yui | 2010-04-26 | 1 | -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, Yui | 2010-04-26 | 3 | -11/+20 | |
| | | | | ISO C90 forbids mixed declarations and code, and this breaks VC++. | |||||
* | Fixed T_FIXNUM bug on 64bit architectures.v1.4.1 | Florian Frank | 2010-04-25 | 2 | -7/+7 | |
| | ||||||
* | Merge branch 'rbx-fix'v1.4.0 | Florian Frank | 2010-04-23 | 6 | -74/+27 | |
|\ | | | | | | | Supports rubinius now. Avoided depending on MRI internals too much. | |||||
| * | does compile now, but causes a crash | Florian Frank | 2010-03-20 | 3 | -21/+32 | |
| | | ||||||
* | | Merged in const_missing triggering from v1.2 | Florian Frank | 2010-04-08 | 2 | -4/+6 | |
|\ \ | |/ |/| | | | | | | | | | | | Merge commit 'a294a83f4d22901651d09c06063eb20d3b2290b8' Conflicts: VERSION lib/json/version.rb | |||||
| * | Trigger const_missing mechanism for Rails | Florian Frank | 2010-04-08 | 2 | -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 Frank | 2010-03-13 | 4 | -73/+141 | |
|\ \ | |/ | | | | | Merged in some additional features from the v1.2 branch. | |||||
| * | added [] method to State objectsv1.2.3 | Florian Frank | 2010-03-11 | 1 | -1/+20 | |
| | | ||||||
| * | Compatibility to Rubiniusv1.2.2 | Florian Frank | 2010-02-27 | 3 | -113/+98 | |
| | | | | | | | | Bumped the version number to 1.2.2 and fixed some tests, too. | |||||
| * | implemented symbolize_names feature, #8 | Florian Frank | 2009-11-25 | 2 | -94/+132 | |
| | | ||||||
* | | Improved some tests | Florian Frank | 2010-02-27 | 7 | -38/+19 | |
| | | | | | | | | First stab at Rubinius compatibility | |||||
* | | deleted line | Florian Frank | 2009-11-22 | 1 | -1/+0 | |
| | | ||||||
* | | comment init_copy | Florian Frank | 2009-11-20 | 1 | -1/+5 | |
| | | ||||||
* | | some more optimizations | Florian Frank | 2009-11-20 | 4 | -4/+40 | |
| | | ||||||
* | | implemented prototype feature | Florian Frank | 2009-11-20 | 2 | -8/+50 | |
| | | ||||||
* | | some more optimisation | Florian Frank | 2009-11-20 | 2 | -10/+23 | |
| | | ||||||
* | | do not forget to check the version | Florian Frank | 2009-11-20 | 1 | -0/+3 | |
| | | ||||||
* | | simplified build structure, tweak bs iterations | Florian Frank | 2009-11-07 | 7 | -0/+0 | |
| | | ||||||
* | | some more docu, support inline functions in parser | Florian Frank | 2009-11-07 | 7 | -269/+307 | |
| | | ||||||
* | | optimise code path for ascii mode, too | Florian Frank | 2009-11-07 | 1 | -27/+31 | |
| | |