Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parse namespace attribute on foreign mods #444

Merged
merged 2 commits into from
Nov 11, 2020
Merged

Parse namespace attribute on foreign mods #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
302b175
Consistently use &Namespace in parser function signatures
dtolnay Nov 11, 2020
7feb264
Parse namespace attribute on foreign mods
dtolnay Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion syntax/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ impl Parse for Item {
RustItem::Struct(item) => Ok(Item::Struct(ItemStruct { attrs, ..item })),
RustItem::Enum(item) => Ok(Item::Enum(ItemEnum { attrs, ..item })),
RustItem::ForeignMod(item) => Ok(Item::ForeignMod(ItemForeignMod {
attrs: item.attrs,
attrs,
unsafety,
abi: item.abi,
brace_token: item.brace_token,
Expand Down
64 changes: 40 additions & 24 deletions syntax/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ pub fn parse_items(
let mut apis = Vec::new();
for item in items {
match item {
Item::Struct(item) => match parse_struct(cx, item, namespace.clone()) {
Item::Struct(item) => match parse_struct(cx, item, namespace) {
Ok(strct) => apis.push(strct),
Err(err) => cx.push(err),
},
Item::Enum(item) => match parse_enum(cx, item, namespace.clone()) {
Item::Enum(item) => match parse_enum(cx, item, namespace) {
Ok(enm) => apis.push(enm),
Err(err) => cx.push(err),
},
Expand All @@ -52,7 +52,7 @@ pub fn parse_items(
apis
}

fn parse_struct(cx: &mut Errors, item: ItemStruct, mut namespace: Namespace) -> Result<Api> {
fn parse_struct(cx: &mut Errors, item: ItemStruct, namespace: &Namespace) -> Result<Api> {
let generics = &item.generics;
if !generics.params.is_empty() || generics.where_clause.is_some() {
let struct_token = item.struct_token;
Expand All @@ -67,6 +67,7 @@ fn parse_struct(cx: &mut Errors, item: ItemStruct, mut namespace: Namespace) ->

let mut doc = Doc::new();
let mut derives = Vec::new();
let mut namespace = namespace.clone();
attrs::parse(
cx,
&item.attrs,
Expand All @@ -78,34 +79,36 @@ fn parse_struct(cx: &mut Errors, item: ItemStruct, mut namespace: Namespace) ->
},
);

let fields = match item.fields {
let named_fields = match item.fields {
Fields::Named(fields) => fields,
Fields::Unit => return Err(Error::new_spanned(item, "unit structs are not supported")),
Fields::Unnamed(_) => {
return Err(Error::new_spanned(item, "tuple structs are not supported"));
}
};

let fields = named_fields
.named
.into_iter()
.map(|field| {
Ok(Var {
ident: field.ident.unwrap(),
ty: parse_type(&field.ty, &namespace)?,
})
})
.collect::<Result<_>>()?;

Ok(Api::Struct(Struct {
doc,
derives,
struct_token: item.struct_token,
name: Pair::new(namespace.clone(), item.ident),
brace_token: fields.brace_token,
fields: fields
.named
.into_iter()
.map(|field| {
Ok(Var {
ident: field.ident.unwrap(),
ty: parse_type(&field.ty, &namespace)?,
})
})
.collect::<Result<_>>()?,
name: Pair::new(namespace, item.ident),
brace_token: named_fields.brace_token,
fields,
}))
}

fn parse_enum(cx: &mut Errors, item: ItemEnum, mut namespace: Namespace) -> Result<Api> {
fn parse_enum(cx: &mut Errors, item: ItemEnum, namespace: &Namespace) -> Result<Api> {
let generics = &item.generics;
if !generics.params.is_empty() || generics.where_clause.is_some() {
let enum_token = item.enum_token;
Expand All @@ -120,6 +123,7 @@ fn parse_enum(cx: &mut Errors, item: ItemEnum, mut namespace: Namespace) -> Resu

let mut doc = Doc::new();
let mut repr = None;
let mut namespace = namespace.clone();
attrs::parse(
cx,
&item.attrs,
Expand Down Expand Up @@ -210,17 +214,26 @@ fn parse_foreign_mod(

let trusted = trusted || foreign_mod.unsafety.is_some();

let mut namespace = namespace.clone();
attrs::parse(
cx,
&foreign_mod.attrs,
attrs::Parser {
namespace: Some(&mut namespace),
..Default::default()
},
);

let mut items = Vec::new();
for foreign in &foreign_mod.items {
match foreign {
ForeignItem::Type(foreign) => {
match parse_extern_type(cx, foreign, lang, trusted, namespace.clone()) {
match parse_extern_type(cx, foreign, lang, trusted, &namespace) {
Ok(ety) => items.push(ety),
Err(err) => cx.push(err),
}
}
ForeignItem::Fn(foreign) => match parse_extern_fn(cx, foreign, lang, namespace.clone())
{
ForeignItem::Fn(foreign) => match parse_extern_fn(cx, foreign, lang, &namespace) {
Ok(efn) => items.push(efn),
Err(err) => cx.push(err),
},
Expand All @@ -231,7 +244,7 @@ fn parse_foreign_mod(
}
}
ForeignItem::Verbatim(tokens) => {
match parse_extern_verbatim(cx, tokens, lang, namespace.clone()) {
match parse_extern_verbatim(cx, tokens, lang, &namespace) {
Ok(api) => items.push(api),
Err(err) => cx.push(err),
}
Expand Down Expand Up @@ -283,9 +296,10 @@ fn parse_extern_type(
foreign_type: &ForeignItemType,
lang: Lang,
trusted: bool,
mut namespace: Namespace,
namespace: &Namespace,
) -> Result<Api> {
let mut doc = Doc::new();
let mut namespace = namespace.clone();
attrs::parse(
cx,
&foreign_type.attrs,
Expand Down Expand Up @@ -315,7 +329,7 @@ fn parse_extern_fn(
cx: &mut Errors,
foreign_fn: &ForeignItemFn,
lang: Lang,
mut namespace: Namespace,
namespace: &Namespace,
) -> Result<Api> {
let generics = &foreign_fn.sig.generics;
if !generics.params.is_empty() || generics.where_clause.is_some() {
Expand All @@ -334,6 +348,7 @@ fn parse_extern_fn(
let mut doc = Doc::new();
let mut cxx_name = None;
let mut rust_name = None;
let mut namespace = namespace.clone();
attrs::parse(
cx,
&foreign_fn.attrs,
Expand Down Expand Up @@ -438,7 +453,7 @@ fn parse_extern_verbatim(
cx: &mut Errors,
tokens: &TokenStream,
lang: Lang,
mut namespace: Namespace,
namespace: &Namespace,
) -> Result<Api> {
// type Alias = crate::path::to::Type;
let parse = |input: ParseStream| -> Result<TypeAlias> {
Expand All @@ -455,6 +470,7 @@ fn parse_extern_verbatim(
let ty: RustType = input.parse()?;
let semi_token: Token![;] = input.parse()?;
let mut doc = Doc::new();
let mut namespace = namespace.clone();
attrs::parse(
cx,
&attrs,
Expand Down