[ruby-cvs:61780] nagachika:r54618 (ruby_2_3): merge revision(s) 53834, 53835, 53836: [Backport #12073]

[nagachika at ruby-lang.org]

nagachika	2016-04-17 04:43:02 +0900 (Sun, 17 Apr 2016)

  New Revision: 54618

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

  Log:
    merge revision(s) 53834,53835,53836: [Backport #12073]
    
    parse.y: simplify local ID condition
    
    * parse.y (tokenize_ident, parse_ident): ident in tokenize_ident()
      can be a local id only when called from parse_ident(), but never
      from parse_gvar() and parse_atmark().
    * parse.y (parse_ident): allow keyword arguments just after a
      method where the same name local variable is defined.
      [ruby-core:73816] [Bug#12073]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/parse.y
    branches/ruby_2_3/test/ruby/test_syntax.rb
    branches/ruby_2_3/version.h