Skip to content

Handle JSON-style hash key as symbol #467

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.

Sign up for GitHub

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 5 commits into from
Aug 1, 2017
Merged

Handle JSON-style hash key as symbol #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
434f9c6
Handle JSON-style hash key as symbol
aycabta Jul 23, 2017
3a28640
Fix JSON-style hash key test
aycabta Jul 23, 2017
dec804f
Fix test what has a keyword argument
aycabta Jul 23, 2017
f6af91b
Remove :: from hash key detection condition
aycabta Jul 23, 2017
f291a7d
Add test_class_tokenize_double_colon_is_not_hash_symbol
aycabta Jul 23, 2017
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
14 changes: 12 additions & 2 deletions lib/rdoc/ruby_lex.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,12 @@ def identify_identifier
@indent_stack.push token_c
end
else
token_c = TkIDENTIFIER
if peek(0) == ':' and !peek_match?(/^::/)
token.concat getc
token_c = TkSYMBOL
else
token_c = TkIDENTIFIER
end
end

elsif DEINDENT_CLAUSE.include?(token)
Expand Down Expand Up @@ -981,7 +986,12 @@ def identify_identifier
elsif token[token.size - 1, 1] =~ /[!?]/
return Token(TkFID, token)
else
return Token(TkIDENTIFIER, token)
if peek(0) == ':' and !peek_match?(/^::/)
token.concat getc
return Token(TkSYMBOL, token)
else
return Token(TkIDENTIFIER, token)
end
end
end

Expand Down
30 changes: 22 additions & 8 deletions test/test_rdoc_ruby_lex.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,27 @@ def test_class_tokenize_hash_symbol
tokens = RDoc::RubyLex.tokenize '{ class:"foo" }', nil

expected = [
@TK::TkLBRACE .new( 0, 1, 0, '{'),
@TK::TkSPACE .new( 1, 1, 1, ' '),
@TK::TkIDENTIFIER.new( 2, 1, 2, 'class'),
@TK::TkSYMBOL .new( 7, 1, 7, ':"foo"'),
@TK::TkSPACE .new(13, 1, 13, ' '),
@TK::TkRBRACE .new(14, 1, 14, '}'),
@TK::TkLBRACE.new( 0, 1, 0, '{'),
@TK::TkSPACE .new( 1, 1, 1, ' '),
@TK::TkSYMBOL.new( 2, 1, 2, 'class:'),
@TK::TkSTRING.new( 8, 1, 8, '"foo"'),
@TK::TkSPACE .new(13, 1, 13, ' '),
@TK::TkRBRACE.new(14, 1, 14, '}'),
@TK::TkNL .new(15, 1, 15, "\n"),
]

assert_equal expected, tokens
end

def test_class_tokenize_double_colon_is_not_hash_symbol
tokens = RDoc::RubyLex.tokenize 'self.class::Row', nil

expected = [
@TK::TkSELF .new( 0, 1, 0, "self"),
@TK::TkDOT .new( 4, 1, 4, "."),
@TK::TkIDENTIFIER.new( 5, 1, 5, "class"),
@TK::TkCOLON2 .new(10, 1, 10, "::"),
@TK::TkCONSTANT .new(12, 1, 12, "Row"),
@TK::TkNL .new(15, 1, 15, "\n"),
]

Expand Down Expand Up @@ -389,8 +404,7 @@ def test_class_tokenize_symbol
expected = [
@TK::TkIDENTIFIER.new( 0, 1, 0, 'scope'),
@TK::TkSPACE .new( 5, 1, 5, ' '),
@TK::TkIDENTIFIER.new( 6, 1, 6, 'module'),
@TK::TkCOLON .new(12, 1, 12, ':'),
@TK::TkSYMBOL .new( 6, 1, 6, 'module:'),
@TK::TkSPACE .new(13, 1, 13, ' '),
@TK::TkSYMBOL .new(14, 1, 14, ':v1'),
@TK::TkNL .new(17, 1, 17, "\n"),
Expand Down