Proxmox/perlmod
5
0
Fork 0
mirror of git://git.proxmox.com/git/perlmod.git synced 2025-03-13 04:58:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

support functions without return values

Browse Source 
this makes for surprisingly ugly code

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2020-11-24 11:05:54 +01:00
parent 0cdb12e277
commit 913a8a72ce
2 changed files with 77 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
perlmod-macro/src/function.rs
View File

@ -109,6 +109,14 @@ pub fn handle_function(
}
}
let has_return_value = match &func.sig.output {
syn::ReturnType::Default => false,
syn::ReturnType::Type(_arrow, ty) => match &**ty {
syn::Type::Tuple(tuple) => !tuple.elems.is_empty(),
_ => true,
},
};
let too_many_args_error = syn::LitStr::new(
&format!(
"too many parameters for function '{}', (expected {})",
@ -118,38 +126,84 @@ pub fn handle_function(
Span::call_site(),
);
let handle_return = if attr.raw_return {
quote! {
Ok(result.into_mortal().into_raw())
}
} else {
quote! {
match ::perlmod::to_value(&result) {
Ok(value) => Ok(value.into_mortal().into_raw()),
Err(err) => Err(::perlmod::Value::new_string(&err.to_string())
.into_mortal()
.into_raw()),
let mut handle_return;
let return_type;
let wrapper_func;
if has_return_value {
return_type = quote! { *mut ::perlmod::ffi::SV };
handle_return = quote! {
let result = match #name(#passed_arguments) {
Ok(output) => output,
Err(err) => {
return Err(::perlmod::Value::new_string(&err.to_string())
.into_mortal()
.into_raw());
}
};
};
if attr.raw_return {
handle_return.extend(quote! {
Ok(result.into_mortal().into_raw())
});
} else {
handle_return.extend(quote! {
match ::perlmod::to_value(&result) {
Ok(value) => Ok(value.into_mortal().into_raw()),
Err(err) => Err(::perlmod::Value::new_string(&err.to_string())
.into_mortal()
.into_raw()),
}
});
};
wrapper_func = quote! {
#[no_mangle]
pub extern "C" fn #xs_name(cv: &::perlmod::ffi::CV) {
unsafe {
match #impl_xs_name(cv) {
Ok(sv) => ::perlmod::ffi::stack_push_raw(sv),
Err(sv) => ::perlmod::ffi::croak(sv),
}
}
}
};
} else {
return_type = quote! { () };
if attr.raw_return {
bail!(&attr.raw_return => "raw_return attribute is illegal without a return value");
}
};
handle_return = quote! {
#name(#passed_arguments);
Ok(())
};
wrapper_func = quote! {
#[no_mangle]
pub extern "C" fn #xs_name(cv: &::perlmod::ffi::CV) {
unsafe {
match #impl_xs_name(cv) {
Ok(()) => (),
Err(sv) => ::perlmod::ffi::croak(sv),
}
}
}
};
}
let tokens = quote! {
#func
#[no_mangle]
pub extern "C" fn #xs_name(cv: &::perlmod::ffi::CV) {
unsafe {
match #impl_xs_name(cv) {
Ok(sv) => ::perlmod::ffi::stack_push_raw(sv),
Err(sv) => ::perlmod::ffi::croak(sv),
}
}
}
#wrapper_func
#[inline(never)]
fn #impl_xs_name(
_cv: &::perlmod::ffi::CV,
) -> Result<*mut ::perlmod::ffi::SV, *mut ::perlmod::ffi::SV> {
) -> Result<#return_type, *mut ::perlmod::ffi::SV> {
let argmark = unsafe { ::perlmod::ffi::pop_arg_mark() };
let mut args = argmark.iter();
@ -169,15 +223,6 @@ pub fn handle_function(
argmark.set_stack();
}
let result = match #name(#passed_arguments) {
Ok(output) => output,
Err(err) => {
return Err(::perlmod::Value::new_string(&err.to_string())
.into_mortal()
.into_raw());
}
};
#handle_return
}
};

4
perlmod-test/src/bless.rs
View File

@ -14,9 +14,7 @@ mod export {
}
#[export]
fn something(#[raw] value: Value) -> Result<(), Error> {
fn something(#[raw] value: Value) {
println!("Called something!");
Ok(())
}
}