Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v1.8' | Florian Frank | 2016-02-25 | 1 | -1/+1 |
|\ | |||||
| * | Avoid system stack error | Florian Frank | 2016-02-25 | 1 | -1/+1 |
| | | |||||
* | | Disallow usage of symbolize_names and create_additions | Florian Frank | 2015-06-15 | 2 | -12/+24 |
| | | |||||
* | | Ext parser is green now as well | Florian Frank | 2015-06-15 | 4 | -435/+228 |
| | | |||||
* | | Remove byte sniffing from Ext::Parser | Florian Frank | 2015-06-13 | 2 | -127/+57 |
| | | |||||
* | | Remove generate restriction for […]/{…} | Florian Frank | 2015-06-13 | 1 | -18/+0 |
|/ | |||||
* | generator.c: allocate structs with wrapper | nobu | 2015-05-28 | 2 | -11/+5 |
| | | | | | | | | * ext/json/ext/generator/generator.c (cState_s_allocate): allocate structs with making new wrapper objects and get rid of potential memory leak. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | ||||
* | parser.rl: allocate structs with wrapper | nobu | 2015-05-28 | 3 | -23/+10 |
| | | | | | | | | * ext/json/ext/parser/parser.rl (cJSON_parser_s_allocate): allocate structs with making new wrapper objects and get rid of potential memory leak. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | ||||
* | use ZALLOC if it can be used, and defined ZALLOC macro. | SHIBATA Hiroshi | 2015-02-12 | 5 | -39/+54 |
| | |||||
* | sync trunk again: fixed regression of r49027 | SHIBATA Hiroshi | 2015-02-12 | 2 | -9/+9 |
| | |||||
* | Use space_before as documented in the generator | Michael Mac-Vicar | 2015-01-09 | 1 | -0/+1 |
| | | | | | This option was already documented but not implemented, allows setting the separator used before the ":" during generation. | ||||
* | Fall back to Data_* wrappers on ancient rubies | Florian Frank | 2015-01-02 | 5 | -1/+19 |
| | |||||
* | Merge branch 'ruby-2.2' of https://github.com/zzak/json into zzak-ruby-2.2 | Florian Frank | 2015-01-02 | 9 | -45/+102 |
|\ | | | | | | | | | | | | | Conflicts: .travis.yml json.gemspec json_pure.gemspec | ||||
| * | RUBY_TYPED_FREE_IMMEDIATELY isn't always available | Zachary Scott | 2014-12-27 | 3 | -33/+39 |
| | | |||||
| * | Use ALLOC and MEMZERO instead of ZALLOC | Zachary Scott | 2014-12-26 | 1 | -1/+2 |
| | | |||||
| * | Revert part of "Sync with trunk" | Zachary Scott | 2014-12-26 | 3 | -49/+0 |
| | | | | | | | | This partially reverts commit 18b3000. | ||||
| * | Add extconf from trunk | Zachary Scott | 2014-12-25 | 1 | -0/+3 |
| | | |||||
| * | This file shouldn't be committed | Zachary Scott | 2014-12-25 | 1 | -280/+0 |
| | | |||||
| * | bundle exec rake | Zachary Scott | 2014-12-25 | 1 | -0/+280 |
| | | | | | | | | generates new specs and makefile for compiling the CEXT | ||||
| * | Sync with trunk | Zachary Scott | 2014-12-25 | 11 | -94/+190 |
| | | |||||
| * | - Pass over generator.c for grammar fixes. | Vipul A M | 2014-07-03 | 4 | -13/+13 |
| | | | | | | | | - Typo fixes across json ext | ||||
| * | Change documentation to reflect new default value | Florian Frank | 2014-04-01 | 1 | -1/+1 |
| | | |||||
* | | Fix documentation wording | Florian Frank | 2014-07-03 | 4 | -14/+14 |
|/ | |||||
* | Suppress warning: -Wchar-subscripts | NARUSE, Yui | 2013-05-08 | 1 | -2/+2 |
| | | | | | | On some platforms char is signed char and giving signed char to isspace(int c) can cause unexpected behavior. To avoid such situation, it should cast as unsigned char. | ||||
* | Validate UTF-8 strings. | NARUSE, Yui | 2013-02-22 | 1 | -1/+12 |
| | | | | | Raise JSON::GeneratorError on converting Ruby UTF-8 string to JSON as to JSON ASCII does. | ||||
* | Try to convert first with to_hash, then to_h | Florian Frank | 2013-02-21 | 1 | -4/+1 |
| | | | | | | | | rb_convert_type doesn't return if conversion fails, so use rb_check_convert_type and the raise vi rb_convert_type. Make sure, that this behaviour is consisten across all generator implementations. Fixes https://github.com/flori/json/issues/162 | ||||
* | Security fix create_additons/JSON::GenericObjectv1.7.7 | Florian Frank | 2013-02-11 | 2 | -2/+2 |
| | |||||
* | Remove useless assert, fbuffer_alloc cares already | Florian Frank | 2013-02-04 | 2 | -7/+2 |
| | |||||
* | Increase hash likeness of State objects | Florian Frank | 2012-12-31 | 2 | -1/+44 |
| | |||||
* | Remove unnecessary GET_STATE(self) to avoid an unused-but-set-variable ↵ | Shugo Maeda | 2012-12-13 | 1 | -1/+0 |
| | | | | warning in gcc 4.6. | ||||
* | Use len for return values | Florian Frank | 2012-11-29 | 1 | -10/+10 |
|\ | |||||
| * | fix some bugs in the C versions of State::configure and add the alias in the ↵ | John Shahid | 2012-11-23 | 1 | -5/+5 |
|/ | | | | Java version. | ||||
* | Change actual rl filessferik-max_nesting | Florian Frank | 2012-10-07 | 1 | -3/+3 |
| | |||||
* | Increase default max_nesting to 100 | Erik Michaels-Ober | 2012-10-05 | 2 | -5/+5 |
| | | | | See discussion at https://github.com/intridea/multi_json/pull/59. | ||||
* | Avoid silly compiler warning | Florian Frank | 2012-08-17 | 1 | -1/+1 |
| | |||||
* | Move ruby macros into fbuffer.h | Florian Frank | 2012-08-17 | 2 | -21/+21 |
| | |||||
* | Fixes #142 to avoid compilation error on AIX | Florian Frank | 2012-07-25 | 1 | -1/+1 |
| | |||||
* | Fix parser dependenciesnobu-master | Florian Frank | 2012-05-07 | 1 | -1/+1 |
| | |||||
* | comment-out unused functions | Nobuyoshi Nakada | 2012-05-07 | 2 | -0/+9 |
| | |||||
* | add depend files | Nobuyoshi Nakada | 2012-05-07 | 2 | -0/+2 |
| | |||||
* | Throw exception unless source is a string | Florian Frank | 2012-04-27 | 2 | -17/+19 |
| | |||||
* | Add a comment mentioning some limitiation | Florian Frank | 2012-04-27 | 1 | -0/+5 |
| | |||||
* | remove unused variable | Florian Frank | 2012-04-18 | 1 | -1/+1 |
| | |||||
* | Fix the fix | Florian Frank | 2012-04-18 | 1 | -21/+6 |
| | |||||
* | Use C implementation and better regexp for pure | Florian Frank | 2012-03-20 | 2 | -8/+28 |
| | |||||
* | The behavior of reference to inner defined variable is undefined. | NARUSE, Yui | 2012-01-15 | 2 | -2/+2 |
| | | | | | https://bugs.ruby-lang.org/issues/5888 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51862 | ||||
* | Support duck typed ruby array in JRuby as well | Florian Frank | 2011-12-20 | 1 | -5/+5 |
| | |||||
* | Support hash ducktype objects on JRuby as well | Florian Frank | 2011-12-20 | 1 | -5/+5 |
| | |||||
* | Support object class with duck type hash | Florian Frank | 2011-12-20 | 4 | -79/+91 |
| | |||||
* | Move fbuffer in its own directory | Florian Frank | 2011-11-28 | 4 | -3/+3 |
| |