usa	2017-03-26 00:09:48 +0900 (Sun, 26 Mar 2017)

  New Revision: 58086

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58086

  Log:
    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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/lib/irb/ruby-lex.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/lib/irb/ruby-lex.rb
===================================================================
--- ruby_2_2/lib/irb/ruby-lex.rb	(revision 58085)
+++ ruby_2_2/lib/irb/ruby-lex.rb	(revision 58086)
@@ -791,7 +791,7 @@ class RubyLex https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/irb/ruby-lex.rb#L791
           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
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 58085)
+++ ruby_2_2/version.h	(revision 58086)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57027


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/