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

Simplify lexer state matching in #dispatch_seq

Browse source 
for improving readability of the condition. It may be slightly faster, or may not.
This commit is contained in:
Takashi Kokubun 2019-05-26 11:24:52 -07:00
parent 5a6c77bbe8
commit 7597f7ecb1
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
1 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

56
lib/irb/color.rb
View file

@ -20,36 +20,40 @@ module IRB # :nodoc:
} }
private_constant :TOKEN_KEYWORDS private_constant :TOKEN_KEYWORDS
# A constant of all-bit 1 to match any Ripper's state in #dispatch_seq
ALL = -1
private_constant :ALL
begin begin
# Following pry's colors where possible, but sometimes having a compromise like making # Following pry's colors where possible, but sometimes having a compromise like making
# backtick and regexp as red (string's color, because they're sharing tokens). # backtick and regexp as red (string's color, because they're sharing tokens).
TOKEN_SEQ_EXPRS = { TOKEN_SEQ_EXPRS = {
on_CHAR: [[BLUE, BOLD], :all], on_CHAR: [[BLUE, BOLD], ALL],
on_backtick: [[RED], :all], on_backtick: [[RED], ALL],
on_const: [[BLUE, BOLD, UNDERLINE], :all], on_const: [[BLUE, BOLD, UNDERLINE], ALL],
on_comment: [[BLUE, BOLD], :all], on_comment: [[BLUE, BOLD], ALL],
on_embexpr_beg: [[RED], :all], on_embexpr_beg: [[RED], ALL],
on_embexpr_end: [[RED], :all], on_embexpr_end: [[RED], ALL],
on_embvar: [[RED], :all], on_embvar: [[RED], ALL],
on_float: [[MAGENTA, BOLD], :all], on_float: [[MAGENTA, BOLD], ALL],
on_heredoc_beg: [[RED], :all], on_heredoc_beg: [[RED], ALL],
on_heredoc_end: [[RED], :all], on_heredoc_end: [[RED], ALL],
on_ident: [[BLUE, BOLD], Ripper::EXPR_ENDFN], on_ident: [[BLUE, BOLD], Ripper::EXPR_ENDFN],
on_imaginary: [[BLUE, BOLD], :all], on_imaginary: [[BLUE, BOLD], ALL],
on_int: [[BLUE, BOLD], :all], on_int: [[BLUE, BOLD], ALL],
on_kw: [[GREEN], :all], on_kw: [[GREEN], ALL],
on_label: [[MAGENTA], :all], on_label: [[MAGENTA], ALL],
on_label_end: [[RED], :all], on_label_end: [[RED], ALL],
on_qsymbols_beg: [[RED], :all], on_qsymbols_beg: [[RED], ALL],
on_qwords_beg: [[RED], :all], on_qwords_beg: [[RED], ALL],
on_rational: [[BLUE, BOLD], :all], on_rational: [[BLUE, BOLD], ALL],
on_regexp_beg: [[RED, BOLD], :all], on_regexp_beg: [[RED, BOLD], ALL],
on_regexp_end: [[RED, BOLD], :all], on_regexp_end: [[RED, BOLD], ALL],
on_symbeg: [[YELLOW], :all], on_symbeg: [[YELLOW], ALL],
on_tstring_beg: [[RED], :all], on_tstring_beg: [[RED], ALL],
on_tstring_content: [[RED], :all], on_tstring_content: [[RED], ALL],
on_tstring_end: [[RED], :all], on_tstring_end: [[RED], ALL],
on_words_beg: [[RED], :all], on_words_beg: [[RED], ALL],
} }
rescue NameError rescue NameError
# Give up highlighting Ripper-incompatible older Ruby # Give up highlighting Ripper-incompatible older Ruby
@ -121,7 +125,7 @@ module IRB # :nodoc:
[YELLOW] [YELLOW]
elsif TOKEN_KEYWORDS.fetch(token, []).include?(str) elsif TOKEN_KEYWORDS.fetch(token, []).include?(str)
[CYAN, BOLD] [CYAN, BOLD]
elsif (seq, exprs = TOKEN_SEQ_EXPRS[token]; exprs == :all || (exprs != nil && (expr & exprs) != 0)) elsif (seq, exprs = TOKEN_SEQ_EXPRS[token]; (expr & (exprs || 0)) != 0)
seq seq
else else
nil nil