Skip to content

Commit 5996255

Browse files
nevansst0012
andcommitted
Remove unused Ripper constants and const_defined?
This was mostly copied from the diff in @st0012's PR comment. The remaining constants have been updated to get their value directly from Ripper. Co-authored-by: Stan Lo <[email protected]>
1 parent 5772f60 commit 5996255

File tree

1 file changed

+7
-20
lines changed

1 file changed

+7
-20
lines changed

lib/rdoc/parser/ripper_state_lex.rb

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,11 @@ class RDoc::Parser::RipperStateLex
99

1010
Token = Struct.new(:line_no, :char_no, :kind, :text, :state)
1111

12-
EXPR_NONE = 0
13-
EXPR_BEG = 1
14-
EXPR_END = 2
15-
EXPR_ENDARG = 4
16-
EXPR_ENDFN = 8
17-
EXPR_ARG = 16
18-
EXPR_CMDARG = 32
19-
EXPR_MID = 64
20-
EXPR_FNAME = 128
21-
EXPR_DOT = 256
22-
EXPR_CLASS = 512
23-
EXPR_LABEL = 1024
24-
EXPR_LABELED = 2048
25-
EXPR_FITEM = 4096
26-
EXPR_VALUE = EXPR_BEG
27-
EXPR_BEG_ANY = (EXPR_BEG | EXPR_MID | EXPR_CLASS)
28-
EXPR_ARG_ANY = (EXPR_ARG | EXPR_CMDARG)
29-
EXPR_END_ANY = (EXPR_END | EXPR_ENDARG | EXPR_ENDFN)
12+
EXPR_END = Ripper::EXPR_END
13+
EXPR_ENDFN = Ripper::EXPR_ENDFN
14+
EXPR_ARG = Ripper::EXPR_ARG
15+
EXPR_FNAME = Ripper::EXPR_FNAME
16+
EXPR_LABEL = Ripper::EXPR_LABEL
3017

3118
class InnerStateLex < Ripper::Filter
3219
def initialize(code)
@@ -53,7 +40,7 @@ def get_squashed_tk
5340
when :on_backtick then
5441
if (tk[:state] & (EXPR_FNAME | EXPR_ENDFN)) != 0
5542
tk[:kind] = :on_ident
56-
tk[:state] = Ripper::Lexer.const_defined?(:State) ? Ripper::Lexer::State.new(EXPR_ARG) : EXPR_ARG
43+
tk[:state] = Ripper::Lexer::State.new(EXPR_ARG)
5744
else
5845
tk = get_string_tk(tk)
5946
end
@@ -266,7 +253,7 @@ def get_squashed_tk
266253
private def get_op_tk(tk)
267254
redefinable_operators = %w[! != !~ % & * ** + +@ - -@ / < << <= <=> == === =~ > >= >> [] []= ^ ` | ~]
268255
if redefinable_operators.include?(tk[:text]) and tk[:state] == EXPR_ARG then
269-
tk[:state] = Ripper::Lexer.const_defined?(:State) ? Ripper::Lexer::State.new(EXPR_ARG) : EXPR_ARG
256+
tk[:state] = Ripper::Lexer::State.new(EXPR_ARG)
270257
tk[:kind] = :on_ident
271258
elsif tk[:text] =~ /^[-+]$/ then
272259
tk_ahead = get_squashed_tk

0 commit comments

Comments
 (0)