Fix define_exception macro not to depend on local context

youknowone · youknowone · commit 34e951d135d1 · 2021-09-25T21:02:04.000+09:00
diff --git a/derive/src/pyclass.rs b/derive/src/pyclass.rs
@@ -324,11 +324,11 @@ pub(crate) fn impl_define_exception(
         #[pyexception(#class_name, #base_class)]
         #[derive(Debug)]
         #[doc = #docs]
-        struct #class_name {}
+        pub struct #class_name {}
 
         // We need this to make extend mechanism work:
-        impl PyValue for #class_name {
-            fn class(vm: &VirtualMachine) -> &PyTypeRef {
+        impl ::rustpython_vm::PyValue for #class_name {
+            fn class(vm: &::rustpython_vm::VirtualMachine) -> &::rustpython_vm::builtins::PyTypeRef {
                 &vm.ctx.exceptions.#ctx_name
             }
         }
@@ -337,19 +337,19 @@ pub(crate) fn impl_define_exception(
         impl #class_name {
             #[pyslot]
             pub(crate) fn tp_new(
-                cls: PyTypeRef,
-                args: FuncArgs,
-                vm: &VirtualMachine,
-            ) -> PyResult {
+                cls: ::rustpython_vm::builtins::PyTypeRef,
+                args: ::rustpython_vm::function::FuncArgs,
+                vm: &::rustpython_vm::VirtualMachine,
+            ) -> ::rustpython_vm::PyResult {
                 #tp_new_slot
             }
 
             #[pymethod(magic)]
             pub(crate) fn init(
-                zelf: PyRef<PyBaseException>,
-                args: FuncArgs,
-                vm: &VirtualMachine,
-            ) -> PyResult<()> {
+                zelf: ::rustpython_vm::PyRef<::rustpython_vm::exceptions::PyBaseException>,
+                args: ::rustpython_vm::function::FuncArgs,
+                vm: &::rustpython_vm::VirtualMachine,
+            ) -> ::rustpython_vm::PyResult<()> {
                 #init_method
             }
         }
diff --git a/derive/src/util.rs b/derive/src/util.rs
@@ -530,7 +530,7 @@ fn func_sig(sig: &Signature) -> String {
             if ty == "FuncArgs" {
                 return Some("*args, **kwargs".to_owned());
             }
-            if ty == "& VirtualMachine" {
+            if ty.starts_with('&') && ty.ends_with("VirtualMachine") {
                 return None;
             }
             let ident = match arg.pat.as_ref() {

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,7 @@ fn func_sig(sig: &Signature) -> String {`
`530`	`530`	`if ty == "FuncArgs" {`
`531`	`531`	`return Some("args, *kwargs".to_owned());`
`532`	`532`	`}`
`533`		`- if ty == "& VirtualMachine" {`
	`533`	`+ if ty.starts_with('&') && ty.ends_with("VirtualMachine") {`
`534`	`534`	`return None;`
`535`	`535`	`}`
`536`	`536`	`let ident = match arg.pat.as_ref() {`