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

merge revision(s) 4e038a7e64: [Backport #5400]

Browse source 
Revert "parse.y: Deprecate flip-flops"

	This reverts commit bae638ad5b.

	[Feature #5400]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2019-08-28 05:41:10 +00:00
parent 6ec05f6c5d
commit aae25ddb51
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
parse.y
View file

@ -9861,10 +9861,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);

2
test/ruby/test_syntax.rb
View file

@ -978,9 +978,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')

4
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.6.4"
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 102
#define RUBY_PATCHLEVEL 103
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 8
#define RUBY_RELEASE_DAY 27
#define RUBY_RELEASE_DAY 28
#include "ruby/version.h"