зеркало из https://github.com/github/ruby.git
parse.y: empty paren
* 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/trunk@49964 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
a747d4a8e4
Коммит
2456df7584
|
@ -1,3 +1,8 @@
|
||||||
|
Sat Mar 14 02:14:50 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* parse.y (primary): empty parentheses at cmdarg can be null.
|
||||||
|
[ruby-core:68477] [Bug #10957]
|
||||||
|
|
||||||
Fri Mar 13 15:04:36 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Fri Mar 13 15:04:36 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* ext/stringio/stringio.c (strio_close): don't raise on dobule
|
* ext/stringio/stringio.c (strio_close): don't raise on dobule
|
||||||
|
|
4
parse.y
4
parse.y
|
@ -2102,7 +2102,7 @@ arg : lhs '=' arg
|
||||||
value_expr($1);
|
value_expr($1);
|
||||||
value_expr($3);
|
value_expr($3);
|
||||||
$$ = NEW_DOT2($1, $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)) {
|
nd_type($3) == NODE_LIT && FIXNUM_P($3->nd_lit)) {
|
||||||
deferred_nodes = list_append(deferred_nodes, $$);
|
deferred_nodes = list_append(deferred_nodes, $$);
|
||||||
}
|
}
|
||||||
|
@ -2116,7 +2116,7 @@ arg : lhs '=' arg
|
||||||
value_expr($1);
|
value_expr($1);
|
||||||
value_expr($3);
|
value_expr($3);
|
||||||
$$ = NEW_DOT3($1, $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)) {
|
nd_type($3) == NODE_LIT && FIXNUM_P($3->nd_lit)) {
|
||||||
deferred_nodes = list_append(deferred_nodes, $$);
|
deferred_nodes = list_append(deferred_nodes, $$);
|
||||||
}
|
}
|
||||||
|
|
|
@ -557,6 +557,12 @@ eom
|
||||||
assert_syntax_error(src, /formal argument/, bug10545)
|
assert_syntax_error(src, /formal argument/, bug10545)
|
||||||
end
|
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
|
private
|
||||||
|
|
||||||
def not_label(x) @result = x; @not_label ||= nil end
|
def not_label(x) @result = x; @not_label ||= nil end
|
||||||
|
|
Загрузка…
Ссылка в новой задаче