Use doc comments for python __doc__

coolreader18 · coolreader18 · commit 8376ec2d982b · 2019-03-29T15:17:58.000-05:00
diff --git a/derive/src/lib.rs b/derive/src/lib.rs
@@ -340,7 +340,6 @@ fn impl_py_class(attr: AttributeArgs, item: Item) -> TokenStream2 {
     };
     let rp_path = rustpython_path_attr(&attr);
     let mut class_name = None;
-    let mut doc = None;
     for attr in attr {
         if let NestedMeta::Meta(meta) = attr {
             if let Meta::NameValue(name_value) = meta {
@@ -350,19 +349,35 @@ fn impl_py_class(attr: AttributeArgs, item: Item) -> TokenStream2 {
                     } else {
                         panic!("#[py_class(name = ...)] must be a string");
                     }
-                } else if name_value.ident == "doc" {
-                    if let Lit::Str(s) = name_value.lit {
-                        doc = Some(s.value());
-                    } else {
-                        panic!("#[py_class(name = ...)] must be a string");
-                    }
                 }
             }
         }
     }
     let class_name = class_name.expect("#[py_class] must have a name");
+    let mut doc: Option<Vec<String>> = None;
+    for attr in imp.attrs.iter() {
+        if attr.path.is_ident("doc") {
+            let meta = attr.parse_meta().expect("expected doc attr to be a meta");
+            if let Meta::NameValue(name_value) = meta {
+                if let Lit::Str(s) = name_value.lit {
+                    let val = s.value().trim().to_string();
+                    match doc {
+                        Some(ref mut doc) => doc.push(val),
+                        None => doc = Some(vec![val]),
+                    }
+                } else {
+                    panic!("expected #[doc = ...] to be a string")
+                }
+            } else {
+                panic!("expected #[doc] to be a NameValue, e.g. #[doc = \"...\"");
+            }
+        }
+    }
     let doc = match doc {
-        Some(doc) => quote!(Some(#doc)),
+        Some(doc) => {
+            let doc = doc.join("\n");
+            quote!(Some(#doc))
+        }
         None => quote!(None),
     };
     let ty = &imp.self_ty;
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -60,20 +60,17 @@ fn get_fill_char<'a>(rep: &'a OptionalArg<PyStringRef>, vm: &VirtualMachine) ->
     }
 }
 
-#[py_class(
-    __inside_vm,
-    name = "str",
-    doc = "str(object='') -> str\n\
-           str(bytes_or_buffer[, encoding[, errors]]) -> str\n\
-           \n\
-           Create a new string object from the given object. If encoding or\n\
-           errors is specified, then the object must expose a data buffer\n\
-           that will be decoded using the given encoding and error handler.\n\
-           Otherwise, returns the result of object.__str__() (if defined)\n\
-           or repr(object).\n\
-           encoding defaults to sys.getdefaultencoding().\n\
-           errors defaults to 'strict'."
-)]
+#[py_class(__inside_vm, name = "str")]
+/// str(object='') -> str
+/// str(bytes_or_buffer[, encoding[, errors]]) -> str
+///
+/// Create a new string object from the given object. If encoding or
+/// errors is specified, then the object must expose a data buffer
+/// that will be decoded using the given encoding and error handler.
+/// Otherwise, returns the result of object.__str__() (if defined)
+/// or repr(object).
+/// encoding defaults to sys.getdefaultencoding().
+/// errors defaults to 'strict'."
 impl PyStringRef {
     // TODO: should with following format
     // class str(object='')
