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

[ruby/prism] Use partial_script for the parser translators

Browse Source 
Followup to https://github.com/ruby/prism/pull/3079

https://github.com/ruby/prism/commit/68f434e356
This commit is contained in:
Earlopain 2024-10-03 13:34:57 +02:00 committed by git
parent cd96af2cb8
commit 66124cdb17
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/prism/translation/parser.rb
View File

@ -51,7 +51,7 @@ module Prism
source = source_buffer.source source = source_buffer.source
offset_cache = build_offset_cache(source) offset_cache = build_offset_cache(source)
result = unwrap(Prism.parse(source, filepath: source_buffer.name, version: convert_for_prism(version), scopes: [[]], encoding: false), offset_cache) result = unwrap(Prism.parse(source, filepath: source_buffer.name, version: convert_for_prism(version), partial_script: true, encoding: false), offset_cache)
build_ast(result.value, offset_cache) build_ast(result.value, offset_cache)
ensure ensure
@ -64,7 +64,7 @@ module Prism
source = source_buffer.source source = source_buffer.source
offset_cache = build_offset_cache(source) offset_cache = build_offset_cache(source)
result = unwrap(Prism.parse(source, filepath: source_buffer.name, version: convert_for_prism(version), scopes: [[]], encoding: false), offset_cache) result = unwrap(Prism.parse(source, filepath: source_buffer.name, version: convert_for_prism(version), partial_script: true, encoding: false), offset_cache)
[ [
build_ast(result.value, offset_cache), build_ast(result.value, offset_cache),
@ -83,7 +83,7 @@ module Prism
offset_cache = build_offset_cache(source) offset_cache = build_offset_cache(source)
result = result =
begin begin
unwrap(Prism.parse_lex(source, filepath: source_buffer.name, version: convert_for_prism(version), scopes: [[]], encoding: false), offset_cache) unwrap(Prism.parse_lex(source, filepath: source_buffer.name, version: convert_for_prism(version), partial_script: true, encoding: false), offset_cache)
rescue ::Parser::SyntaxError rescue ::Parser::SyntaxError
raise if !recover raise if !recover
end end

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

@ -3269,11 +3269,7 @@ module Prism
# Lazily initialize the parse result. # Lazily initialize the parse result.
def result def result
@result ||= @result ||= Prism.parse(source, partial_script: true)
begin
scopes = RUBY_VERSION >= "3.3.0" ? [] : [[]]
Prism.parse(source, scopes: scopes)
end
end end
########################################################################## ##########################################################################

4
lib/prism/translation/ruby_parser.rb
View File

@ -1596,13 +1596,13 @@ module Prism
# Parse the given source and translate it into the seattlerb/ruby_parser # Parse the given source and translate it into the seattlerb/ruby_parser
# gem's Sexp format. # gem's Sexp format.
def parse(source, filepath = "(string)") def parse(source, filepath = "(string)")
translate(Prism.parse(source, filepath: filepath, scopes: [[]]), filepath) translate(Prism.parse(source, filepath: filepath, partial_script: true), filepath)
end end
# Parse the given file and translate it into the seattlerb/ruby_parser # Parse the given file and translate it into the seattlerb/ruby_parser
# gem's Sexp format. # gem's Sexp format.
def parse_file(filepath) def parse_file(filepath)
translate(Prism.parse_file(filepath, scopes: [[]]), filepath) translate(Prism.parse_file(filepath, partial_script: true), filepath)
end end
class << self class << self