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

Revert "Add pipeline operator [Feature #15799]"

Browse source 
This reverts commits:
* d365fd5a02
* d780c36624
* aa7211836b
* 043f010c28
* bb4dd7c6af05c7821d572e2592ea3d0cc748d81f
* 043f010c28
* f169043d81

http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/94645
This commit is contained in:
Nobuyoshi Nakada 2019-08-29 15:09:43 +09:00
parent 893900dc78
commit 2ed68d0ff9
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
6 changed files with 2 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

11
NEWS
View file

@ -48,17 +48,6 @@ sufficient information, see the ChangeLog file or Redmine
" # This has been warned since 2.4
EOS
* Pipeline operator is experimentally added.
This code equals to the next code.
foo()
|> bar 1, 2
|> display
foo()
.bar(1, 2)
.display
* The flip-flop syntax deprecation is reverted. [Feature #5400]

1
defs/id.def
View file

@ -117,7 +117,6 @@ token_ops = %[\
OROP ||
ANDDOT &.
METHREF .:
PIPE |>
]
class KeywordError < RuntimeError

1
ext/ripper/eventids2.c
View file

@ -262,7 +262,6 @@ static const struct token_assoc {
{tDSTAR, O(op)},
{tANDDOT, O(op)},
{tMETHREF, O(op)},
{tPIPE, O(op)},
{tSTRING_BEG, O(tstring_beg)},
{tSTRING_CONTENT, O(tstring_content)},
{tSTRING_DBEG, O(embexpr_beg)},

42
parse.y
View file

@ -1009,7 +1009,7 @@ static void token_info_warn(struct parser_params *p, const char *token, token_in
%type <node> literal numeric simple_numeric ssym dsym symbol cpath
%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 pipeline
%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
%type <node> args call_args opt_call_args
%type <node> paren_args opt_paren_args args_tail opt_args_tail block_args_tail opt_block_args_tail
@ -1067,7 +1067,6 @@ static void token_info_warn(struct parser_params *p, const char *token, token_in
%token <id> tANDDOT RUBY_TOKEN(ANDDOT) "&."
%token <id> tCOLON2 RUBY_TOKEN(COLON2) "::"
%token <id> tMETHREF RUBY_TOKEN(METHREF) ".:"
%token tPIPE RUBY_TOKEN(PIPE) "|>"
%token tCOLON3 ":: at EXPR_BEG"
%token <id> tOP_ASGN "operator-assignment" /* +=, -= etc. */
%token tASSOC "=>"
@ -1103,7 +1102,6 @@ static void token_info_warn(struct parser_params *p, const char *token, token_in
%nonassoc modifier_if modifier_unless modifier_while modifier_until
%left keyword_or keyword_and
%right keyword_not
%left tPIPE
%nonassoc keyword_defined
%right '=' tOP_ASGN
%left modifier_rescue
@ -1512,37 +1510,6 @@ expr : command_call
$$ = call_uni_op(p, method_cond(p, $2, &@2), '!', &@1, &@$);
}
| arg
| pipeline
;
pipeline : expr tPIPE operation opt_paren_args
{
/*%%%*/
$$ = new_command_qcall(p, ID2VAL(idPIPE), $1, $3, $4, Qnull, &@3, &@$);
/*% %*/
/*% ripper: command_call!($1, ID2VAL(idPIPE), $3, $4) %*/
}
| expr tPIPE operation opt_paren_args brace_block
{
/*%%%*/
$$ = new_command_qcall(p, ID2VAL(idPIPE), $1, $3, $4, $5, &@3, &@$);
/*% %*/
/*% ripper: method_add_block!(command_call!($1, ID2VAL(idPIPE), $3, $4), $5) %*/
}
| expr tPIPE operation command_args
{
/*%%%*/
$$ = new_command_qcall(p, ID2VAL(idPIPE), $1, $3, $4, Qnull, &@3, &@$);
/*% %*/
/*% ripper: command_call!($1, ID2VAL(idPIPE), $3, $4) %*/
}
| expr tPIPE operation command_args do_block
{
/*%%%*/
$$ = new_command_qcall(p, ID2VAL(idPIPE), $1, $3, $4, $5, &@3, &@$);
/*% %*/
/*% ripper: method_add_block!(command_call!($1, ID2VAL(idPIPE), $3, $4), $5) %*/
}
;
expr_value : expr
@ -8710,11 +8677,10 @@ parser_yylex(struct parser_params *p)
case '\13': /* '\v' */
space_seen = 1;
break;
case '|':
case '&':
case '.': {
dispatch_delayed_token(p, tIGNORED_NL);
if (c == '|' ? peek(p, '>') : (peek(p, '.') == (c == '&'))) {
if (peek(p, '.') == (c == '&')) {
pushback(p, c);
dispatch_scan_event(p, tSP);
goto retry;
@ -8989,10 +8955,6 @@ parser_yylex(struct parser_params *p)
SET_LEX_STATE(EXPR_BEG);
return tOP_ASGN;
}
if (c == '>') {
SET_LEX_STATE(EXPR_DOT);
return tPIPE;
}
SET_LEX_STATE(IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG|EXPR_LABEL);
pushback(p, c);
return '|';

2
test/ripper/test_scanner_events.rb
View file

@ -573,8 +573,6 @@ class TestRipper::ScannerEvents < Test::Unit::TestCase
scan('op', 'obj.:foo')
assert_equal [],
scan('op', %q[`make all`])
assert_equal %w[|>],
scan('op', %q[x|>y])
end
def test_symbeg

9
test/ruby/test_syntax.rb
View file

@ -1388,15 +1388,6 @@ eom
assert_syntax_error('@1', /outside block/)
end
def test_pipeline_operator
assert_valid_syntax('x |> y')
x = nil
assert_equal("121", eval('x = 12 |> pow(2) |> to_s 11'))
assert_equal(12, x)
assert_equal([2, 4, 6], eval("1.. |> take 3\n|> map do @1 * 2 end"))
assert_syntax_error('a|>-b', /unexpected '-'/)
end
def test_value_expr_in_condition
mesg = /void value expression/
assert_syntax_error("tap {a = (true ? next : break)}", mesg)