diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-30 15:29:28 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-30 15:29:28 +0000 |
commit | 0eded3c0c3f22e28842be23bdebb8eda92401e8a (patch) | |
tree | 584cb451a51a80806fde5140d18fe3cf53fae6ea | |
parent | 85f3339697f48cdc292374d3ae6b079d67c22274 (diff) |
merge revision(s) r49964: [Backport #10957]
* parse.y (primary): empty parentheses at cmdarg can be null.
[ruby-core:68477] [Bug #10957]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 4 | ||||
-rw-r--r-- | test/ruby/test_syntax.rb | 6 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Tue Mar 31 00:18:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (primary): empty parentheses at cmdarg can be null. + [ruby-core:68477] [Bug #10957] + Mon Mar 30 23:30:57 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/io/console/console.c (console_dev): id_console is not a @@ -2046,7 +2046,7 @@ arg : lhs '=' arg value_expr($1); value_expr($3); $$ = NEW_DOT2($1, $3); - if (nd_type($1) == NODE_LIT && FIXNUM_P($1->nd_lit) && + if ($1 && nd_type($1) == NODE_LIT && FIXNUM_P($1->nd_lit) && nd_type($3) == NODE_LIT && FIXNUM_P($3->nd_lit)) { deferred_nodes = list_append(deferred_nodes, $$); } @@ -2060,7 +2060,7 @@ arg : lhs '=' arg value_expr($1); value_expr($3); $$ = NEW_DOT3($1, $3); - if (nd_type($1) == NODE_LIT && FIXNUM_P($1->nd_lit) && + if ($1 && nd_type($1) == NODE_LIT && FIXNUM_P($1->nd_lit) && nd_type($3) == NODE_LIT && FIXNUM_P($3->nd_lit)) { deferred_nodes = list_append(deferred_nodes, $$); } diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 2ed57889ba..c94a8c68e1 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -408,6 +408,12 @@ eom assert_syntax_error(code, /def n "\u{2208}"; end/, bug10114) end + def test_null_range_cmdarg + bug10957 = '[ruby-core:68477] [Bug #10957]' + assert_ruby_status(['-c', '-e', 'p ()..0'], "", bug10957) + assert_ruby_status(['-c', '-e', 'p ()...0'], "", bug10957) + end + private def not_label(x) @result = x; @not_label ||= nil end @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.5" -#define RUBY_RELEASE_DATE "2015-03-30" -#define RUBY_PATCHLEVEL 323 +#define RUBY_RELEASE_DATE "2015-03-31" +#define RUBY_PATCHLEVEL 324 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 30 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" |