topjohnwu/cxx
1
0
Fork 0
mirror of https://github.com/topjohnwu/cxx.git synced 2025-02-25 02:20:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Demarcate the infallible majority of expand.rs

Browse Source
This commit is contained in:
David Tolnay 2020-05-03 23:51:14 -07:00
parent 0dd85ff5f7
commit cbf3f03ff2
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
macro/src/expand.rs
View File

@ -9,10 +9,9 @@ use proc_macro2::{Ident, Span, TokenStream};
use quote::{format_ident, quote, quote_spanned, ToTokens};
use syn::{parse_quote, Error, ItemMod, Result, Token};
pub fn bridge(namespace: &Namespace, ffi: ItemMod) -> Result<TokenStream> {
pub fn bridge(namespace: &Namespace, mut ffi: ItemMod) -> Result<TokenStream> {
let ref mut errors = Errors::new();
let ident = &ffi.ident;
let content = ffi.content.ok_or(Error::new(
let content = ffi.content.take().ok_or(Error::new(
Span::call_site(),
"#[cxx::bridge] module must have inline contents",
))?;
@ -21,6 +20,10 @@ pub fn bridge(namespace: &Namespace, ffi: ItemMod) -> Result<TokenStream> {
check::typecheck(errors, namespace, apis, types);
errors.propagate()?;
Ok(expand(namespace, ffi, apis, types))
}
fn expand(namespace: &Namespace, ffi: ItemMod, apis: &[Api], types: &Types) -> TokenStream {
let mut expanded = TokenStream::new();
let mut hidden = TokenStream::new();
@ -96,15 +99,16 @@ pub fn bridge(namespace: &Namespace, ffi: ItemMod) -> Result<TokenStream> {
.into_iter()
.filter(|attr| attr.path.is_ident("doc"));
let vis = &ffi.vis;
let ident = &ffi.ident;
Ok(quote! {
quote! {
#(#attrs)*
#[deny(improper_ctypes)]
#[allow(non_snake_case)]
#vis mod #ident {
#expanded
}
})
}
}
fn expand_struct(strct: &Struct) -> TokenStream {