diff options
| -rw-r--r-- | parse.y | 2 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 8 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 11 insertions, 5 deletions
@@ -2462,7 +2462,7 @@ call_args : command | assocs opt_block_arg { /*%%%*/ - $$ = NEW_LIST($1 ? new_hash($1) : 0); + $$ = $1 ? NEW_LIST(new_hash($1)) : 0; $$ = arg_blk_pass($$, $2); /*% $$ = arg_add_assocs(arg_new(), $1); diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 16515bf705..749574f625 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -169,10 +169,16 @@ class TestSyntax < Test::Unit::TestCase end def test_keyword_empty_splat - assert_separately([], <<-'end;') + assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}") + begin; bug10719 = '[ruby-core:67446] [Bug #10719]' assert_valid_syntax("foo(a: 1, **{})", bug10719) end; + assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}") + begin; + bug13756 = '[ruby-core:82113] [Bug #13756]' + assert_valid_syntax("defined? foo(**{})", bug13756) + end; end def test_keyword_self_reference @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.4.2" -#define RUBY_RELEASE_DATE "2017-09-10" -#define RUBY_PATCHLEVEL 196 +#define RUBY_RELEASE_DATE "2017-09-12" +#define RUBY_PATCHLEVEL 197 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" |