1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

[ruby/irb] Remove patches for Ruby 2.4

They were added in b34f26a0dd

https://github.com/ruby/irb/commit/0e760d2674
This commit is contained in:
st0012 2022-09-30 23:18:19 +01:00 committed by git
parent 42fcbcc215
commit 5cab9d0ee2

View file

@ -297,7 +297,7 @@ class RubyLex
return true return true
elsif tokens.size >= 1 and tokens[-1].event == :on_heredoc_end # "EOH\n" elsif tokens.size >= 1 and tokens[-1].event == :on_heredoc_end # "EOH\n"
return false return false
elsif tokens.size >= 2 and defined?(Ripper::EXPR_BEG) and tokens[-2].state.anybits?(Ripper::EXPR_BEG | Ripper::EXPR_FNAME) and tokens[-2].tok !~ /\A\.\.\.?\z/ elsif tokens.size >= 2 and tokens[-2].state.anybits?(Ripper::EXPR_BEG | Ripper::EXPR_FNAME) and tokens[-2].tok !~ /\A\.\.\.?\z/
# end of literal except for regexp # end of literal except for regexp
# endless range at end of line is not a continue # endless range at end of line is not a continue
return true return true
@ -378,21 +378,20 @@ class RubyLex
$VERBOSE = verbose $VERBOSE = verbose
end end
if defined?(Ripper::EXPR_BEG) last_lex_state = tokens.last.state
last_lex_state = tokens.last.state
if last_lex_state.allbits?(Ripper::EXPR_BEG) if last_lex_state.allbits?(Ripper::EXPR_BEG)
return false return false
elsif last_lex_state.allbits?(Ripper::EXPR_DOT) elsif last_lex_state.allbits?(Ripper::EXPR_DOT)
return true return true
elsif last_lex_state.allbits?(Ripper::EXPR_CLASS) elsif last_lex_state.allbits?(Ripper::EXPR_CLASS)
return true return true
elsif last_lex_state.allbits?(Ripper::EXPR_FNAME) elsif last_lex_state.allbits?(Ripper::EXPR_FNAME)
return true return true
elsif last_lex_state.allbits?(Ripper::EXPR_VALUE) elsif last_lex_state.allbits?(Ripper::EXPR_VALUE)
return true return true
elsif last_lex_state.allbits?(Ripper::EXPR_ARG) elsif last_lex_state.allbits?(Ripper::EXPR_ARG)
return false return false
end
end end
false false