summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-30 15:29:28 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-30 15:29:28 +0000
commit0eded3c0c3f22e28842be23bdebb8eda92401e8a (patch)
tree584cb451a51a80806fde5140d18fe3cf53fae6ea /parse.y
parent85f3339697f48cdc292374d3ae6b079d67c22274 (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
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y4
1 files changed, 2 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index 577dc37d83..277998ce15 100644
--- a/parse.y
+++ b/parse.y
@@ -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, $$);
}