fluencelabs/marine-rs-sdk-test
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine-rs-sdk-test synced 2024-12-04 15:20:18 +00:00
Code Issues Projects Releases Wiki Activity

improve foreign block generation

Browse Source
This commit is contained in:
vms 2020-07-14 12:29:30 +03:00
parent 40774a1107
commit fc5a0d81cb
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/wit/src/fce_ast_types.rs
View File

@ -52,12 +52,16 @@ pub struct AstExternFnItem {
pub signature: AstFunctionSignature,
}
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Clone, Serialize, Deserialize)]
pub struct AstExternModItem {
pub namespace: String,
// only imports are possible here
pub imports: Vec<AstExternFnItem>,
// Option is needed only for skipping serialization/deserialization of syn::ItemFn
#[serde(skip)]
pub original: Option<syn::ItemForeignMod>,
}
#[derive(Clone, Serialize, Deserialize)]

15
crates/wit/src/parse_macro_input/item_foreign_mod.rs
View File

@ -28,8 +28,8 @@ const WASM_IMPORT_MODULE_DIRECTIVE_NAME: &str = "wasm_import_module";
impl ParseMacroInput for syn::ItemForeignMod {
fn parse_macro_input(self) -> Result<FCEAst> {
match self.abi.name {
Some(ref name) if name.value() != "C" => {
match &self.abi.name {
Some(name) if name.value() != "C" => {
return Err(Error::new(self.span(), "only 'C' abi is allowed"))
}
_ => {}
@ -39,7 +39,8 @@ impl ParseMacroInput for syn::ItemForeignMod {
let imports = self
.items
.into_iter()
.iter()
.cloned()
.map(parse_raw_foreign_item)
.collect::<Result<_>>()?;
@ -47,7 +48,7 @@ impl ParseMacroInput for syn::ItemForeignMod {
// #[link(wasm_import_module = "host")]
let wasm_import_module: Option<String> = self
.attrs
.into_iter()
.iter()
.filter_map(|attr| attr.parse_meta().ok())
.filter(|meta| meta.path().is_ident(LINK_DIRECTIVE_NAME))
.filter_map(|meta| {
@ -73,7 +74,11 @@ impl ParseMacroInput for syn::ItemForeignMod {
"import module name should be defined by 'wasm_import_module' directive",
)),
Some(namespace) => {
let extern_mod_item = fce_ast_types::AstExternModItem { namespace, imports };
let extern_mod_item = fce_ast_types::AstExternModItem {
namespace,
imports,
original: Some(self),
};
Ok(FCEAst::ExternMod(extern_mod_item))
}
None => Err(Error::new(

4
crates/wit/src/token_stream_generator/foreign_mod_generator.rs
View File

@ -35,6 +35,7 @@ impl quote::ToTokens for fce_ast_types::AstExternModItem {
);
let wasm_import_module_name = &self.namespace;
let original = &self.original;
let generated_imports = generate_extern_section_items(&self);
let wrapper_functions = generate_wrapper_functions(&self);
@ -45,6 +46,9 @@ impl quote::ToTokens for fce_ast_types::AstExternModItem {
#generated_imports
}
#[cfg(not(target_arch = "wasm32"))]
#original
#wrapper_functions
#[cfg(target_arch = "wasm32")]

2
crates/wit/src/token_stream_generator/record_generator.rs
View File

@ -32,7 +32,7 @@ impl quote::ToTokens for fce_ast_types::AstRecordItem {
let glue_code = quote::quote! {
#original
// #[cfg(target_arch = "wasm32")]
#[cfg(target_arch = "wasm32")]
#[doc(hidden)]
#[allow(clippy::all)]
#[link_section = #section_name]