kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

parse.y: optional arguments in rhs

Browse source 
* parse.y (f_arg_asgn): define optional arguments as argument
  variables in the rhs default expressions.
  [ruby-core:61299] [Bug #9593]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-03-05 06:56:49 +00:00
parent 89e70fe8e7
commit 01740f0c27
3 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Mar 5 15:56:18 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (f_arg_asgn): define optional arguments as argument
variables in the rhs default expressions.
[ruby-core:61299] [Bug #9593]
Wed Mar 5 11:58:30 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/openssl/ossl.c (ossl_make_error): check NULL for unknown

16
parse.y
View file

@ -784,7 +784,7 @@ static void token_info_pop(struct parser_params*, const char *token);
%type <node> mlhs mlhs_head mlhs_basic mlhs_item mlhs_node mlhs_post mlhs_inner
%type <id> fsym keyword_variable user_variable sym symbol operation operation2 operation3
%type <id> cname fname op f_rest_arg f_block_arg opt_f_block_arg f_norm_arg f_bad_arg
%type <id> f_kwrest f_label
%type <id> f_kwrest f_label f_arg_asgn
/*%%%*/
/*%
%type <val> program reswords then do dot_or_colon
@ -4548,9 +4548,15 @@ f_norm_arg : f_bad_arg
}
;
f_arg_item : f_norm_arg
f_arg_asgn : f_norm_arg
{
arg_var(get_id($1));
$$ = $1;
}
;
f_arg_item : f_arg_asgn
{
/*%%%*/
$$ = NEW_ARGS_AUX($1, 1);
/*%
@ -4708,9 +4714,8 @@ f_kwrest : kwrest_mark tIDENTIFIER
}
;
f_opt : f_norm_arg '=' arg_value
f_opt : f_arg_asgn '=' arg_value
{
arg_var(get_id($1));
$$ = assignable($1, $3);
/*%%%*/
$$ = NEW_OPT_ARG(0, $$);
@ -4720,9 +4725,8 @@ f_opt : f_norm_arg '=' arg_value
}
;
f_block_opt : f_norm_arg '=' primary_value
f_block_opt : f_arg_asgn '=' primary_value
{
arg_var(get_id($1));
$$ = assignable($1, $3);
/*%%%*/
$$ = NEW_OPT_ARG(0, $$);

24
test/ruby/test_syntax.rb
View file

@ -111,6 +111,30 @@ class TestSyntax < Test::Unit::TestCase
assert_raise(TypeError) {o.kw(**h)}
end
def test_keyword_self_reference
bug9593 = '[ruby-core:61299] [Bug #9593]'
o = Object.new
def o.foo(var: defined?(var)) var end
assert_equal(42, o.foo(var: 42))
assert_equal("local-variable", o.foo, bug9593)
o = Object.new
def o.foo(var: var) var end
assert_nil(o.foo, bug9593)
end
def test_optional_self_reference
bug9593 = '[ruby-core:61299] [Bug #9593]'
o = Object.new
def o.foo(var = defined?(var)) var end
assert_equal(42, o.foo(42))
assert_equal("local-variable", o.foo, bug9593)
o = Object.new
def o.foo(var = var) var end
assert_nil(o.foo, bug9593)
end
def test_warn_grouped_expression
bug5214 = '[ruby-core:39050]'
assert_warning("", bug5214) do