rustfmt.
This commit is contained in:
@@ -19,29 +19,36 @@ impl Parse for ExportedFn {
|
||||
// Determine if the function is public.
|
||||
let is_public = match fn_all.vis {
|
||||
syn::Visibility::Public(_) => true,
|
||||
_ => false
|
||||
_ => false,
|
||||
};
|
||||
// Determine whether function generates a special calling convention for a mutable
|
||||
// reciever.
|
||||
let mut_receiver = {
|
||||
if let Some(first_arg) = fn_all.sig.inputs.first() {
|
||||
match first_arg {
|
||||
syn::FnArg::Receiver(syn::Receiver { reference: Some(_), ..}) => true,
|
||||
syn::FnArg::Typed(syn::PatType { ref ty, .. }) => {
|
||||
match ty.as_ref() {
|
||||
&syn::Type::Reference(syn::TypeReference {
|
||||
mutability: Some(_), .. }) => true,
|
||||
&syn::Type::Reference(syn::TypeReference { mutability: None,
|
||||
ref elem, .. }) => {
|
||||
match elem.as_ref() {
|
||||
&syn::Type::Path(ref p) if p.path == str_type_path => false,
|
||||
_ => return Err(syn::Error::new(ty.span(),
|
||||
"references from Rhai in this position \
|
||||
must be mutable")),
|
||||
}
|
||||
},
|
||||
_ => false,
|
||||
}
|
||||
syn::FnArg::Receiver(syn::Receiver {
|
||||
reference: Some(_), ..
|
||||
}) => true,
|
||||
syn::FnArg::Typed(syn::PatType { ref ty, .. }) => match ty.as_ref() {
|
||||
&syn::Type::Reference(syn::TypeReference {
|
||||
mutability: Some(_),
|
||||
..
|
||||
}) => true,
|
||||
&syn::Type::Reference(syn::TypeReference {
|
||||
mutability: None,
|
||||
ref elem,
|
||||
..
|
||||
}) => match elem.as_ref() {
|
||||
&syn::Type::Path(ref p) if p.path == str_type_path => false,
|
||||
_ => {
|
||||
return Err(syn::Error::new(
|
||||
ty.span(),
|
||||
"references from Rhai in this position \
|
||||
must be mutable",
|
||||
))
|
||||
}
|
||||
},
|
||||
_ => false,
|
||||
},
|
||||
_ => false,
|
||||
}
|
||||
@@ -57,31 +64,46 @@ impl Parse for ExportedFn {
|
||||
_ => panic!("internal error: receiver argument outside of first position!?"),
|
||||
};
|
||||
let is_ok = match ty.as_ref() {
|
||||
&syn::Type::Reference(syn::TypeReference { mutability: Some(_), .. }) => false,
|
||||
&syn::Type::Reference(syn::TypeReference { mutability: None,
|
||||
ref elem, .. }) => {
|
||||
match elem.as_ref() {
|
||||
&syn::Type::Path(ref p) if p.path == str_type_path => true,
|
||||
_ => false,
|
||||
}
|
||||
&syn::Type::Reference(syn::TypeReference {
|
||||
mutability: Some(_),
|
||||
..
|
||||
}) => false,
|
||||
&syn::Type::Reference(syn::TypeReference {
|
||||
mutability: None,
|
||||
ref elem,
|
||||
..
|
||||
}) => match elem.as_ref() {
|
||||
&syn::Type::Path(ref p) if p.path == str_type_path => true,
|
||||
_ => false,
|
||||
},
|
||||
&syn::Type::Verbatim(_) => false,
|
||||
_ => true,
|
||||
};
|
||||
if !is_ok {
|
||||
return Err(syn::Error::new(ty.span(), "this type in this position passes from \
|
||||
Rhai by value"));
|
||||
return Err(syn::Error::new(
|
||||
ty.span(),
|
||||
"this type in this position passes from \
|
||||
Rhai by value",
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
// No returning references or pointers.
|
||||
if let syn::ReturnType::Type(_, ref rtype) = fn_all.sig.output {
|
||||
match rtype.as_ref() {
|
||||
&syn::Type::Ptr(_) => return Err(syn::Error::new(fn_all.sig.output.span(),
|
||||
"cannot return a pointer to Rhai")),
|
||||
&syn::Type::Reference(_) => return Err(syn::Error::new(fn_all.sig.output.span(),
|
||||
"cannot return a reference to Rhai")),
|
||||
_ => {},
|
||||
&syn::Type::Ptr(_) => {
|
||||
return Err(syn::Error::new(
|
||||
fn_all.sig.output.span(),
|
||||
"cannot return a pointer to Rhai",
|
||||
))
|
||||
}
|
||||
&syn::Type::Reference(_) => {
|
||||
return Err(syn::Error::new(
|
||||
fn_all.sig.output.span(),
|
||||
"cannot return a reference to Rhai",
|
||||
))
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
Ok(ExportedFn {
|
||||
@@ -110,7 +132,7 @@ impl ExportedFn {
|
||||
&self.signature.ident
|
||||
}
|
||||
|
||||
pub(crate) fn arg_list(&self) -> impl Iterator<Item=&syn::FnArg> {
|
||||
pub(crate) fn arg_list(&self) -> impl Iterator<Item = &syn::FnArg> {
|
||||
self.signature.inputs.iter()
|
||||
}
|
||||
|
||||
@@ -127,8 +149,10 @@ impl ExportedFn {
|
||||
}
|
||||
|
||||
pub fn generate(self) -> proc_macro2::TokenStream {
|
||||
let name: syn::Ident = syn::Ident::new(&format!("rhai_fn__{}", self.name().to_string()),
|
||||
self.name().span());
|
||||
let name: syn::Ident = syn::Ident::new(
|
||||
&format!("rhai_fn__{}", self.name().to_string()),
|
||||
self.name().span(),
|
||||
);
|
||||
let impl_block = self.generate_impl("Token");
|
||||
quote! {
|
||||
#[allow(unused)]
|
||||
@@ -156,23 +180,30 @@ impl ExportedFn {
|
||||
let first_arg = self.arg_list().next().unwrap();
|
||||
let var = syn::Ident::new("arg0", proc_macro2::Span::call_site());
|
||||
match first_arg {
|
||||
syn::FnArg::Typed(pattern) => {
|
||||
syn::FnArg::Typed(pattern) => {
|
||||
let arg_type: &syn::Type = {
|
||||
match pattern.ty.as_ref() {
|
||||
&syn::Type::Reference(
|
||||
syn::TypeReference { ref elem, .. }) => elem.as_ref(),
|
||||
&syn::Type::Reference(syn::TypeReference { ref elem, .. }) => {
|
||||
elem.as_ref()
|
||||
}
|
||||
ref p => p,
|
||||
}
|
||||
};
|
||||
let downcast_span = quote_spanned!(
|
||||
arg_type.span()=> args[0usize].downcast_mut::<#arg_type>().unwrap());
|
||||
unpack_stmts.push(syn::parse2::<syn::Stmt>(quote! {
|
||||
let #var: &mut _ = #downcast_span;
|
||||
}).unwrap());
|
||||
input_type_exprs.push(syn::parse2::<syn::Expr>(quote_spanned!(
|
||||
arg_type.span()=> std::any::TypeId::of::<#arg_type>()
|
||||
)).unwrap());
|
||||
},
|
||||
unpack_stmts.push(
|
||||
syn::parse2::<syn::Stmt>(quote! {
|
||||
let #var: &mut _ = #downcast_span;
|
||||
})
|
||||
.unwrap(),
|
||||
);
|
||||
input_type_exprs.push(
|
||||
syn::parse2::<syn::Expr>(quote_spanned!(
|
||||
arg_type.span()=> std::any::TypeId::of::<#arg_type>()
|
||||
))
|
||||
.unwrap(),
|
||||
);
|
||||
}
|
||||
syn::FnArg::Receiver(_) => todo!("true self parameters not implemented yet"),
|
||||
}
|
||||
unpack_exprs.push(syn::parse2::<syn::Expr>(quote! { #var }).unwrap());
|
||||
@@ -189,42 +220,52 @@ impl ExportedFn {
|
||||
let var = syn::Ident::new(&format!("arg{}", i), proc_macro2::Span::call_site());
|
||||
let is_str_ref;
|
||||
match arg {
|
||||
syn::FnArg::Typed(pattern) => {
|
||||
syn::FnArg::Typed(pattern) => {
|
||||
let arg_type: &syn::Type = pattern.ty.as_ref();
|
||||
let downcast_span = match pattern.ty.as_ref() {
|
||||
&syn::Type::Reference(syn::TypeReference { mutability: None,
|
||||
ref elem, .. }) => {
|
||||
match elem.as_ref() {
|
||||
&syn::Type::Path(ref p) if p.path == str_type_path => {
|
||||
is_str_ref = true;
|
||||
quote_spanned!(arg_type.span()=>
|
||||
&syn::Type::Reference(syn::TypeReference {
|
||||
mutability: None,
|
||||
ref elem,
|
||||
..
|
||||
}) => match elem.as_ref() {
|
||||
&syn::Type::Path(ref p) if p.path == str_type_path => {
|
||||
is_str_ref = true;
|
||||
quote_spanned!(arg_type.span()=>
|
||||
args[#i]
|
||||
.downcast_clone::<rhai::ImmutableString>()
|
||||
.unwrap())
|
||||
},
|
||||
_ => panic!("internal error: why wasn't this found earlier!?"),
|
||||
}
|
||||
_ => panic!("internal error: why wasn't this found earlier!?"),
|
||||
},
|
||||
_ => {
|
||||
is_str_ref = false;
|
||||
quote_spanned!(arg_type.span()=>
|
||||
args[#i].downcast_clone::<#arg_type>().unwrap())
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
unpack_stmts.push(syn::parse2::<syn::Stmt>(quote! {
|
||||
let #var = #downcast_span;
|
||||
}).unwrap());
|
||||
unpack_stmts.push(
|
||||
syn::parse2::<syn::Stmt>(quote! {
|
||||
let #var = #downcast_span;
|
||||
})
|
||||
.unwrap(),
|
||||
);
|
||||
if !is_str_ref {
|
||||
input_type_exprs.push(syn::parse2::<syn::Expr>(quote_spanned!(
|
||||
arg_type.span()=> std::any::TypeId::of::<#arg_type>()
|
||||
)).unwrap());
|
||||
input_type_exprs.push(
|
||||
syn::parse2::<syn::Expr>(quote_spanned!(
|
||||
arg_type.span()=> std::any::TypeId::of::<#arg_type>()
|
||||
))
|
||||
.unwrap(),
|
||||
);
|
||||
} else {
|
||||
input_type_exprs.push(syn::parse2::<syn::Expr>(quote_spanned!(
|
||||
arg_type.span()=> std::any::TypeId::of::<rhai::ImmutableString>()
|
||||
)).unwrap());
|
||||
input_type_exprs.push(
|
||||
syn::parse2::<syn::Expr>(quote_spanned!(
|
||||
arg_type.span()=> std::any::TypeId::of::<rhai::ImmutableString>()
|
||||
))
|
||||
.unwrap(),
|
||||
);
|
||||
}
|
||||
},
|
||||
}
|
||||
syn::FnArg::Receiver(_) => panic!("internal error: how did this happen!?"),
|
||||
}
|
||||
if !is_str_ref {
|
||||
@@ -302,8 +343,10 @@ mod function_tests {
|
||||
assert!(item_fn.is_public());
|
||||
assert!(item_fn.return_type().is_none());
|
||||
|
||||
assert_eq!(item_fn.arg_list().next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { x: usize }).unwrap());
|
||||
assert_eq!(
|
||||
item_fn.arg_list().next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { x: usize }).unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -319,10 +362,14 @@ mod function_tests {
|
||||
assert!(item_fn.is_public());
|
||||
assert!(item_fn.return_type().is_none());
|
||||
|
||||
assert_eq!(item_fn.arg_list().next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { x: usize }).unwrap());
|
||||
assert_eq!(item_fn.arg_list().skip(1).next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { y: f32 }).unwrap());
|
||||
assert_eq!(
|
||||
item_fn.arg_list().next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { x: usize }).unwrap()
|
||||
);
|
||||
assert_eq!(
|
||||
item_fn.arg_list().skip(1).next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { y: f32 }).unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -336,11 +383,12 @@ mod function_tests {
|
||||
assert!(!item_fn.mutable_receiver());
|
||||
assert!(item_fn.is_public());
|
||||
assert_eq!(item_fn.arg_list().count(), 0);
|
||||
assert_eq!(item_fn.return_type().unwrap(),
|
||||
&syn::Type::Path(syn::TypePath {
|
||||
qself: None,
|
||||
path: syn::parse2::<syn::Path>(quote! { usize }).unwrap()
|
||||
})
|
||||
assert_eq!(
|
||||
item_fn.return_type().unwrap(),
|
||||
&syn::Type::Path(syn::TypePath {
|
||||
qself: None,
|
||||
path: syn::parse2::<syn::Path>(quote! { usize }).unwrap()
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
@@ -351,8 +399,7 @@ mod function_tests {
|
||||
};
|
||||
|
||||
let err = syn::parse2::<ExportedFn>(input_tokens).unwrap_err();
|
||||
assert_eq!(format!("{}", err),
|
||||
"cannot return a reference to Rhai");
|
||||
assert_eq!(format!("{}", err), "cannot return a reference to Rhai");
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -362,8 +409,7 @@ mod function_tests {
|
||||
};
|
||||
|
||||
let err = syn::parse2::<ExportedFn>(input_tokens).unwrap_err();
|
||||
assert_eq!(format!("{}", err),
|
||||
"cannot return a pointer to Rhai");
|
||||
assert_eq!(format!("{}", err), "cannot return a pointer to Rhai");
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -373,8 +419,10 @@ mod function_tests {
|
||||
};
|
||||
|
||||
let err = syn::parse2::<ExportedFn>(input_tokens).unwrap_err();
|
||||
assert_eq!(format!("{}", err),
|
||||
"references from Rhai in this position must be mutable");
|
||||
assert_eq!(
|
||||
format!("{}", err),
|
||||
"references from Rhai in this position must be mutable"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -384,8 +432,10 @@ mod function_tests {
|
||||
};
|
||||
|
||||
let err = syn::parse2::<ExportedFn>(input_tokens).unwrap_err();
|
||||
assert_eq!(format!("{}", err),
|
||||
"this type in this position passes from Rhai by value");
|
||||
assert_eq!(
|
||||
format!("{}", err),
|
||||
"this type in this position passes from Rhai by value"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -395,8 +445,10 @@ mod function_tests {
|
||||
};
|
||||
|
||||
let err = syn::parse2::<ExportedFn>(input_tokens).unwrap_err();
|
||||
assert_eq!(format!("{}", err),
|
||||
"this type in this position passes from Rhai by value");
|
||||
assert_eq!(
|
||||
format!("{}", err),
|
||||
"this type in this position passes from Rhai by value"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -412,8 +464,10 @@ mod function_tests {
|
||||
assert!(item_fn.is_public());
|
||||
assert!(item_fn.return_type().is_none());
|
||||
|
||||
assert_eq!(item_fn.arg_list().next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { message: &str }).unwrap());
|
||||
assert_eq!(
|
||||
item_fn.arg_list().next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { message: &str }).unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -429,10 +483,14 @@ mod function_tests {
|
||||
assert!(item_fn.is_public());
|
||||
assert!(item_fn.return_type().is_none());
|
||||
|
||||
assert_eq!(item_fn.arg_list().next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { level: usize }).unwrap());
|
||||
assert_eq!(item_fn.arg_list().skip(1).next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { message: &str }).unwrap());
|
||||
assert_eq!(
|
||||
item_fn.arg_list().next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { level: usize }).unwrap()
|
||||
);
|
||||
assert_eq!(
|
||||
item_fn.arg_list().skip(1).next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { message: &str }).unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -490,7 +548,9 @@ mod generate_tests {
|
||||
let expected = expected.to_string();
|
||||
if &actual != &expected {
|
||||
let mut counter = 0;
|
||||
let iter = actual.chars().zip(expected.chars())
|
||||
let iter = actual
|
||||
.chars()
|
||||
.zip(expected.chars())
|
||||
.inspect(|_| counter += 1)
|
||||
.skip_while(|(a, e)| *a == *e);
|
||||
let (actual_diff, expected_diff) = {
|
||||
@@ -508,7 +568,7 @@ mod generate_tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn minimal_fn () {
|
||||
fn minimal_fn() {
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub fn do_nothing() { }
|
||||
};
|
||||
|
@@ -75,8 +75,10 @@ mod module;
|
||||
mod rhai_module;
|
||||
|
||||
#[proc_macro_attribute]
|
||||
pub fn export_fn(_args: proc_macro::TokenStream,
|
||||
input: proc_macro::TokenStream) -> proc_macro::TokenStream {
|
||||
pub fn export_fn(
|
||||
_args: proc_macro::TokenStream,
|
||||
input: proc_macro::TokenStream,
|
||||
) -> proc_macro::TokenStream {
|
||||
let mut output = proc_macro2::TokenStream::from(input.clone());
|
||||
let function_def = parse_macro_input!(input as function::ExportedFn);
|
||||
output.extend(function_def.generate());
|
||||
@@ -84,8 +86,10 @@ pub fn export_fn(_args: proc_macro::TokenStream,
|
||||
}
|
||||
|
||||
#[proc_macro_attribute]
|
||||
pub fn export_module(_args: proc_macro::TokenStream,
|
||||
input: proc_macro::TokenStream) -> proc_macro::TokenStream {
|
||||
pub fn export_module(
|
||||
_args: proc_macro::TokenStream,
|
||||
input: proc_macro::TokenStream,
|
||||
) -> proc_macro::TokenStream {
|
||||
let module_def = parse_macro_input!(input as module::Module);
|
||||
let tokens = module_def.generate();
|
||||
proc_macro::TokenStream::from(tokens)
|
||||
@@ -108,8 +112,8 @@ pub fn register_exported_fn(args: proc_macro::TokenStream) -> proc_macro::TokenS
|
||||
let items: Vec<syn::Expr> = args.into_iter().collect();
|
||||
if items.len() != 3 {
|
||||
return proc_macro::TokenStream::from(
|
||||
syn::Error::new(arg_span, "this macro requires three arguments")
|
||||
.to_compile_error());
|
||||
syn::Error::new(arg_span, "this macro requires three arguments").to_compile_error(),
|
||||
);
|
||||
}
|
||||
let rhai_module = &items[0];
|
||||
let export_name = match &items[1] {
|
||||
@@ -122,15 +126,20 @@ pub fn register_exported_fn(args: proc_macro::TokenStream) -> proc_macro::TokenS
|
||||
} else {
|
||||
return proc_macro::TokenStream::from(
|
||||
syn::Error::new(items[2].span(), "third argument must be a function name")
|
||||
.to_compile_error());
|
||||
.to_compile_error(),
|
||||
);
|
||||
};
|
||||
let gen_mod_path: syn::punctuated::Punctuated<syn::PathSegment, _> = {
|
||||
let mut g = rust_modpath.clone().segments;
|
||||
g.pop();
|
||||
let ident = syn::Ident::new(&format!("rhai_fn__{}",
|
||||
rust_modpath.segments.last().unwrap().ident),
|
||||
items[2].span());
|
||||
g.push_value(syn::PathSegment { ident, arguments: syn::PathArguments::None });
|
||||
let ident = syn::Ident::new(
|
||||
&format!("rhai_fn__{}", rust_modpath.segments.last().unwrap().ident),
|
||||
items[2].span(),
|
||||
);
|
||||
g.push_value(syn::PathSegment {
|
||||
ident,
|
||||
arguments: syn::PathArguments::None,
|
||||
});
|
||||
g
|
||||
};
|
||||
let tokens = quote! {
|
||||
|
@@ -17,36 +17,39 @@ impl Parse for Module {
|
||||
let fns: Vec<_>;
|
||||
let consts: Vec<_>;
|
||||
if let Some((_, ref content)) = mod_all.content {
|
||||
fns = content.iter()
|
||||
.filter_map(|item| {
|
||||
match item {
|
||||
syn::Item::Fn(f) => {
|
||||
if let syn::Visibility::Public(_) = f.vis {
|
||||
Some(f)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
},
|
||||
_ => None,
|
||||
fns = content
|
||||
.iter()
|
||||
.filter_map(|item| match item {
|
||||
syn::Item::Fn(f) => {
|
||||
if let syn::Visibility::Public(_) = f.vis {
|
||||
Some(f)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
_ => None,
|
||||
})
|
||||
.try_fold(Vec::new(), |mut vec, itemfn| {
|
||||
syn::parse2::<ExportedFn>(itemfn.to_token_stream())
|
||||
.map(|f| vec.push(f))
|
||||
.map(|_| vec)
|
||||
})?;
|
||||
consts = content.iter()
|
||||
.filter_map(|item| {
|
||||
match item {
|
||||
syn::Item::Const(syn::ItemConst {vis, ref expr, ident, ..}) => {
|
||||
if let syn::Visibility::Public(_) = vis {
|
||||
Some((ident.to_string(), expr.as_ref().clone()))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
},
|
||||
_ => None,
|
||||
consts = content
|
||||
.iter()
|
||||
.filter_map(|item| match item {
|
||||
syn::Item::Const(syn::ItemConst {
|
||||
vis,
|
||||
ref expr,
|
||||
ident,
|
||||
..
|
||||
}) => {
|
||||
if let syn::Visibility::Public(_) = vis {
|
||||
Some((ident.to_string(), expr.as_ref().clone()))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
_ => None,
|
||||
})
|
||||
.collect();
|
||||
} else {
|
||||
@@ -87,7 +90,6 @@ mod module_tests {
|
||||
|
||||
#[test]
|
||||
fn empty_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod empty { }
|
||||
};
|
||||
@@ -99,7 +101,6 @@ mod module_tests {
|
||||
|
||||
#[test]
|
||||
fn one_factory_fn_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_fn {
|
||||
pub fn get_mystic_number() -> INT {
|
||||
@@ -113,13 +114,14 @@ mod module_tests {
|
||||
assert_eq!(item_mod.fns.len(), 1);
|
||||
assert_eq!(item_mod.fns[0].name().to_string(), "get_mystic_number");
|
||||
assert_eq!(item_mod.fns[0].arg_count(), 0);
|
||||
assert_eq!(item_mod.fns[0].return_type().unwrap(),
|
||||
&syn::parse2::<syn::Type>(quote! { INT }).unwrap());
|
||||
assert_eq!(
|
||||
item_mod.fns[0].return_type().unwrap(),
|
||||
&syn::parse2::<syn::Type>(quote! { INT }).unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn one_single_arg_fn_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_fn {
|
||||
pub fn add_one_to(x: INT) -> INT {
|
||||
@@ -133,15 +135,18 @@ mod module_tests {
|
||||
assert_eq!(item_mod.fns.len(), 1);
|
||||
assert_eq!(item_mod.fns[0].name().to_string(), "add_one_to");
|
||||
assert_eq!(item_mod.fns[0].arg_count(), 1);
|
||||
assert_eq!(item_mod.fns[0].arg_list().next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { x: INT }).unwrap());
|
||||
assert_eq!(item_mod.fns[0].return_type().unwrap(),
|
||||
&syn::parse2::<syn::Type>(quote! { INT }).unwrap());
|
||||
assert_eq!(
|
||||
item_mod.fns[0].arg_list().next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { x: INT }).unwrap()
|
||||
);
|
||||
assert_eq!(
|
||||
item_mod.fns[0].return_type().unwrap(),
|
||||
&syn::parse2::<syn::Type>(quote! { INT }).unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn one_double_arg_fn_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_fn {
|
||||
pub fn add_together(x: INT, y: INT) -> INT {
|
||||
@@ -156,18 +161,23 @@ mod module_tests {
|
||||
assert_eq!(item_mod.fns.len(), 1);
|
||||
assert_eq!(item_mod.fns[0].name().to_string(), "add_together");
|
||||
assert_eq!(item_mod.fns[0].arg_count(), 2);
|
||||
assert_eq!(args.next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { x: INT }).unwrap());
|
||||
assert_eq!(args.next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { y: INT }).unwrap());
|
||||
assert_eq!(
|
||||
args.next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { x: INT }).unwrap()
|
||||
);
|
||||
assert_eq!(
|
||||
args.next().unwrap(),
|
||||
&syn::parse2::<syn::FnArg>(quote! { y: INT }).unwrap()
|
||||
);
|
||||
assert!(args.next().is_none());
|
||||
assert_eq!(item_mod.fns[0].return_type().unwrap(),
|
||||
&syn::parse2::<syn::Type>(quote! { INT }).unwrap());
|
||||
assert_eq!(
|
||||
item_mod.fns[0].return_type().unwrap(),
|
||||
&syn::parse2::<syn::Type>(quote! { INT }).unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn one_constant_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_constant {
|
||||
pub const MYSTIC_NUMBER: INT = 42;
|
||||
@@ -178,12 +188,14 @@ mod module_tests {
|
||||
assert!(item_mod.fns.is_empty());
|
||||
assert_eq!(item_mod.consts.len(), 1);
|
||||
assert_eq!(&item_mod.consts[0].0, "MYSTIC_NUMBER");
|
||||
assert_eq!(item_mod.consts[0].1, syn::parse2::<syn::Expr>(quote! { 42 }).unwrap());
|
||||
assert_eq!(
|
||||
item_mod.consts[0].1,
|
||||
syn::parse2::<syn::Expr>(quote! { 42 }).unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn one_private_fn_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_fn {
|
||||
fn get_mystic_number() -> INT {
|
||||
@@ -199,7 +211,6 @@ mod module_tests {
|
||||
|
||||
#[test]
|
||||
fn one_private_constant_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_constant {
|
||||
const MYSTIC_NUMBER: INT = 42;
|
||||
@@ -224,7 +235,9 @@ mod generate_tests {
|
||||
let expected = expected.to_string();
|
||||
if &actual != &expected {
|
||||
let mut counter = 0;
|
||||
let iter = actual.chars().zip(expected.chars())
|
||||
let iter = actual
|
||||
.chars()
|
||||
.zip(expected.chars())
|
||||
.inspect(|_| counter += 1)
|
||||
.skip_while(|(a, e)| *a == *e);
|
||||
let (actual_diff, expected_diff) = {
|
||||
@@ -265,7 +278,6 @@ mod generate_tests {
|
||||
|
||||
#[test]
|
||||
fn one_factory_fn_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_fn {
|
||||
pub fn get_mystic_number() -> INT {
|
||||
@@ -320,7 +332,6 @@ mod generate_tests {
|
||||
|
||||
#[test]
|
||||
fn one_single_arg_fn_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_fn {
|
||||
pub fn add_one_to(x: INT) -> INT {
|
||||
@@ -376,7 +387,6 @@ mod generate_tests {
|
||||
|
||||
#[test]
|
||||
fn one_double_arg_fn_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_fn {
|
||||
pub fn add_together(x: INT, y: INT) -> INT {
|
||||
@@ -435,7 +445,6 @@ mod generate_tests {
|
||||
|
||||
#[test]
|
||||
fn one_constant_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_constant {
|
||||
pub const MYSTIC_NUMBER: INT = 42;
|
||||
@@ -462,7 +471,6 @@ mod generate_tests {
|
||||
|
||||
#[test]
|
||||
fn one_constant_module_imports_preserved() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_constant {
|
||||
pub use rhai::INT;
|
||||
@@ -491,7 +499,6 @@ mod generate_tests {
|
||||
|
||||
#[test]
|
||||
fn one_private_fn_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_fn {
|
||||
fn get_mystic_number() -> INT {
|
||||
@@ -521,7 +528,6 @@ mod generate_tests {
|
||||
|
||||
#[test]
|
||||
fn one_private_constant_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod one_constant {
|
||||
const MYSTIC_NUMBER: INT = 42;
|
||||
@@ -547,7 +553,6 @@ mod generate_tests {
|
||||
|
||||
#[test]
|
||||
fn one_str_arg_fn_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod str_fn {
|
||||
pub fn print_out_to(x: &str) {
|
||||
@@ -604,7 +609,6 @@ mod generate_tests {
|
||||
|
||||
#[test]
|
||||
fn one_mut_ref_fn_module() {
|
||||
|
||||
let input_tokens: TokenStream = quote! {
|
||||
pub mod ref_fn {
|
||||
pub fn increment(x: &mut FLOAT) {
|
||||
|
@@ -6,7 +6,7 @@ pub(crate) type ExportedConst = (String, syn::Expr);
|
||||
|
||||
pub(crate) fn generate_body(
|
||||
fns: &Vec<ExportedFn>,
|
||||
consts: &Vec<ExportedConst>
|
||||
consts: &Vec<ExportedConst>,
|
||||
) -> proc_macro2::TokenStream {
|
||||
let mut set_fn_stmts: Vec<syn::Stmt> = Vec::new();
|
||||
let mut set_const_stmts: Vec<syn::Stmt> = Vec::new();
|
||||
@@ -14,51 +14,67 @@ pub(crate) fn generate_body(
|
||||
|
||||
for (const_name, const_expr) in consts {
|
||||
let const_literal = syn::LitStr::new(&const_name, proc_macro2::Span::call_site());
|
||||
set_const_stmts.push(syn::parse2::<syn::Stmt>(quote! {
|
||||
m.set_var(#const_literal, #const_expr);
|
||||
}).unwrap());
|
||||
set_const_stmts.push(
|
||||
syn::parse2::<syn::Stmt>(quote! {
|
||||
m.set_var(#const_literal, #const_expr);
|
||||
})
|
||||
.unwrap(),
|
||||
);
|
||||
}
|
||||
|
||||
// NB: these are token streams, because reparsing messes up "> >" vs ">>"
|
||||
let mut gen_fn_tokens: Vec<proc_macro2::TokenStream> = Vec::new();
|
||||
for function in fns {
|
||||
let fn_token_name = syn::Ident::new(&format!("{}__Token", function.name().to_string()),
|
||||
function.name().span());
|
||||
let fn_literal = syn::LitStr::new(&function.name().to_string(),
|
||||
proc_macro2::Span::call_site());
|
||||
let fn_input_types: Vec<syn::Expr> = function.arg_list()
|
||||
let fn_token_name = syn::Ident::new(
|
||||
&format!("{}__Token", function.name().to_string()),
|
||||
function.name().span(),
|
||||
);
|
||||
let fn_literal =
|
||||
syn::LitStr::new(&function.name().to_string(), proc_macro2::Span::call_site());
|
||||
let fn_input_types: Vec<syn::Expr> = function
|
||||
.arg_list()
|
||||
.map(|fnarg| match fnarg {
|
||||
syn::FnArg::Receiver(_) => panic!("internal error: receiver fn outside impl!?"),
|
||||
syn::FnArg::Typed(syn::PatType { ref ty, .. }) => {
|
||||
let arg_type = match ty.as_ref() {
|
||||
&syn::Type::Reference(syn::TypeReference { mutability: None,
|
||||
ref elem, .. }) => {
|
||||
match elem.as_ref() {
|
||||
&syn::Type::Path(ref p) if p.path == str_type_path =>
|
||||
syn::parse2::<syn::Type>(quote! {
|
||||
rhai::ImmutableString }).unwrap(),
|
||||
_ => panic!("internal error: non-string shared reference!?"),
|
||||
&syn::Type::Reference(syn::TypeReference {
|
||||
mutability: None,
|
||||
ref elem,
|
||||
..
|
||||
}) => match elem.as_ref() {
|
||||
&syn::Type::Path(ref p) if p.path == str_type_path => {
|
||||
syn::parse2::<syn::Type>(quote! {
|
||||
rhai::ImmutableString })
|
||||
.unwrap()
|
||||
}
|
||||
_ => panic!("internal error: non-string shared reference!?"),
|
||||
},
|
||||
&syn::Type::Reference(syn::TypeReference { mutability: Some(_),
|
||||
ref elem, .. }) => {
|
||||
match elem.as_ref() {
|
||||
&syn::Type::Path(ref p) => syn::parse2::<syn::Type>(quote! {
|
||||
#p }).unwrap(),
|
||||
_ => panic!("internal error: non-string shared reference!?"),
|
||||
}
|
||||
&syn::Type::Reference(syn::TypeReference {
|
||||
mutability: Some(_),
|
||||
ref elem,
|
||||
..
|
||||
}) => match elem.as_ref() {
|
||||
&syn::Type::Path(ref p) => syn::parse2::<syn::Type>(quote! {
|
||||
#p })
|
||||
.unwrap(),
|
||||
_ => panic!("internal error: non-string shared reference!?"),
|
||||
},
|
||||
t => t.clone(),
|
||||
};
|
||||
syn::parse2::<syn::Expr>(quote! {
|
||||
core::any::TypeId::of::<#arg_type>()}).unwrap()
|
||||
},
|
||||
}).collect();
|
||||
core::any::TypeId::of::<#arg_type>()})
|
||||
.unwrap()
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
|
||||
set_fn_stmts.push(syn::parse2::<syn::Stmt>(quote! {
|
||||
m.set_fn(#fn_literal, FnAccess::Public, &[#(#fn_input_types),*],
|
||||
rhai::plugin::CallableFunction::from_plugin(#fn_token_name()));
|
||||
}).unwrap());
|
||||
set_fn_stmts.push(
|
||||
syn::parse2::<syn::Stmt>(quote! {
|
||||
m.set_fn(#fn_literal, FnAccess::Public, &[#(#fn_input_types),*],
|
||||
rhai::plugin::CallableFunction::from_plugin(#fn_token_name()));
|
||||
})
|
||||
.unwrap(),
|
||||
);
|
||||
|
||||
gen_fn_tokens.push(quote! {
|
||||
#[allow(non_camel_case_types)]
|
||||
@@ -79,7 +95,8 @@ pub(crate) fn generate_body(
|
||||
m
|
||||
}
|
||||
}
|
||||
}).unwrap();
|
||||
})
|
||||
.unwrap();
|
||||
|
||||
let (_, generate_call_content) = generate_fncall.content.take().unwrap();
|
||||
|
||||
|
Reference in New Issue
Block a user