Skip to content

Convert new_X_error to use a macro #5814

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
youknowone merged 3 commits into from
Jun 22, 2025
Merged

Convert new_X_error to use a macro #5814

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d2ad45
Convert `new_X_error` to use a macro
ShaharNaveh Jun 22, 2025
6ad177a
Update vm/src/vm/vm_new.rs
ShaharNaveh Jun 22, 2025
6fa026b
Macro now contains doc
ShaharNaveh Jun 22, 2025
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
Prev Previous commit
Macro now contains doc
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Jun 22, 2025
commit 6fa026be353949fa8e5b6f4d9b76cccc128ebc41
61 changes: 26 additions & 35 deletions vm/src/vm/vm_new.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,14 @@ use crate::{
};

macro_rules! define_exception_fn {
// With doc
(
fn $fn_name:ident, $attr:ident,
doc = $doc:literal
) => {
#[doc = $doc]
pub fn $fn_name(&self, msg: String) -> PyBaseExceptionRef {
let err = self.ctx.exceptions.$attr.to_owned();
self.new_exception_msg(err, msg)
}
};

// Without doc
(
$fn_name:ident, $attr:ident
fn $fn_name:ident, $attr:ident, $python_repr:ident
) => {
#[doc = concat!(
"Create a new python ",
stringify!($python_repr),
" object.\nUseful for raising errors from python functions implemented in rust."
)]
pub fn $fn_name(&self, msg: String) -> PyBaseExceptionRef {
let err = self.ctx.exceptions.$attr.to_owned();
self.new_exception_msg(err, msg)
Expand Down Expand Up @@ -547,32 +539,31 @@ impl VirtualMachine {
)
}

define_exception_fn!(new_lookup_error, lookup_error);
define_exception_fn!(new_eof_error, eof_error);
define_exception_fn!(new_attribute_error, attribute_error);
define_exception_fn!(new_type_error, type_error);
define_exception_fn!(new_os_error, os_error);
define_exception_fn!(new_system_error, system_error);
define_exception_fn!(fn new_lookup_error, lookup_error, LookupError);
define_exception_fn!(fn new_eof_error, eof_error, EOFError);
define_exception_fn!(fn new_attribute_error, attribute_error, AttributeError);
define_exception_fn!(fn new_type_error, type_error, TypeError);
define_exception_fn!(fn new_os_error, os_error, OSError);
define_exception_fn!(fn new_system_error, system_error, SystemError);

// TODO: remove & replace with new_unicode_decode_error_real
define_exception_fn!(new_unicode_decode_error, unicode_decode_error);
define_exception_fn!(fn new_unicode_decode_error, unicode_decode_error, UnicodeDecodeError);

// TODO: remove & replace with new_unicode_encode_error_real
define_exception_fn!(new_unicode_encode_error, unicode_encode_error);
define_exception_fn!(fn new_unicode_encode_error, unicode_encode_error, UnicodeEncodeError);

define_exception_fn!(fn new_value_error, value_error, ValueError);

define_exception_fn!(fn new_buffer_error, buffer_error, BufferError);
define_exception_fn!(fn new_index_error, index_error, IndexError);
define_exception_fn!(
new_value_error,
value_error,
doc = "Create a new python ValueError object.
Useful for raising errors from python functions implemented in rust."
fn new_not_implemented_error,
not_implemented_error,
NotImplementedError
);

define_exception_fn!(new_buffer_error, buffer_error);
define_exception_fn!(new_index_error, index_error);
define_exception_fn!(new_not_implemented_error, not_implemented_error);
define_exception_fn!(new_recursion_error, recursion_error);
define_exception_fn!(new_zero_division_error, zero_division_error);
define_exception_fn!(new_overflow_error, overflow_error);
define_exception_fn!(new_runtime_error, runtime_error);
define_exception_fn!(new_memory_error, memory_error);
define_exception_fn!(fn new_recursion_error, recursion_error, RecursionError);
define_exception_fn!(fn new_zero_division_error, zero_division_error, ZeroDivisionError);
define_exception_fn!(fn new_overflow_error, overflow_error, OverflowError);
define_exception_fn!(fn new_runtime_error, runtime_error, RuntimeError);
define_exception_fn!(fn new_memory_error, memory_error, MemoryError);
}
Loading