diff options
| -rw-r--r-- | parse.y | 6 | ||||
| -rw-r--r-- | spec/ruby/language/if_spec.rb | 12 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 2 |
3 files changed, 2 insertions, 18 deletions
@@ -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); diff --git a/spec/ruby/language/if_spec.rb b/spec/ruby/language/if_spec.rb index 4d809019c9..e2201f4626 100644 --- a/spec/ruby/language/if_spec.rb +++ b/spec/ruby/language/if_spec.rb @@ -308,18 +308,6 @@ describe "The if expression" do 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 diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 18546efe63..c5c3737b30 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -1027,9 +1027,7 @@ eom 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') |