poc py::function

youknowone · youknowone · commit f362a40cff04 · 2022-04-20T00:04:36.000+09:00
diff --git a/derive/src/pymodule.rs b/derive/src/pymodule.rs
@@ -169,13 +169,11 @@ where
     while let Some((_, attr)) = iter.peek() {
         // take all cfgs but no py items
         let attr = *attr;
-        if let Some(ident) = attr.get_ident() {
-            let attr_name = ident.to_string();
-            if attr_name == "cfg" {
-                cfgs.push(attr.clone());
-            } else if ALL_ALLOWED_NAMES.contains(&attr_name.as_str()) {
-                break;
-            }
+        let attr_path = attr.path_string();
+        if attr_path == "cfg" {
+            cfgs.push(attr.clone());
+        } else if attr_path.starts_with("py") {
+            break;
         }
         iter.next();
     }
@@ -184,7 +182,7 @@ where
     let mut pyattrs = Vec::new();
     for (i, attr) in iter {
         // take py items but no cfgs
-        let attr_name = attr.path.to_string();
+        let attr_name = attr.path_string();
         if attr_name == "cfg" {
             return Err(syn::Error::new_spanned(
                 attr,
diff --git a/derive/src/util.rs b/derive/src/util.rs
@@ -380,7 +380,15 @@ impl AttributeExt for Attribute {
         Ok(list.nested)
     }
     fn ident_and_promoted_nested(&self) -> Result<(&Ident, PunctuatedNestedMeta)> {
-        Ok((self.get_ident().unwrap(), self.promoted_nested()?))
+        let ident = self.get_ident().unwrap_or_else(|| {
+            &self
+                .path
+                .segments
+                .last()
+                .expect("py:: paths always have segment")
+                .ident
+        });
+        Ok((ident, self.promoted_nested()?))
     }
 
     fn try_remove_name(&mut self, item_name: &str) -> Result<Option<syn::NestedMeta>> {
diff --git a/vm/src/stdlib/builtins.rs b/vm/src/stdlib/builtins.rs
@@ -37,7 +37,7 @@ mod builtins {
     };
     use num_traits::{Signed, ToPrimitive, Zero};
 
-    #[pyfunction]
+    #[py::function]
     fn abs(x: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         vm._abs(&x)
     }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ mod builtins {`
`37`	`37`	`};`
`38`	`38`	`use num_traits::{Signed, ToPrimitive, Zero};`
`39`	`39`
`40`		`- #[pyfunction]`
	`40`	`+ #[py::function]`
`41`	`41`	`fn abs(x: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
`42`	`42`	`vm._abs(&x)`
`43`	`43`	`}`