diff options
| -rw-r--r-- | parse.y | 4 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 5 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1673,7 +1673,7 @@ command : fcall command_args %prec tLOWEST /*%%%*/ $$ = $1; $$->nd_args = $2; - nd_set_last_loc($1, nd_last_loc($2)); + nd_set_last_loc($1, @2.last_loc); /*% $$ = dispatch2(command, $1, $2); %*/ @@ -1686,7 +1686,7 @@ command : fcall command_args %prec tLOWEST fixpos($$, $1); /*%%%*/ $$->nd_loc = @$; - nd_set_last_loc($1, nd_last_loc($2)); + nd_set_last_loc($1, @2.last_loc); /*% %*/ } diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 6d8d8f5f32..7e25d965df 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -179,6 +179,11 @@ class TestSyntax < Test::Unit::TestCase bug13756 = '[ruby-core:82113] [Bug #13756]' assert_valid_syntax("defined? foo(**{})", bug13756) end; + assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}") + begin; + bug15271 = '[ruby-core:89648] [Bug #15271]' + assert_valid_syntax("a **{}", bug15271) + end; end def test_keyword_self_reference @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.5.4" #define RUBY_RELEASE_DATE "2018-11-07" -#define RUBY_PATCHLEVEL 109 +#define RUBY_PATCHLEVEL 110 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 11 |