kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Reflect visibility to generated modules.

Browse Source
This commit is contained in:
Stephen Chung 2021-02-21 13:51:24 +08:00
parent 03c31a969a
commit fc7697d504
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
codegen/src/function.rs
View File

@ -16,6 +16,7 @@ use quote::{quote, quote_spanned, ToTokens};
use syn::{
parse::{Parse, ParseStream, Parser},
spanned::Spanned,
VisPublic, Visibility,
};
use crate::attrs::{ExportInfo, ExportScope, ExportedParams};
@ -273,7 +274,7 @@ impl ExportedParams for ExportedFnParams {
pub(crate) struct ExportedFn {
entire_span: proc_macro2::Span,
signature: syn::Signature,
is_public: bool,
visibility: syn::Visibility,
pass_context: bool,
return_dynamic: bool,
mut_receiver: bool,
@ -298,8 +299,7 @@ impl Parse for ExportedFn {
// #[cfg] attributes are not allowed on functions due to what is generated for them
crate::attrs::deny_cfg_attr(&fn_all.attrs)?;
// Determine if the function is public.
let is_public = matches!(fn_all.vis, syn::Visibility::Public(_));
let visibility = fn_all.vis;
// Determine if the function requires a call context
if let Some(first_arg) = fn_all.sig.inputs.first() {
@ -408,7 +408,7 @@ impl Parse for ExportedFn {
Ok(ExportedFn {
entire_span,
signature: fn_all.sig,
is_public,
visibility,
pass_context,
return_dynamic,
mut_receiver,
@ -425,7 +425,7 @@ impl ExportedFn {
pub(crate) fn update_scope(&mut self, parent_scope: &ExportScope) {
let keep = match (self.params.skip, parent_scope) {
(true, _) => false,
(_, ExportScope::PubOnly) => self.is_public,
(_, ExportScope::PubOnly) => self.is_public(),
(_, ExportScope::Prefix(s)) => self.name().to_string().starts_with(s),
(_, ExportScope::All) => true,
};
@ -449,7 +449,7 @@ impl ExportedFn {
}
pub(crate) fn is_public(&self) -> bool {
self.is_public
!matches!(self.visibility, syn::Visibility::Inherited)
}
pub(crate) fn span(&self) -> &proc_macro2::Span {
@ -593,9 +593,10 @@ impl ExportedFn {
let input_types_block = self.generate_input_types("Token");
let return_type_block = self.generate_return_type("Token");
let dyn_result_fn_block = self.generate_dynamic_fn();
let vis = self.visibility;
quote! {
#[allow(unused)]
pub mod #name {
#[automatically_derived]
#vis mod #name {
use super::*;
struct Token();
#impl_block

5
codegen/src/module.rs
View File

@ -257,6 +257,7 @@ impl Module {
params,
..
} = self;
let mod_vis = mod_all.vis;
let mod_name = mod_all.ident.clone();
let (_, orig_content) = mod_all.content.take().unwrap();
let mod_attrs = mem::take(&mut mod_all.attrs);
@ -282,7 +283,7 @@ impl Module {
// Regenerate the module with the new content added.
Ok(quote! {
#(#mod_attrs)*
pub mod #mod_name {
#mod_vis mod #mod_name {
#(#orig_content)*
#(#inner_modules)*
#mod_gen
@ -292,7 +293,7 @@ impl Module {
// Regenerate the original module as-is.
Ok(quote! {
#(#mod_attrs)*
pub mod #mod_name {
#mod_vis mod #mod_name {
#(#orig_content)*
}
})

14
codegen/src/test/function.rs
View File

@ -272,7 +272,7 @@ mod generate_tests {
};
let expected_tokens = quote! {
#[allow(unused)]
#[automatically_derived]
pub mod rhai_fn_do_nothing {
use super::*;
struct Token();
@ -325,7 +325,7 @@ mod generate_tests {
};
let expected_tokens = quote! {
#[allow(unused)]
#[automatically_derived]
pub mod rhai_fn_do_something {
use super::*;
struct Token();
@ -379,7 +379,7 @@ mod generate_tests {
};
let expected_tokens = quote! {
#[allow(unused)]
#[automatically_derived]
pub mod rhai_fn_do_something {
use super::*;
struct Token();
@ -436,7 +436,7 @@ mod generate_tests {
};
let expected_tokens = quote! {
#[allow(unused)]
#[automatically_derived]
pub mod rhai_fn_return_dynamic {
use super::*;
struct Token();
@ -523,7 +523,7 @@ mod generate_tests {
};
let expected_tokens = quote! {
#[allow(unused)]
#[automatically_derived]
pub mod rhai_fn_add_together {
use super::*;
struct Token();
@ -579,7 +579,7 @@ mod generate_tests {
};
let expected_tokens = quote! {
#[allow(unused)]
#[automatically_derived]
pub mod rhai_fn_increment {
use super::*;
struct Token();
@ -641,7 +641,7 @@ mod generate_tests {
};
let expected_tokens = quote! {
#[allow(unused)]
#[automatically_derived]
pub mod rhai_fn_special_print {
use super::*;
struct Token();