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

[PRISM] Fix error handling in pm_parse_prism

Browse Source 
Following changes made in ruby/prism#2365 this implements error handling
for when `pm_string_mapped_init` returns `false`.

Related: ruby/prism#2207
This commit is contained in:
eileencodes 2024-02-06 17:13:50 -05:00 committed by Kevin Newton
parent 90fe1b4402
commit a3ceb69168
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
prism_compile.c
View File

@ -8153,7 +8153,13 @@ VALUE
pm_parse_file(pm_parse_result_t *result, VALUE filepath) pm_parse_file(pm_parse_result_t *result, VALUE filepath)
{ {
if (!pm_string_mapped_init(&result->input, RSTRING_PTR(filepath))) { if (!pm_string_mapped_init(&result->input, RSTRING_PTR(filepath))) {
return rb_exc_new3(rb_eRuntimeError, rb_sprintf("Failed to map file: %s", RSTRING_PTR(filepath))); #ifdef _WIN32
int e = rb_w32_map_errno(GetLastError());
#else
int e = errno;
#endif
return rb_syserr_new(e, RSTRING_PTR(filepath));
} }
VALUE error = pm_parse_input(result, filepath); VALUE error = pm_parse_input(result, filepath);

16
test/ruby/test_compile_prism.rb
View File

@ -2678,6 +2678,22 @@ end
assert_prism_eval(":però") assert_prism_eval(":però")
end end
def test_parse_file
assert_nothing_raised do
RubyVM::InstructionSequence.compile_file_prism(__FILE__)
end
error = assert_raise Errno::ENOENT do
RubyVM::InstructionSequence.compile_file_prism("idontexist.rb")
end
assert_equal "No such file or directory - idontexist.rb", error.message
assert_raise TypeError do
RubyVM::InstructionSequence.compile_file_prism(nil)
end
end
private private
def compare_eval(source, raw:) def compare_eval(source, raw:)