Skip to content
Permalink
Browse files

Revert "parse.y: Deprecate flip-flops"

This reverts commit bae638a.

[Feature #5400]
  • Loading branch information
nobu committed Jul 11, 2019
1 parent d77b84c commit 4e038a7e64a9d52eed59b8f05647d4e58d265ec3
Showing with 2 additions and 18 deletions.
  1. +2 −4 parse.y
  2. +0 −12 spec/ruby/language/if_spec.rb
  3. +0 −2 test/ruby/test_syntax.rb
@@ -10930,10 +10930,8 @@ cond0(struct parser_params *p, NODE *node, int method_op, const YYLTYPE *loc)
case NODE_DOT3:
node->nd_beg = range_op(p, node->nd_beg, loc);
node->nd_end = range_op(p, node->nd_end, loc);
if (nd_type(node) == NODE_DOT2 || nd_type(node) == NODE_DOT3) {
nd_set_type(node, nd_type(node) == NODE_DOT2 ? NODE_FLIP2 : NODE_FLIP3);
parser_warn(p, node, "flip-flop is deprecated");
}
if (nd_type(node) == NODE_DOT2) nd_set_type(node,NODE_FLIP2);
else if (nd_type(node) == NODE_DOT3) nd_set_type(node, NODE_FLIP3);
if (!method_op && !e_option_supplied(p)) {
int b = literal_node(node->nd_beg);
int e = literal_node(node->nd_end);
@@ -308,18 +308,6 @@
6.times(&b)
ScratchPad.recorded.should == [4, 5, 4, 5]
end

ruby_version_is "2.6" do
it 'is deprecated' do
i = 4

-> do
eval "ScratchPad << 'it works' if (i == 4)..(i == 7)"
end.should complain(/flip-flop is deprecated/)

ScratchPad.recorded.should == ['it works']
end
end
end
end

@@ -1027,9 +1027,7 @@ def test_warning_literal_in_condition
eval('1 if !//')
end
assert_warn('') do
verbose_bak, $VERBOSE = $VERBOSE, nil
eval('1 if !(true..false)')
$VERBOSE = verbose_bak
end
assert_warning('') do
eval('1 if !1')

0 comments on commit 4e038a7

Please sign in to comment.
You can’t perform that action at this time.