summaryrefslogtreecommitdiff
path: root/ext
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trunk' of https://github.com/nobu/json into nobu-trunkFlorian Frank2016-06-073-133/+175
|\
| * Optional hash in rb_scan_argsNobuyoshi Nakada2016-04-242-8/+24
| | | | | | | | | | Use ':' in rb_scan_args to get optional hash, which available since ruby 2.1.
| * Exception encodingNobuyoshi Nakada2016-04-243-83/+129
| | | | | | | | Raise with messages in UTF-8 encoding.
| * Use rb_encodingNobuyoshi Nakada2016-04-242-103/+75
| | | | | | | | Use rb_encoding functions to convert encodings.
| * Remove unnecessary conversionNobuyoshi Nakada2016-04-242-10/+8
| | | | | | | | StringValue does the conversion.
| * Use enumNobuyoshi Nakada2016-04-241-28/+28
| | | | | | | | | | Use `enum` instead of `static const int` to get rid of unused-const-variable warnings.
* | Force ASCII 8bit to be UTF-8 and hope for the bestFlorian Frank2016-06-032-85/+93
| |
* | Remove quirks modeFlorian Frank2016-06-022-34/+1
|/
* Merge branch 'v1.8'Florian Frank2016-02-251-1/+1
|\
| * Avoid system stack errorFlorian Frank2016-02-251-1/+1
| |
* | Disallow usage of symbolize_names and create_additionsFlorian Frank2015-06-152-12/+24
| |
* | Ext parser is green now as wellFlorian Frank2015-06-154-435/+228
| |
* | Remove byte sniffing from Ext::ParserFlorian Frank2015-06-132-127/+57
| |
* | Remove generate restriction for […]/{…}Florian Frank2015-06-131-18/+0
|/
* generator.c: allocate structs with wrappernobu2015-05-282-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 wrappernobu2015-05-283-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 Hiroshi2015-02-125-39/+54
|
* sync trunk again: fixed regression of r49027SHIBATA Hiroshi2015-02-122-9/+9
|
* Use space_before as documented in the generatorMichael Mac-Vicar2015-01-091-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 rubiesFlorian Frank2015-01-025-1/+19
|
* Merge branch 'ruby-2.2' of https://github.com/zzak/json into zzak-ruby-2.2Florian Frank2015-01-029-45/+102
|\ | | | | | | | | | | | | Conflicts: .travis.yml json.gemspec json_pure.gemspec
| * RUBY_TYPED_FREE_IMMEDIATELY isn't always availableZachary Scott2014-12-273-33/+39
| |
| * Use ALLOC and MEMZERO instead of ZALLOCZachary Scott2014-12-261-1/+2
| |
| * Revert part of "Sync with trunk"Zachary Scott2014-12-263-49/+0
| | | | | | | | This partially reverts commit 18b3000.
| * Add extconf from trunkZachary Scott2014-12-251-0/+3
| |
| * This file shouldn't be committedZachary Scott2014-12-251-280/+0
| |
| * bundle exec rakeZachary Scott2014-12-251-0/+280
| | | | | | | | generates new specs and makefile for compiling the CEXT
| * Sync with trunkZachary Scott2014-12-2511-94/+190
| |
| * - Pass over generator.c for grammar fixes.Vipul A M2014-07-034-13/+13
| | | | | | | | - Typo fixes across json ext
| * Change documentation to reflect new default valueFlorian Frank2014-04-011-1/+1
| |
* | Fix documentation wordingFlorian Frank2014-07-034-14/+14
|/
* Suppress warning: -Wchar-subscriptsNARUSE, Yui2013-05-081-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, Yui2013-02-221-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_hFlorian Frank2013-02-211-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.7Florian Frank2013-02-112-2/+2
|
* Remove useless assert, fbuffer_alloc cares alreadyFlorian Frank2013-02-042-7/+2
|
* Increase hash likeness of State objectsFlorian Frank2012-12-312-1/+44
|
* Remove unnecessary GET_STATE(self) to avoid an unused-but-set-variable ↵Shugo Maeda2012-12-131-1/+0
| | | | warning in gcc 4.6.
* Use len for return valuesFlorian Frank2012-11-291-10/+10
|\
| * fix some bugs in the C versions of State::configure and add the alias in the ↵John Shahid2012-11-231-5/+5
|/ | | | Java version.
* Change actual rl filessferik-max_nestingFlorian Frank2012-10-071-3/+3
|
* Increase default max_nesting to 100Erik Michaels-Ober2012-10-052-5/+5
| | | | See discussion at https://github.com/intridea/multi_json/pull/59.
* Avoid silly compiler warningFlorian Frank2012-08-171-1/+1
|
* Move ruby macros into fbuffer.hFlorian Frank2012-08-172-21/+21
|
* Fixes #142 to avoid compilation error on AIXFlorian Frank2012-07-251-1/+1
|
* Fix parser dependenciesnobu-masterFlorian Frank2012-05-071-1/+1
|
* comment-out unused functionsNobuyoshi Nakada2012-05-072-0/+9
|
* add depend filesNobuyoshi Nakada2012-05-072-0/+2
|
* Throw exception unless source is a stringFlorian Frank2012-04-272-17/+19
|
* Add a comment mentioning some limitiationFlorian Frank2012-04-271-0/+5
|
View Lorry Controller Status