pymethod(raw)

RustPython · youknowone · Jun 22, 2024 · Jun 21, 2024 · Jun 21, 2024 · Jun 21, 2024
commit 64cff172a1ddb04bb61977dd7d47967623fa5dd1
diff --git a/derive-impl/src/pyclass.rs b/derive-impl/src/pyclass.rs
@@ -752,6 +752,7 @@ where
         let item_meta = MethodItemMeta::from_attr(ident.clone(), &item_attr)?;
 
         let py_name = item_meta.method_name()?;
+        let raw = item_meta.raw()?;
         let sig_doc = text_signature(func.sig(), &py_name);
 
         let doc = args.attrs.doc().map(|doc| format_doc(&sig_doc, &doc));
@@ -760,6 +761,7 @@ where
             cfgs: args.cfgs.to_vec(),
             ident: ident.to_owned(),
             doc,
+            raw,
             attr_name: self.inner.attr_name,
         });
         Ok(())
@@ -954,6 +956,7 @@ struct MethodNurseryItem {
     py_name: String,
     cfgs: Vec<Attribute>,
     ident: Ident,
+    raw: bool,
     doc: Option<String>,
     attr_name: AttrName,
 }
@@ -1005,9 +1008,14 @@ impl ToTokens for MethodNursery {
             // } else {
             //     quote_spanned! { ident.span() => #py_name }
             // };
+            let method_new = if item.raw {
+                quote!(new_raw_const)
+            } else {
+                quote!(new_const)
+            };
             inner_tokens.extend(quote! [
                 #(#cfgs)*
-                rustpython_vm::function::PyMethodDef::new_const(
+                rustpython_vm::function::PyMethodDef::#method_new(
                     #py_name,
                     Self::#ident,
                     #flags,
@@ -1203,7 +1211,7 @@ impl ToTokens for MemberNursery {
 struct MethodItemMeta(ItemMetaInner);
 
 impl ItemMeta for MethodItemMeta {
-    const ALLOWED_NAMES: &'static [&'static str] = &["name", "magic"];
+    const ALLOWED_NAMES: &'static [&'static str] = &["name", "magic", "raw"];
 
     fn from_inner(inner: ItemMetaInner) -> Self {
         Self(inner)
@@ -1214,6 +1222,9 @@ impl ItemMeta for MethodItemMeta {
 }
 
 impl MethodItemMeta {
+    fn raw(&self) -> Result<bool> {
+        self.inner()._bool("raw")
+    }
     fn method_name(&self) -> Result<String> {
         let inner = self.inner();
         let name = inner._optional_str("name")?;

diff --git a/vm/src/function/builtin.rs b/vm/src/function/builtin.rs
@@ -81,6 +81,11 @@ pub const fn static_func<Kind, F: IntoPyNativeFn<Kind>>(f: F) -> &'static dyn Py
     zst_ref_out_of_thin_air(into_func(f))
 }
 
+#[inline(always)]
+pub const fn static_raw_func<F: PyNativeFn>(f: F) -> &'static dyn PyNativeFn {
+    zst_ref_out_of_thin_air(f)
+}
+
 // TODO: once higher-rank trait bounds are stabilized, remove the `Kind` type
 // parameter and impl for F where F: for<T, R, VM> PyNativeFnInternal<T, R, VM>
 impl<F, T, R, VM> IntoPyNativeFn<(T, R, VM)> for F

diff --git a/vm/src/function/method.rs b/vm/src/function/method.rs
@@ -87,6 +87,21 @@ impl PyMethodDef {
         }
     }
 
+    #[inline]
+    pub const fn new_raw_const(
+        name: &'static str,
+        func: impl PyNativeFn,
+        flags: PyMethodFlags,
+        doc: Option<&'static str>,
+    ) -> Self {
+        Self {
+            name,
+            func: super::static_raw_func(func),
+            flags,
+            doc,
+        }
+    }
+
     pub fn to_proper_method(
         &'static self,
         class: &'static Py<PyType>,

diff --git a/vm/src/function/mod.rs b/vm/src/function/mod.rs
@@ -15,7 +15,7 @@ pub use argument::{
 };
 pub use arithmetic::{PyArithmeticValue, PyComparisonValue};
 pub use buffer::{ArgAsciiBuffer, ArgBytesLike, ArgMemoryBuffer, ArgStrOrBytesLike};
-pub use builtin::{static_func, IntoPyNativeFn, PyNativeFn};
+pub use builtin::{static_func, static_raw_func, IntoPyNativeFn, PyNativeFn};
 pub use either::Either;
 pub use fspath::FsPath;
 pub use getset::PySetterValue;