hexedtech/jni-toolbox
3
0
Fork 0
mirror of https://github.com/hexedtech/jni-toolbox.git synced 2024-10-22 18:19:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: passing &mut env doesnt break jni fn

Browse source
This commit is contained in:
əlemi 2024-09-24 03:15:19 +02:00
parent d52677eed8
commit f67b1a7b3f
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 26 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
macro/src/args.rs
View file

@ -1,5 +1,5 @@
use proc_macro2::{Span, TokenStream}; use proc_macro2::{Span, TokenStream};
use quote::{ToTokens, TokenStreamExt}; use quote::TokenStreamExt;
use syn::Ident; use syn::Ident;
pub(crate) struct ArgumentOptions { pub(crate) struct ArgumentOptions {
@ -22,31 +22,33 @@ fn unpack_pat(pat: syn::Pat) -> Result<TokenStream, syn::Error> {
} }
} }
fn type_equals(ty: Box<syn::Type>, search: impl AsRef<str>) -> bool { fn bare_type(ty: Box<syn::Type>) -> Option<syn::TypePath> {
match *ty { match *ty {
syn::Type::Array(_) => false, syn::Type::Array(a) => bare_type(a.elem),
syn::Type::BareFn(_) => false, syn::Type::BareFn(_) => None,
syn::Type::ImplTrait(_) => false, syn::Type::ImplTrait(_) => None,
syn::Type::Infer(_) => false, syn::Type::Infer(_) => None,
syn::Type::Macro(_) => false, syn::Type::Macro(_) => None,
syn::Type::Never(_) => false, syn::Type::Never(_) => None,
syn::Type::Ptr(_) => false, syn::Type::TraitObject(_) => None,
syn::Type::Slice(_) => false, syn::Type::Verbatim(_) => None,
syn::Type::TraitObject(_) => false, syn::Type::Ptr(p) => bare_type(p.elem),
syn::Type::Tuple(_) => false, syn::Type::Slice(s) => bare_type(s.elem),
syn::Type::Verbatim(_) => false, syn::Type::Tuple(t) => bare_type(Box::new(t.elems.first()?.clone())), // TODO
syn::Type::Group(g) => type_equals(g.elem, search), syn::Type::Group(g) => bare_type(g.elem),
syn::Type::Paren(p) => type_equals(p.elem, search), syn::Type::Paren(p) => bare_type(p.elem),
syn::Type::Reference(r) => type_equals(r.elem, search), syn::Type::Reference(r) => bare_type(r.elem),
syn::Type::Path(ty) => { syn::Type::Path(ty) => Some(ty),
ty.path.segments _ => todo!(),
.last()
.map_or(false, |e| e.ident == search.as_ref())
},
_ => false,
} }
} }
fn type_equals(ty: Box<syn::Type>, search: impl AsRef<str>) -> bool {
let Some(ty) = bare_type(ty) else { return false };
let Some(last) = ty.path.segments.last() else { return false };
last.ident == search.as_ref()
}
impl ArgumentOptions { impl ArgumentOptions {
pub(crate) fn parse_args(fn_item: &syn::ItemFn, ret_expr: TokenStream) -> Result<Self, syn::Error> { pub(crate) fn parse_args(fn_item: &syn::ItemFn, ret_expr: TokenStream) -> Result<Self, syn::Error> {
let mut arguments = Vec::new(); let mut arguments = Vec::new();
@ -83,9 +85,9 @@ impl ArgumentOptions {
if pass_env { if pass_env {
if let Some(arg) = args_iter.next() { if let Some(arg) = args_iter.next() {
let pat = arg.pat; let pat = arg.pat;
let ty = arg.ty; let ty = bare_type(arg.ty);
incoming.append_all(quote::quote!( mut #pat: #ty,)); incoming.append_all(quote::quote!( mut #pat: #ty,));
forwarding.append_all(quote::quote!( #pat,)); forwarding.append_all(quote::quote!( &mut #pat,));
} }
} else { } else {
incoming.append_all(quote::quote!( mut #env: jni::JNIEnv<'local>,)); incoming.append_all(quote::quote!( mut #env: jni::JNIEnv<'local>,));
@ -121,25 +123,3 @@ struct SingleArgument {
pat: syn::Ident, pat: syn::Ident,
ty: Box<syn::Type>, ty: Box<syn::Type>,
} }
#[allow(unused)]
fn bare_type(t: syn::Type) -> TokenStream {
match t {
syn::Type::Array(x) => bare_type(*x.elem),
syn::Type::BareFn(f) => f.to_token_stream(),
syn::Type::Group(x) => bare_type(*x.elem),
syn::Type::ImplTrait(t) => t.to_token_stream(),
syn::Type::Infer(x) => x.to_token_stream(),
syn::Type::Macro(x) => x.to_token_stream(),
syn::Type::Never(x) => x.to_token_stream(),
syn::Type::Paren(p) => bare_type(*p.elem),
syn::Type::Path(p) => p.to_token_stream(),
syn::Type::Ptr(x) => bare_type(*x.elem),
syn::Type::Reference(r) => bare_type(*r.elem),
syn::Type::Slice(s) => bare_type(*s.elem),
syn::Type::TraitObject(t) => t.to_token_stream(),
syn::Type::Tuple(x) => x.to_token_stream(),
syn::Type::Verbatim(x) => x.to_token_stream(),
_ => todo!(),
}
}