diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-10 10:27:59 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-10 10:27:59 +0000 |
commit | 78c8ac46fdec9a92abb4796dbb9db60fce04429a (patch) | |
tree | b14376d6d86199de24d5996e3965156132dd6fb7 | |
parent | c7754f58f4b5a5bfb99c57433ec5029495f89198 (diff) |
merge revision(s) 59644: [Backport #13836]
parse.y: primary should not be 0
* parse.y (primary): should not be 0, since it can be a receiver.
[ruby-core:82447] [Bug #13836]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | parse.y | 2 | ||||
-rw-r--r-- | test/ruby/test_defined.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -2657,7 +2657,7 @@ primary : literal | tLPAREN_ARG {SET_LEX_STATE(EXPR_ENDARG);} rparen { /*%%%*/ - $$ = 0; + $$ = NEW_BEGIN(0); /*% $$ = dispatch1(paren, 0); %*/ diff --git a/test/ruby/test_defined.rb b/test/ruby/test_defined.rb index de7ba9cc14..54f461ff03 100644 --- a/test/ruby/test_defined.rb +++ b/test/ruby/test_defined.rb @@ -99,6 +99,10 @@ class TestDefined < Test::Unit::TestCase end end + def test_defined_empty_paren_arg + assert_nil(defined?(p () + 1)) + end + def test_defined_impl_specific feature7035 = '[ruby-core:47558]' # not spec assert_predicate(defined?(Foo), :frozen?, feature7035) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.2" #define RUBY_RELEASE_DATE "2017-09-10" -#define RUBY_PATCHLEVEL 193 +#define RUBY_PATCHLEVEL 194 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 9 |