Skip to content

Treat '::' token as EXPR_DOT #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions lib/rdoc/parser/ripper_state_lex.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,15 @@ def on_op(tok, data)
when '&&', '||', '+=', '-=', '*=', '**=',
'&=', '|=', '^=', '<<=', '>>=', '||=', '&&='
@lex_state = EXPR_BEG
when '::'
case @lex_state
when EXPR_ARG, EXPR_CMDARG
@lex_state = EXPR_DOT
when EXPR_FNAME, EXPR_DOT
@lex_state = EXPR_ARG
else
@lex_state = EXPR_BEG
end
else
case @lex_state
when EXPR_FNAME, EXPR_DOT
Expand All @@ -109,8 +118,10 @@ def on_kw(tok, data)
else
@lex_state = EXPR_BEG
end
when 'begin'
when 'begin', 'case', 'when'
@lex_state = EXPR_BEG
when 'return', 'break'
@lex_state = EXPR_MID
else
if @lex_state == EXPR_FNAME
@lex_state = EXPR_END
Expand Down Expand Up @@ -245,7 +256,7 @@ def on_const(tok, data)
case @lex_state
when EXPR_FNAME
@lex_state = EXPR_ENDFN
when EXPR_CLASS
when EXPR_CLASS, EXPR_CMDARG, EXPR_MID
@lex_state = EXPR_ARG
else
@lex_state = EXPR_CMDARG
Expand Down
31 changes: 31 additions & 0 deletions test/test_rdoc_parser_ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,37 @@ def sum(n)
assert_equal @top_level, sum.file
end

def test_parse_redefined_op_with_constant
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level

comment = RDoc::Comment.new '', @top_level

util_parser <<ruby
def meth
Integer::**()
return Integer::**()
break Integer::**()
case Integer::**()
when Integer::**()
end
while Integer::**()
end
yield Integer::**()
defined? Integer::**()
if Integer::**()
end
end
ruby

tk = @parser.get_tk

@parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment

meth = klass.method_list.first
assert_equal 'meth', meth.name
end

def test_parse_alias
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
Expand Down