summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--parse.y6
-rw-r--r--test/ruby/test_syntax.rb2
-rw-r--r--version.h4
3 files changed, 4 insertions, 8 deletions
diff --git a/parse.y b/parse.y
index b81dbbc373..0e919f1b02 100644
--- a/parse.y
+++ b/parse.y
@@ -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);
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index 91db645b59..4e403a9ffd 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -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')
diff --git a/version.h b/version.h
index 2b19decb66..04d01e4920 100644
--- a/version.h
+++ b/version.h
@@ -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"