diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-25 15:09:48 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-25 15:09:48 +0000 |
| commit | e58af076553ee2b49678b6f8d63fa94263978dc6 (patch) | |
| tree | d0fb6d2cef8ac9088b59e7283712ea1f1a098bdf | |
| parent | a14ba6e3d58d6f63f47c0549f60306c4989478ba (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_2@58086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/irb/ruby-lex.rb | 2 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index 7189307e0a..d98c5afa3e 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -791,7 +791,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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.7" #define RUBY_RELEASE_DATE "2017-03-25" -#define RUBY_PATCHLEVEL 419 +#define RUBY_PATCHLEVEL 420 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 |