summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* v2.3.0v2.3.0NARUSE, Yui2019-12-122-2/+2
|
* Add some more recent jrubyFlorian Frank2019-12-101-0/+2
|
* Make tests green on jrubyFlorian Frank2019-12-103-1/+2
|
* Update travis configFlorian Frank2019-12-101-3/+1
|
* Ignore log filesFlorian Frank2019-12-101-0/+1
|
* Merge pull request #391 from headius/prep_2.3.0Florian Frank2019-12-104-10/+13
|\ | | | | Bump versions for 2.3.0.
| * Bump versions for 2.3.0.Charles Oliver Nutter2019-12-094-10/+13
|/
* Merge pull request #390 from flori/relax-test-unitSHIBATA Hiroshi2019-11-294-8/+8
|\ | | | | relax test-unit version for old ruby
| * relax test-unit version for old rubyHiroshi SHIBATA2019-11-294-8/+8
|/
* Merge branch 'zenspider-zenspider/ruby-2.7'Hiroshi SHIBATA2019-11-296-15/+22
|\
| * Merge branch 'zenspider/ruby-2.7' of https://github.com/zenspider/json into ↵Hiroshi SHIBATA2019-11-296-15/+22
| |\ |/ / | | | | zenspider-zenspider/ruby-2.7
| * Bump to test-unit 3 to get warnings cleaned up.Ryan Davis2019-11-274-13/+10
| | | | | | | | | | | | Immaculate test output! Signed-off-by: Ryan Davis <zenspider@chef.io>
| * Fix warning from trying to access an uninitialized ivar.Ryan Davis2019-11-271-1/+2
| | | | | | | | Signed-off-by: Ryan Davis <zenspider@chef.io>
| * Fix syntax warnings from tests.Ryan Davis2019-11-272-8/+8
| | | | | | | | Signed-off-by: Ryan Davis <zenspider@chef.io>
| * Minor cleanup for ruby 2.7 warnings and failures.Ryan Davis2019-11-274-4/+14
| |
* | Merge pull request #388 from flori/backport-ruby-coreSHIBATA Hiroshi2019-11-298-35/+99
|\ \ | |/ |/| Backport ruby core changes
| * Skip useless testNobuyoshi Nakada2019-11-291-1/+1
| | | | | | | | | | `JSONGeneratorTest#test_remove_const_seg` is meaningful only for the extension library version, but nonsense for pure ruby version.
| * Removed duplicate fileNobuyoshi Nakada2019-11-201-2/+109
| | | | | | | | | | "./tests/test_helper.rb" and "tests/test_helper.rb" in `s.files` are same.
| * Add NaN / Infinity / MinusInfinity to mark listAaron Patterson2019-10-311-0/+5
| | | | | | | | This prevents the constants from moving.
| * ext/json/parser/prereq.mk: Add a "automatically generated" headerYusuke Endoh2019-10-311-1/+1
| | | | | | | | to parser.c.
| * ext/json/parser/parser.rl: Use "signed" char to contain negative valuesYusuke Endoh2019-10-312-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | char is not always signed. In fact, it is unsigned in arm. https://rubyci.org/logs/rubyci.s3.amazonaws.com/scw-9d6766/ruby-master/log/20191004T181708Z.log.html.gz ``` compiling parser.c parser.rl: In function ‘unescape_unicode’: parser.rl:50:5: warning: comparison is always false due to limited range of data type [-Wtype-limits] if (b < 0) return UNI_REPLACEMENT_CHAR; ^ ```
| * Add `GC.compact` again.tenderlove2019-10-312-0/+4
| | | | | | | | | | | | 🙏 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| * ext/json/parser/parser.rl: Update the source code of parser.cYusuke Endoh2019-10-311-1/+8
| | | | | | | | | | | | | | | | | | There have been some direct changes in parser.c which is automatically generated from parser.rl. This updates parser.rl to sync the changes: * 91793b8967e0531bd1159a8ff0cc7e50739c7620 * 79ead821dd4880725c9c6bb9645b3fad71715c5b * 80b5a0ff2a7709367178f29d4ebe1c54122b1c27
| * Suppress uninitialized instance variable warningsNobuyoshi Nakada2019-10-311-1/+1
| |
| * Removed useless `freeze`s from gemspec filesNobuyoshi Nakada2019-10-311-18/+18
| |
| * Drop fossil rubygems supportNobuyoshi Nakada2019-10-311-14/+2
| |
| * Removed binary lineNobuyoshi Nakada2019-10-311-0/+0
| |
| * Fix JSON::Parser against bigdecimal updatesmrkn2019-10-311-2/+2
| | | | | | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| * [flori/json] Fixed unexpected illegal/malformed utf-8 errorNobuyoshi Nakada2019-10-312-1/+16
| | | | | | | | | | | | | | | | flori/json@c34d01ff6a18dac04a90b2e0f820cdb1d5c7e1b2 does not consider US-ASCII compatible but non-UTF-8 encodings, and causes an error in RDoc tests. https://github.com/flori/json/commit/4f471bf590
| * Ignore warnings about ambiguous first argument of regexp with assert match.Hiroshi SHIBATA2019-10-311-3/+3
| |
| * Make rb_scan_args handle keywords more similar to Ruby methods (#2460)Jeremy Evans2019-10-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cfuncs that use rb_scan_args with the : entry suffer similar keyword argument separation issues that Ruby methods suffer if the cfuncs accept optional or variable arguments. This makes the following changes to : handling. * Treats as **kw, prompting keyword argument separation warnings if called with a positional hash. * Do not look for an option hash if empty keywords are provided. For backwards compatibility, treat an empty keyword splat as a empty mandatory positional hash argument, but emit a a warning, as this behavior will be removed in Ruby 3. The argument number check needs to be moved lower so it can correctly handle an empty positional argument being added. * If the last argument is nil and it is necessary to treat it as an option hash in order to make sure all arguments are processed, continue to treat the last argument as the option hash. Emit a warning in this case, as this behavior will be removed in Ruby 3. * If splitting the keyword hash into two hashes, issue a warning, as we will not be splitting hashes in Ruby 3. * If the keyword argument is required to fill a mandatory positional argument, continue to do so, but emit a warning as this behavior will be going away in Ruby 3. * If keyword arguments are provided and the last argument is not a hash, that indicates something wrong. This can happen if a cfunc is calling rb_scan_args multiple times, and providing arguments that were not passed to it from Ruby. Callers need to switch to the new rb_scan_args_kw function, which allows passing of whether keywords were provided. This commit fixes all warnings caused by the changes above. It switches some function calls to *_kw versions with appropriate kw_splat flags. If delegating arguments, RB_PASS_CALLED_KEYWORDS is used. If creating new arguments, RB_PASS_KEYWORDS is used if the last argument is a hash to be treated as keywords. In open_key_args in io.c, use rb_scan_args_kw. In this case, the arguments provided come from another C function, not Ruby. The last argument may or may not be a hash, so we can't set keyword argument mode. However, if it is a hash, we don't want to warn when treating it as keywords. In Ruby files, make sure to appropriately use keyword splats or literal keywords when calling Cfuncs that now issue keyword argument separation warnings through rb_scan_args. Also, make sure not to pass nil in place of an option hash. Work around Kernel#warn warnings due to problems in the Rubygems override of the method. There is an open pull request to fix these issues in Rubygems, but part of the Rubygems tests for their override fail on ruby-head due to rb_scan_args not recognizing empty keyword splats, which this commit fixes. Implementation wise, adding rb_scan_args_kw is kind of a pain, because rb_scan_args takes a variable number of arguments. In order to not duplicate all the code, the function internals need to be split into two functions taking a va_list, and to avoid passing in a ton of arguments, a single struct argument is used to handle the variables previously local to the function.
| * Ignore warnings about ambiguous first argument with the negative integer.Hiroshi SHIBATA2019-10-311-12/+12
| |
| * Remove unused constant.Aaron Patterson2019-10-311-2/+1
| | | | | | | | This constant isn't used, so lets remove it.
| * Look up constant instead of caching in a globalAaron Patterson2019-10-312-6/+40
|/ | | | | The global can go bad if the compactor runs, so we need to look up the constant instead of caching it in a global.
* Merge pull request #381 from olleolleolle/patch-1SHIBATA Hiroshi2019-07-161-1/+0
|\ | | | | Gemspec: Drop EOL'd property rubyforge_project
| * Gemspec: Drop EOL'd property rubyforge_projectOlle Jonsson2019-07-141-1/+0
|/
* Recreate gemspecsFlorian Frank2019-07-132-2/+2
|
* Merge pull request #367 from sho-h/add-ascii_only-documentFlorian Frank2019-07-131-0/+2
|\ | | | | Add ascii_only option to JSON::Ext::Generator::State.new.
| * Add ascii_only option to JSON::Ext::Generator::State.new.Sho Hashimoto2019-01-081-0/+2
| |
* | Merge pull request #378 from olleolleolle/patch-1SHIBATA Hiroshi2019-07-131-1/+1
|\ \ | | | | | | Remove RubyForge homepage reference
| * | Remove RubyForge homepage referenceOlle Jonsson2019-05-111-1/+1
|/ / | | | | | | | | This shows up in the RubyGems.org linkset. This sets it to the same as the other gemspec files.
* | Use newest rubygemsFlorian Frank2019-04-292-2/+2
| |
* | Pass args all #to_json in json/add/*.Sho Hashimoto2019-04-294-8/+8
| |
* | Add LICENSE fileFlorian Frank2019-04-291-0/+56
| |
* | Merge branch 'master' of github.com:flori/jsonFlorian Frank2019-04-2918-4335/+186
|\ \
| * \ Merge pull request #376 from olleolleolle/patch-1SHIBATA Hiroshi2019-03-041-1/+1
| |\ \ | | | | | | | | README: Docs at rubydoc.info, not on rubyforge
| | * | README: Docs at rubydoc.info, not on rubyforgeOlle Jonsson2019-03-031-1/+1
| |/ / | | | | | | - [ci skip]
| * | Merge branch 'master' of github.com:flori/jsonv2.2.0Florian Frank2019-02-211-1/+1
| |\ \
| | * \ Merge pull request #366 from sho-h/fix-ascii_only-documentFlorian Frank2019-02-211-1/+1
| | |\ \ | | | | | | | | | | fix JSON::Generator::State#ascii_only? document same as lib/json/pure/generator.rb.
| | | * | fix JSON::Generator::State#ascii_only? document same as ↵Sho Hashimoto2019-01-081-1/+1
| | | |/ | | | | | | | | | | | | lib/json/pure/generator.rb.