summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-27 16:09:31 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-27 16:09:31 +0000
commit8f3cf2cc09f2cf6c474be2c0091be8a8f4de7634 (patch)
tree2b4b9a2617efaa1ae6c4765ddf9f7a7bd7ba69ea
parent6920c438d642ca2705e0efca74c8ae7214f2121c (diff)
merge revision(s) 57027: [Backport #13012]
ruby-lex.rb: fix for label * lib/irb/ruby-lex.rb (identify_identifier): treat identifier just followed by a colon as a lable. this is not a precise solution but enough for the time being. [ruby-core:78526] [Bug #13012] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58170 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/irb/ruby-lex.rb2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 879c45c565..ca01662eee 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -792,7 +792,7 @@ class RubyLex
token_c = TkSymbol2Token[trans[1]]
@lex_state = trans[0]
else
- if @lex_state != EXPR_FNAME
+ if @lex_state != EXPR_FNAME and peek(0) != ':'
if ENINDENT_CLAUSE.include?(token)
# check for ``class = val'' etc.
valid = true
diff --git a/version.h b/version.h
index 7ed08df396..c9f4b15d64 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.3"
#define RUBY_RELEASE_DATE "2017-03-28"
-#define RUBY_PATCHLEVEL 279
+#define RUBY_PATCHLEVEL 280
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3