1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/prism] Emit bounds for heredocs and words_sep in ripper translation

Browse Source 
https://github.com/ruby/prism/commit/e23eae8266
This commit is contained in:
Kevin Newton 2024-03-06 10:31:25 -05:00 committed by git
parent 72f01bddb6
commit bafe897351
1 changed files with 92 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
lib/prism/translation/ripper.rb
View File

@ -23,13 +23,10 @@ module Prism
# * on_arg_ambiguous # * on_arg_ambiguous
# * on_assign_error # * on_assign_error
# * on_class_name_error # * on_class_name_error
# * on_heredoc_dedent
# * on_operator_ambiguous # * on_operator_ambiguous
# * on_param_error # * on_param_error
# #
# * on_comma # * on_comma
# * on_heredoc_beg
# * on_heredoc_end
# * on_ignored_nl # * on_ignored_nl
# * on_kw # * on_kw
# * on_label_end # * on_label_end
@ -48,7 +45,6 @@ module Prism
# * on_tlambeg # * on_tlambeg
# * on_tstring_beg # * on_tstring_beg
# * on_tstring_end # * on_tstring_end
# * on_words_sep
# * on_ignored_sp # * on_ignored_sp
# #
class Ripper < Compiler class Ripper < Compiler
@ -555,37 +551,58 @@ module Prism
def visit_array_node(node) def visit_array_node(node)
case (opening = node.opening) case (opening = node.opening)
when /^%w/ when /^%w/
bounds(node.opening_loc) opening_loc = node.opening_loc
bounds(opening_loc)
on_qwords_beg(opening) on_qwords_beg(opening)
elements = elements = on_qwords_new
node.elements.inject(on_qwords_new) do |qwords, element| previous = nil
bounds(element.location)
on_qwords_add(qwords, on_tstring_content(element.content)) node.elements.each do |element|
end visit_words_sep(opening_loc, previous, element)
bounds(element.location)
elements = on_qwords_add(elements, on_tstring_content(element.content))
previous = element
end
bounds(node.closing_loc) bounds(node.closing_loc)
on_tstring_end(node.closing) on_tstring_end(node.closing)
when /^%i/ when /^%i/
bounds(node.opening_loc) opening_loc = node.opening_loc
bounds(opening_loc)
on_qsymbols_beg(opening) on_qsymbols_beg(opening)
elements = elements = on_qsymbols_new
node.elements.inject(on_qsymbols_new) do |qsymbols, element| previous = nil
bounds(element.location)
on_qsymbols_add(qsymbols, on_tstring_content(element.value)) node.elements.each do |element|
end visit_words_sep(opening_loc, previous, element)
bounds(element.location)
elements = on_qsymbols_add(elements, on_tstring_content(element.value))
previous = element
end
bounds(node.closing_loc) bounds(node.closing_loc)
on_tstring_end(node.closing) on_tstring_end(node.closing)
when /^%W/ when /^%W/
bounds(node.opening_loc) opening_loc = node.opening_loc
bounds(opening_loc)
on_words_beg(opening) on_words_beg(opening)
elements = elements = on_words_new
node.elements.inject(on_words_new) do |words, element| previous = nil
bounds(element.location)
word = node.elements.each do |element|
visit_words_sep(opening_loc, previous, element)
bounds(element.location)
elements =
on_words_add(
elements,
if element.is_a?(StringNode) if element.is_a?(StringNode)
on_word_add(on_word_new, on_tstring_content(element.content)) on_word_add(on_word_new, on_tstring_content(element.content))
else else
@ -601,20 +618,28 @@ module Prism
on_word_add(word, word_part) on_word_add(word, word_part)
end end
end end
)
on_words_add(words, word) previous = element
end end
bounds(node.closing_loc) bounds(node.closing_loc)
on_tstring_end(node.closing) on_tstring_end(node.closing)
when /^%I/ when /^%I/
bounds(node.opening_loc) opening_loc = node.opening_loc
bounds(opening_loc)
on_symbols_beg(opening) on_symbols_beg(opening)
elements = elements = on_symbols_new
node.elements.inject(on_symbols_new) do |symbols, element| previous = nil
bounds(element.location)
symbol = node.elements.each do |element|
visit_words_sep(opening_loc, previous, element)
bounds(element.location)
elements =
on_symbols_add(
elements,
if element.is_a?(SymbolNode) if element.is_a?(SymbolNode)
on_word_add(on_word_new, on_tstring_content(element.value)) on_word_add(on_word_new, on_tstring_content(element.value))
else else
@ -630,9 +655,10 @@ module Prism
on_word_add(word, word_part) on_word_add(word, word_part)
end end
end end
)
on_symbols_add(symbols, symbol) previous = element
end end
bounds(node.closing_loc) bounds(node.closing_loc)
on_tstring_end(node.closing) on_tstring_end(node.closing)
@ -650,6 +676,18 @@ module Prism
on_array(elements) on_array(elements)
end end
# Dispatch a words_sep event that contains the space between the elements
# of list literals.
private def visit_words_sep(opening_loc, previous, current)
end_offset = (previous.nil? ? opening_loc : previous.location).end_offset
start_offset = current.location.start_offset
if end_offset != start_offset
bounds(current.location.copy(start_offset: end_offset))
on_words_sep(source.byteslice(end_offset...start_offset))
end
end
# Visit a list of elements, like the elements of an array or arguments. # Visit a list of elements, like the elements of an array or arguments.
private def visit_arguments(elements) private def visit_arguments(elements)
bounds(elements.first.location) bounds(elements.first.location)
@ -2914,17 +2952,35 @@ module Prism
end end
private def visit_heredoc_string_node(node) private def visit_heredoc_string_node(node)
bounds(node.opening_loc)
on_heredoc_beg(node.opening)
bounds(node.location) bounds(node.location)
visit_heredoc_node(node.parts, on_string_content) do |parts, part| result =
on_string_add(parts, part) visit_heredoc_node(node.parts, on_string_content) do |parts, part|
end on_string_add(parts, part)
end
bounds(node.closing_loc)
on_heredoc_end(node.closing)
result
end end
private def visit_heredoc_x_string_node(node) private def visit_heredoc_x_string_node(node)
bounds(node.opening_loc)
on_heredoc_beg(node.opening)
bounds(node.location) bounds(node.location)
visit_heredoc_node(node.parts, on_xstring_new) do |parts, part| result =
on_xstring_add(parts, part) visit_heredoc_node(node.parts, on_xstring_new) do |parts, part|
end on_xstring_add(parts, part)
end
bounds(node.closing_loc)
on_heredoc_end(node.closing)
result
end end
# super(foo) # super(foo)