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

Assoc pattern matching (#3703)

Browse source 
[Feature #17260] One-line pattern matching using tASSOC

R-assignment is rejected instead.
This commit is contained in:
Nobuyoshi Nakada 2020-10-26 18:00:24 +09:00 committed by GitHub
parent cffdacb15a
commit 52c630da00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
Notes: git 2020-10-26 18:00:56 +09:00 
Merged-By: nobu <nobu@ruby-lang.org>
8 changed files with 37 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
parse.y
View file

@ -1150,7 +1150,7 @@ static int looking_at_eol_p(struct parser_params *p);
%type <node> string_contents xstring_contents regexp_contents string_content
%type <node> words symbols symbol_list qwords qsymbols word_list qword_list qsym_list word
%type <node> literal numeric simple_numeric ssym dsym symbol cpath def_name defn_head defs_head
%type <node> top_compstmt top_stmts top_stmt begin_block rassign
%type <node> top_compstmt top_stmts top_stmt begin_block
%type <node> bodystmt compstmt stmts stmt_or_begin stmt expr arg primary command command_call method_call
%type <node> expr_value expr_value_do arg_value primary_value fcall rel_expr
%type <node> if_tail opt_else case_body case_args cases opt_rescue exc_list exc_var opt_ensure
@ -1242,7 +1242,7 @@ static int looking_at_eol_p(struct parser_params *p);
%nonassoc tLOWEST
%nonassoc tLBRACE_ARG
%nonassoc modifier_if modifier_unless modifier_while modifier_until keyword_in
%nonassoc modifier_if modifier_unless modifier_while modifier_until
%left keyword_or keyword_and
%right keyword_not
%nonassoc keyword_defined
@ -1548,40 +1548,9 @@ stmt : keyword_alias fitem {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem
/*% %*/
/*% ripper: massign!($1, $3) %*/
}
| rassign
| expr
;
rassign : arg_value tASSOC lhs
{
/*%%%*/
$$ = node_assign(p, $3, $1, &@$);
/*% %*/
/*% ripper: assign!($3, $1) %*/
}
| arg_value tASSOC mlhs
{
/*%%%*/
$$ = node_assign(p, $3, $1, &@$);
/*% %*/
/*% ripper: massign!($3, $1) %*/
}
| rassign tASSOC lhs
{
/*%%%*/
$$ = node_assign(p, $3, $1, &@$);
/*% %*/
/*% ripper: assign!($3, $1) %*/
}
| rassign tASSOC mlhs
{
/*%%%*/
$$ = node_assign(p, $3, $1, &@$);
/*% %*/
/*% ripper: massign!($3, $1) %*/
}
;
command_asgn : lhs '=' command_rhs
{
/*%%%*/
@ -1677,7 +1646,7 @@ expr : command_call
{
$$ = call_uni_op(p, method_cond(p, $2, &@2), '!', &@1, &@$);
}
| arg keyword_in
| arg tASSOC
{
value_expr($1);
SET_LEX_STATE(EXPR_BEG|EXPR_LABEL);

4
spec/ruby/command_line/dash_upper_w_spec.rb
View file

@ -32,10 +32,10 @@ ruby_version_is "2.7" do
describe "The -W command line option with :no-experimental" do
it "suppresses experimental warnings" do
result = ruby_exe('0 in a', args: '2>&1')
result = ruby_exe('case 0; in a; end', args: '2>&1')
result.should =~ /is experimental/
result = ruby_exe('0 in a', options: '-W:no-experimental', args: '2>&1')
result = ruby_exe('case 0; in a; end', options: '-W:no-experimental', args: '2>&1')
result.should == ""
end
end

4
spec/ruby/command_line/rubyopt_spec.rb
View file

@ -68,13 +68,13 @@ describe "Processing RUBYOPT" do
it "suppresses experimental warnings for '-W:no-experimental'" do
ENV["RUBYOPT"] = '-W:no-experimental'
result = ruby_exe('0 in a', args: '2>&1')
result = ruby_exe('case 0; in a; end', args: '2>&1')
result.should == ""
end
it "suppresses deprecation and experimental warnings for '-W:no-deprecated -W:no-experimental'" do
ENV["RUBYOPT"] = '-W:no-deprecated -W:no-experimental'
result = ruby_exe('($; = "") in a', args: '2>&1')
result = ruby_exe('case ($; = ""); in a; end', args: '2>&1')
result.should == ""
end
end

4
spec/ruby/core/warning/element_set_spec.rb
View file

@ -8,8 +8,8 @@ ruby_version_is '2.7' do
end
it "emits and suppresses warnings for :experimental" do
ruby_exe('Warning[:experimental] = true; eval("0 in a")', args: "2>&1").should =~ /is experimental/
ruby_exe('Warning[:experimental] = false; eval("0 in a")', args: "2>&1").should == ""
ruby_exe('Warning[:experimental] = true; eval("case 0; in a; end")', args: "2>&1").should =~ /is experimental/
ruby_exe('Warning[:experimental] = false; eval("case 0; in a; end")', args: "2>&1").should == ""
end
it "raises for unknown category" do

12
spec/ruby/language/pattern_matching_spec.rb
View file

@ -9,11 +9,13 @@ ruby_version_is "2.7" do
ScratchPad.record []
end
it "can be standalone in operator that deconstructs value" do
eval(<<-RUBY).should == [0, 1]
[0, 1] in [a, b]
[a, b]
RUBY
ruby_version_is "3.0" do
it "can be standalone assoc operator that deconstructs value" do
eval(<<-RUBY).should == [0, 1]
[0, 1] => [a, b]
[a, b]
RUBY
end
end
it "extends case expression with case/in construction" do

6
test/ripper/test_sexp.rb
View file

@ -412,7 +412,7 @@ eot
[:@int, "0", [1, 5]],
[:in, [:aryptn, nil, nil, nil, nil], [[:void_stmt]], nil]],
[__LINE__, %q{ 0 in [*, a, *] }] =>
[__LINE__, %q{ 0 => [*, a, *] }] =>
[:case,
[:@int, "0", [1, 0]],
[:in,
@ -424,7 +424,7 @@ eot
nil,
nil]],
[__LINE__, %q{ 0 in [*a, b, *c] }] =>
[__LINE__, %q{ 0 => [*a, b, *c] }] =>
[:case,
[:@int, "0", [1, 0]],
[:in,
@ -436,7 +436,7 @@ eot
nil,
nil]],
[__LINE__, %q{ 0 in A(*a, b, c, *d) }] =>
[__LINE__, %q{ 0 => A(*a, b, c, *d) }] =>
[:case,
[:@int, "0", [1, 0]],
[:in,

22
test/ruby/test_pattern_matching.rb
View file

@ -272,7 +272,7 @@ class TestPatternMatching < Test::Unit::TestCase
end
assert_syntax_error(%q{
0 in [a, a]
0 => [a, a]
}, /duplicated variable name/)
end
@ -737,10 +737,10 @@ END
end
def test_find_pattern
[0, 1, 2] in [*, 1 => a, *]
[0, 1, 2] => [*, 1 => a, *]
assert_equal(1, a)
[0, 1, 2] in [*a, 1 => b, *c]
[0, 1, 2] => [*a, 1 => b, *c]
assert_equal([0], a)
assert_equal(1, b)
assert_equal([2], c)
@ -763,7 +763,7 @@ END
end
end
[0, 1, 2] in [*a, 1 => b, 2 => c, *d]
[0, 1, 2] => [*a, 1 => b, 2 => c, *d]
assert_equal([0], a)
assert_equal(1, b)
assert_equal(2, c)
@ -1451,18 +1451,18 @@ END
################################################################
def test_modifier_in
1 in a
def test_assoc
1 => a
assert_equal 1, a
assert_raise(NoMatchingPatternError) do
{a: 1} in {a: 0}
{a: 1} => {a: 0}
end
assert_syntax_error("if {} in {a:}; end", /void value expression/)
assert_syntax_error("if {} => {a:}; end", /void value expression/)
assert_syntax_error(%q{
1 in a, b
1 => a, b
}, /unexpected/, '[ruby-core:95098]')
assert_syntax_error(%q{
1 in a:
1 => a:
}, /unexpected/, '[ruby-core:95098]')
end
@ -1480,7 +1480,7 @@ END
def test_experimental_warning
assert_experimental_warning("case 0; in 0; end")
assert_experimental_warning("0 in 0")
assert_experimental_warning("0 => 0")
end
end
END_of_GUARD

13
test/ruby/test_syntax.rb
View file

@ -1430,8 +1430,6 @@ eom
assert_syntax_error('private def obj.foo = 42', /unexpected '='/)
assert_valid_syntax('private def obj.foo() = 42')
assert_valid_syntax('private def obj.inc(x) = x + 1')
eval('def self.inc(x) = x + 1 => @x')
assert_equal(:inc, @x)
k = Class.new do
class_eval('def rescued(x) = raise("to be caught") rescue "instance #{x}"')
class_eval('def self.rescued(x) = raise("to be caught") rescue "class #{x}"')
@ -1715,10 +1713,13 @@ eom
end
def test_rightward_assign
assert_equal(1, eval("1 => a"))
assert_equal([2,3], eval("13.divmod(5) => a,b; [a, b]"))
assert_equal([2,3,2,3], eval("13.divmod(5) => a,b => c, d; [a, b, c, d]"))
assert_equal(3, eval("1+2 => a"))
a = b = nil
EnvUtil.suppress_warning {eval("1 => a")}
assert_equal(1, a)
EnvUtil.suppress_warning {eval("13.divmod(5) => [a,b]")}
assert_equal([2,3], [a, b])
EnvUtil.suppress_warning {eval("1+2 => a")}
assert_equal(3, a)
end
private