kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 11963da9e8: [Backport #16603] [Backport #17141]

Browse source 
Check type of empty keyword [Bug #16603]

	Co-authored-by: Yusuke Endoh <mame@ruby-lang.org>
This commit is contained in:
nagachika 2020-09-06 10:54:53 +09:00
parent 9a1f0240ca
commit e778de2c82
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compile.c
View file

@ -4241,7 +4241,7 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popp
FLUSH_CHUNK();
const NODE *kw = node->nd_next->nd_head;
int empty_kw = nd_type(kw) == NODE_LIT; /* foo( ..., **{}, ...) */
int empty_kw = nd_type(kw) == NODE_LIT && RB_TYPE_P(kw->nd_lit, T_HASH); /* foo( ..., **{}, ...) */
int first_kw = first_chunk && stack_len == 0; /* foo(1,2,3, **kw, ...) */
int last_kw = !node->nd_next->nd_next; /* foo( ..., **kw) */
int only_kw = last_kw && first_kw; /* foo(1,2,3, **kw) */

6
test/ruby/test_keyword.rb
View file

@ -5052,6 +5052,12 @@ class TestKeywordArgumentsSymProcRefinements < Test::Unit::TestCase
end
end
def test_splat_fixnum
bug16603 = '[ruby-core:97047] [Bug #16603]'
assert_raise(TypeError, bug16603) { p(**42) }
assert_raise(TypeError, bug16603) { p(k:1, **42) }
end
def test_ruby2_keywords_hash_empty_kw_splat
def self.foo(*a) a.last end
singleton_class.send(:ruby2_keywords, :foo)

4
version.h
View file

@ -2,11 +2,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 119
#define RUBY_PATCHLEVEL 120
#define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 9
#define RUBY_RELEASE_DAY 5
#define RUBY_RELEASE_DAY 6
#include "ruby/version.h"