Store enum variant name as Pair
diff --git a/syntax/ident.rs b/syntax/ident.rs
index aaf7832..47aae14 100644
--- a/syntax/ident.rs
+++ b/syntax/ident.rs
@@ -32,7 +32,7 @@
Api::Enum(enm) => {
check_ident(cx, &enm.name);
for variant in &enm.variants {
- check(cx, &variant.ident);
+ check(cx, &variant.name.rust);
}
}
Api::CxxType(ety) | Api::RustType(ety) => {
diff --git a/syntax/mod.rs b/syntax/mod.rs
index 4cedc28..7f8fd9a 100644
--- a/syntax/mod.rs
+++ b/syntax/mod.rs
@@ -159,7 +159,7 @@
}
pub struct Variant {
- pub ident: Ident,
+ pub name: Pair,
pub discriminant: Discriminant,
pub expr: Option<Expr>,
}
diff --git a/syntax/parse.rs b/syntax/parse.rs
index e8bef90..8429d80 100644
--- a/syntax/parse.rs
+++ b/syntax/parse.rs
@@ -212,10 +212,12 @@
Ok(discriminant) => discriminant,
Err(err) => return Err(Error::new_spanned(variant, err)),
};
+
+ let name = pair(Namespace::ROOT, &variant.ident, None, None);
let expr = variant.discriminant.map(|(_, expr)| expr);
Ok(Variant {
- ident: variant.ident,
+ name,
discriminant,
expr,
})