Merge pull request 370 from adetaylor/allow-namespace-override
diff --git a/syntax/parse.rs b/syntax/parse.rs
index 3f579a1..7a56ab8 100644
--- a/syntax/parse.rs
+++ b/syntax/parse.rs
@@ -3,8 +3,9 @@
use crate::syntax::report::Errors;
use crate::syntax::Atom::*;
use crate::syntax::{
- attrs, error, Api, Doc, Enum, ExternFn, ExternType, Impl, Include, IncludeKind, Lang, Pair,
- Receiver, Ref, Signature, Slice, Struct, Ty1, Type, TypeAlias, Var, Variant,
+ attrs, error, Api, CppName, Doc, Enum, ExternFn, ExternType, Impl, Include, IncludeKind, Lang,
+ Namespace, Pair, Receiver, Ref, ResolvableName, Signature, Slice, Struct, Ty1, Type, TypeAlias,
+ Var, Variant,
};
use proc_macro2::{Delimiter, Group, TokenStream, TokenTree};
use quote::{format_ident, quote, quote_spanned};
@@ -20,20 +21,22 @@
syn::custom_keyword!(Result);
}
-pub fn parse_items(cx: &mut Errors, items: Vec<Item>, trusted: bool) -> Vec<Api> {
+pub fn parse_items(cx: &mut Errors, items: Vec<Item>, trusted: bool, ns: &Namespace) -> Vec<Api> {
let mut apis = Vec::new();
for item in items {
match item {
- Item::Struct(item) => match parse_struct(cx, item) {
+ Item::Struct(item) => match parse_struct(cx, item, ns.clone()) {
Ok(strct) => apis.push(strct),
Err(err) => cx.push(err),
},
- Item::Enum(item) => match parse_enum(cx, item) {
+ Item::Enum(item) => match parse_enum(cx, item, ns.clone()) {
Ok(enm) => apis.push(enm),
Err(err) => cx.push(err),
},
- Item::ForeignMod(foreign_mod) => parse_foreign_mod(cx, foreign_mod, &mut apis, trusted),
- Item::Impl(item) => match parse_impl(item) {
+ Item::ForeignMod(foreign_mod) => {
+ parse_foreign_mod(cx, foreign_mod, &mut apis, trusted, ns)
+ }
+ Item::Impl(item) => match parse_impl(item, ns) {
Ok(imp) => apis.push(imp),
Err(err) => cx.push(err),
},
@@ -44,7 +47,7 @@
apis
}
-fn parse_struct(cx: &mut Errors, item: ItemStruct) -> Result<Api> {
+fn parse_struct(cx: &mut Errors, item: ItemStruct, mut ns: Namespace) -> Result<Api> {
let generics = &item.generics;
if !generics.params.is_empty() || generics.where_clause.is_some() {
let struct_token = item.struct_token;
@@ -65,6 +68,7 @@
attrs::Parser {
doc: Some(&mut doc),
derives: Some(&mut derives),
+ namespace: Some(&mut ns),
..Default::default()
},
);
@@ -81,7 +85,7 @@
doc,
derives,
struct_token: item.struct_token,
- ident: item.ident,
+ ident: Pair::new(ns.clone(), item.ident),
brace_token: fields.brace_token,
fields: fields
.named
@@ -89,14 +93,14 @@
.map(|field| {
Ok(Var {
ident: field.ident.unwrap(),
- ty: parse_type(&field.ty)?,
+ ty: parse_type(&field.ty, &ns)?,
})
})
.collect::<Result<_>>()?,
}))
}
-fn parse_enum(cx: &mut Errors, item: ItemEnum) -> Result<Api> {
+fn parse_enum(cx: &mut Errors, item: ItemEnum, mut ns: Namespace) -> Result<Api> {
let generics = &item.generics;
if !generics.params.is_empty() || generics.where_clause.is_some() {
let enum_token = item.enum_token;
@@ -117,6 +121,7 @@
attrs::Parser {
doc: Some(&mut doc),
repr: Some(&mut repr),
+ namespace: Some(&mut ns),
..Default::default()
},
);
@@ -167,7 +172,7 @@
Ok(Api::Enum(Enum {
doc,
enum_token,
- ident: item.ident,
+ ident: Pair::new(ns, item.ident),
brace_token,
variants,
repr,
@@ -179,6 +184,7 @@
foreign_mod: ItemForeignMod,
out: &mut Vec<Api>,
trusted: bool,
+ ns: &Namespace,
) {
let lang = match parse_lang(&foreign_mod.abi) {
Ok(lang) => lang,
@@ -202,11 +208,13 @@
let mut items = Vec::new();
for foreign in &foreign_mod.items {
match foreign {
- ForeignItem::Type(foreign) => match parse_extern_type(cx, foreign, lang, trusted) {
- Ok(ety) => items.push(ety),
- Err(err) => cx.push(err),
- },
- ForeignItem::Fn(foreign) => match parse_extern_fn(cx, foreign, lang) {
+ ForeignItem::Type(foreign) => {
+ match parse_extern_type(cx, foreign, lang, trusted, ns.clone()) {
+ Ok(ety) => items.push(ety),
+ Err(err) => cx.push(err),
+ }
+ }
+ ForeignItem::Fn(foreign) => match parse_extern_fn(cx, foreign, lang, ns.clone()) {
Ok(efn) => items.push(efn),
Err(err) => cx.push(err),
},
@@ -216,10 +224,12 @@
Err(err) => cx.push(err),
}
}
- ForeignItem::Verbatim(tokens) => match parse_extern_verbatim(cx, tokens, lang) {
- Ok(api) => items.push(api),
- Err(err) => cx.push(err),
- },
+ ForeignItem::Verbatim(tokens) => {
+ match parse_extern_verbatim(cx, tokens, lang, ns.clone()) {
+ Ok(api) => items.push(api),
+ Err(err) => cx.push(err),
+ }
+ }
_ => cx.error(foreign, "unsupported foreign item"),
}
}
@@ -234,8 +244,8 @@
for item in &mut items {
if let Api::CxxFunction(efn) | Api::RustFunction(efn) = item {
if let Some(receiver) = &mut efn.receiver {
- if receiver.ty == "Self" {
- receiver.ty = single_type.clone();
+ if receiver.ty.is_self() {
+ receiver.ty = ResolvableName::from_pair(single_type.clone());
}
}
}
@@ -267,8 +277,18 @@
foreign_type: &ForeignItemType,
lang: Lang,
trusted: bool,
+ mut ns: Namespace,
) -> Result<Api> {
- let doc = attrs::parse_doc(cx, &foreign_type.attrs);
+ let mut doc = Doc::new();
+ attrs::parse(
+ cx,
+ &foreign_type.attrs,
+ attrs::Parser {
+ doc: Some(&mut doc),
+ namespace: Some(&mut ns),
+ ..Default::default()
+ },
+ );
let type_token = foreign_type.type_token;
let ident = foreign_type.ident.clone();
let semi_token = foreign_type.semi_token;
@@ -279,13 +299,18 @@
Ok(api_type(ExternType {
doc,
type_token,
- ident,
+ ident: Pair::new(ns, ident),
semi_token,
trusted,
}))
}
-fn parse_extern_fn(cx: &mut Errors, foreign_fn: &ForeignItemFn, lang: Lang) -> Result<Api> {
+fn parse_extern_fn(
+ cx: &mut Errors,
+ foreign_fn: &ForeignItemFn,
+ lang: Lang,
+ mut ns: Namespace,
+) -> Result<Api> {
let generics = &foreign_fn.sig.generics;
if !generics.params.is_empty() || generics.where_clause.is_some() {
return Err(Error::new_spanned(
@@ -310,6 +335,7 @@
doc: Some(&mut doc),
cxx_name: Some(&mut cxx_name),
rust_name: Some(&mut rust_name),
+ namespace: Some(&mut ns),
..Default::default()
},
);
@@ -326,7 +352,7 @@
lifetime: lifetime.clone(),
mutability: arg.mutability,
var: arg.self_token,
- ty: Token.into(),
+ ty: ResolvableName::make_self(arg.self_token.span),
shorthand: true,
});
continue;
@@ -341,7 +367,7 @@
}
_ => return Err(Error::new_spanned(arg, "unsupported signature")),
};
- let ty = parse_type(&arg.ty)?;
+ let ty = parse_type(&arg.ty, &ns)?;
if ident != "self" {
args.push_value(Var { ident, ty });
if let Some(comma) = comma {
@@ -355,7 +381,7 @@
ampersand: reference.ampersand,
lifetime: reference.lifetime,
mutability: reference.mutability,
- var: Token),
+ var: Token),
ty: ident,
shorthand: false,
});
@@ -368,12 +394,12 @@
}
let mut throws_tokens = None;
- let ret = parse_return_type(&foreign_fn.sig.output, &mut throws_tokens)?;
+ let ret = parse_return_type(&foreign_fn.sig.output, &mut throws_tokens, &ns)?;
let throws = throws_tokens.is_some();
let unsafety = foreign_fn.sig.unsafety;
let fn_token = foreign_fn.sig.fn_token;
let ident = Pair {
- cxx: cxx_name.unwrap_or(foreign_fn.sig.ident.clone()),
+ cxx: CppName::new(ns, cxx_name.unwrap_or(foreign_fn.sig.ident.clone())),
rust: rust_name.unwrap_or(foreign_fn.sig.ident.clone()),
};
let paren_token = foreign_fn.sig.paren_token;
@@ -401,7 +427,12 @@
}))
}
-fn parse_extern_verbatim(cx: &mut Errors, tokens: &TokenStream, lang: Lang) -> Result<Api> {
+fn parse_extern_verbatim(
+ cx: &mut Errors,
+ tokens: &TokenStream,
+ lang: Lang,
+ mut ns: Namespace,
+) -> Result<Api> {
// type Alias = crate::path::to::Type;
let parse = |input: ParseStream| -> Result<TypeAlias> {
let attrs = input.call(Attribute::parse_outer)?;
@@ -416,12 +447,21 @@
let eq_token: Token![=] = input.parse()?;
let ty: RustType = input.parse()?;
let semi_token: Token![;] = input.parse()?;
- let doc = attrs::parse_doc(cx, &attrs);
+ let mut doc = Doc::new();
+ attrs::parse(
+ cx,
+ &attrs,
+ attrs::Parser {
+ doc: Some(&mut doc),
+ namespace: Some(&mut ns),
+ ..Default::default()
+ },
+ );
Ok(TypeAlias {
doc,
type_token,
- ident,
+ ident: Pair::new(ns, ident),
eq_token,
ty,
semi_token,
@@ -440,7 +480,7 @@
}
}
-fn parse_impl(imp: ItemImpl) -> Result<Api> {
+fn parse_impl(imp: ItemImpl, ns: &Namespace) -> Result<Api> {
if !imp.items.is_empty() {
let mut span = Group::new(Delimiter::Brace, TokenStream::new());
span.set_span(imp.brace_token.span);
@@ -466,7 +506,7 @@
Ok(Api::Impl(Impl {
impl_token: imp.impl_token,
- ty: parse_type(&self_ty)?,
+ ty: parse_type(&self_ty, ns)?,
brace_token: imp.brace_token,
}))
}
@@ -515,21 +555,21 @@
Err(input.error("expected \"quoted/path/to\" or <bracketed/path/to>"))
}
-fn parse_type(ty: &RustType) -> Result<Type> {
+fn parse_type(ty: &RustType, ns: &Namespace) -> Result<Type> {
match ty {
- RustType::Reference(ty) => parse_type_reference(ty),
- RustType::Path(ty) => parse_type_path(ty),
- RustType::Slice(ty) => parse_type_slice(ty),
- RustType::BareFn(ty) => parse_type_fn(ty),
+ RustType::Reference(ty) => parse_type_reference(ty, ns),
+ RustType::Path(ty) => parse_type_path(ty, ns),
+ RustType::Slice(ty) => parse_type_slice(ty, ns),
+ RustType::BareFn(ty) => parse_type_fn(ty, ns),
RustType::Tuple(ty) if ty.elems.is_empty() => Ok(Type::Void(ty.paren_token.span)),
_ => Err(Error::new_spanned(ty, "unsupported type")),
}
}
-fn parse_type_reference(ty: &TypeReference) -> Result<Type> {
- let inner = parse_type(&ty.elem)?;
+fn parse_type_reference(ty: &TypeReference, ns: &Namespace) -> Result<Type> {
+ let inner = parse_type(&ty.elem, ns)?;
let which = match &inner {
- Type::Ident(ident) if ident == "str" => {
+ Type::Ident(ident) if ident.rust == "str" => {
if ty.mutability.is_some() {
return Err(Error::new_spanned(ty, "unsupported type"));
} else {
@@ -537,7 +577,7 @@
}
}
Type::Slice(slice) => match &slice.inner {
- Type::Ident(ident) if ident == U8 && ty.mutability.is_none() => Type::SliceRefU8,
+ Type::Ident(ident) if ident.rust == U8 && ty.mutability.is_none() => Type::SliceRefU8,
_ => Type::Ref,
},
_ => Type::Ref,
@@ -550,19 +590,20 @@
})))
}
-fn parse_type_path(ty: &TypePath) -> Result<Type> {
+fn parse_type_path(ty: &TypePath, ns: &Namespace) -> Result<Type> {
let path = &ty.path;
if ty.qself.is_none() && path.leading_colon.is_none() && path.segments.len() == 1 {
let segment = &path.segments[0];
let ident = segment.ident.clone();
+ let maybe_resolved_ident = ResolvableName::new(ident.clone());
match &segment.arguments {
- PathArguments::None => return Ok(Type::Ident(ident)),
+ PathArguments::None => return Ok(Type::Ident(maybe_resolved_ident)),
PathArguments::AngleBracketed(generic) => {
if ident == "UniquePtr" && generic.args.len() == 1 {
if let GenericArgument::Type(arg) = &generic.args[0] {
- let inner = parse_type(arg)?;
+ let inner = parse_type(arg, ns)?;
return Ok(Type::UniquePtr(Box::new(Ty1 {
- name: ident,
+ name: maybe_resolved_ident,
langle: generic.lt_token,
inner,
rangle: generic.gt_token,
@@ -570,9 +611,9 @@
}
} else if ident == "CxxVector" && generic.args.len() == 1 {
if let GenericArgument::Type(arg) = &generic.args[0] {
- let inner = parse_type(arg)?;
+ let inner = parse_type(arg, ns)?;
return Ok(Type::CxxVector(Box::new(Ty1 {
- name: ident,
+ name: maybe_resolved_ident,
langle: generic.lt_token,
inner,
rangle: generic.gt_token,
@@ -580,9 +621,9 @@
}
} else if ident == "Box" && generic.args.len() == 1 {
if let GenericArgument::Type(arg) = &generic.args[0] {
- let inner = parse_type(arg)?;
+ let inner = parse_type(arg, ns)?;
return Ok(Type::RustBox(Box::new(Ty1 {
- name: ident,
+ name: maybe_resolved_ident,
langle: generic.lt_token,
inner,
rangle: generic.gt_token,
@@ -590,9 +631,9 @@
}
} else if ident == "Vec" && generic.args.len() == 1 {
if let GenericArgument::Type(arg) = &generic.args[0] {
- let inner = parse_type(arg)?;
+ let inner = parse_type(arg, ns)?;
return Ok(Type::RustVec(Box::new(Ty1 {
- name: ident,
+ name: maybe_resolved_ident,
langle: generic.lt_token,
inner,
rangle: generic.gt_token,
@@ -606,15 +647,15 @@
Err(Error::new_spanned(ty, "unsupported type"))
}
-fn parse_type_slice(ty: &TypeSlice) -> Result<Type> {
- let inner = parse_type(&ty.elem)?;
+fn parse_type_slice(ty: &TypeSlice, ns: &Namespace) -> Result<Type> {
+ let inner = parse_type(&ty.elem, ns)?;
Ok(Type::Slice(Box::new(Slice {
bracket: ty.bracket_token,
inner,
})))
}
-fn parse_type_fn(ty: &TypeBareFn) -> Result<Type> {
+fn parse_type_fn(ty: &TypeBareFn, ns: &Namespace) -> Result<Type> {
if ty.lifetimes.is_some() {
return Err(Error::new_spanned(
ty,
@@ -632,7 +673,7 @@
.iter()
.enumerate()
.map(|(i, arg)| {
- let ty = parse_type(&arg.ty)?;
+ let ty = parse_type(&arg.ty, ns)?;
let ident = match &arg.name {
Some(ident) => ident.0.clone(),
None => format_ident!("_{}", i),
@@ -641,7 +682,7 @@
})
.collect::<Result<_>>()?;
let mut throws_tokens = None;
- let ret = parse_return_type(&ty.output, &mut throws_tokens)?;
+ let ret = parse_return_type(&ty.output, &mut throws_tokens, ns)?;
let throws = throws_tokens.is_some();
Ok(Type::Fn(Box::new(Signature {
unsafety: ty.unsafety,
@@ -658,6 +699,7 @@
fn parse_return_type(
ty: &ReturnType,
throws_tokens: &mut Option<(kw::Result, Token![<], Token![>])>,
+ ns: &Namespace,
) -> Result<Option<Type>> {
let mut ret = match ty {
ReturnType::Default => return Ok(None),
@@ -679,7 +721,7 @@
}
}
}
- match parse_type(ret)? {
+ match parse_type(ret, ns)? {
Type::Void(_) => Ok(None),
ty => Ok(Some(ty)),
}