topjohnwu/cxx
1
0
Fork 0
mirror of https://github.com/topjohnwu/cxx.git synced 2024-11-23 20:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Parse cxx_name and rust_name attributes on enum variants

Browse Source
This commit is contained in:
David Tolnay 2020-12-21 16:11:40 -08:00
parent e6f6214c00
commit 6bf9ef4749
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
syntax/parse.rs
View File

@ -157,7 +157,7 @@ fn parse_enum(cx: &mut Errors, item: ItemEnum, namespace: &Namespace) -> Result<
let mut variants = Vec::new();
let mut discriminants = DiscriminantSet::new(repr);
for variant in item.variants {
match parse_variant(variant, &mut discriminants) {
match parse_variant(cx, variant, &mut discriminants) {
Ok(variant) => variants.push(variant),
Err(err) => cx.push(err),
}
@ -194,7 +194,23 @@ fn parse_enum(cx: &mut Errors, item: ItemEnum, namespace: &Namespace) -> Result<
}))
}
fn parse_variant(variant: RustVariant, discriminants: &mut DiscriminantSet) -> Result<Variant> {
fn parse_variant(
cx: &mut Errors,
variant: RustVariant,
discriminants: &mut DiscriminantSet,
) -> Result<Variant> {
let mut cxx_name = None;
let mut rust_name = None;
attrs::parse(
cx,
&variant.attrs,
attrs::Parser {
cxx_name: Some(&mut cxx_name),
rust_name: Some(&mut rust_name),
..Default::default()
},
);
match variant.fields {
Fields::Unit => {}
_ => {
@ -213,7 +229,7 @@ fn parse_variant(variant: RustVariant, discriminants: &mut DiscriminantSet) -> R
Err(err) => return Err(Error::new_spanned(variant, err)),
};
let name = pair(Namespace::ROOT, &variant.ident, None, None);
let name = pair(Namespace::ROOT, &variant.ident, cxx_name, rust_name);
let expr = variant.discriminant.map(|(_, expr)| expr);
Ok(Variant {