fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-06-22 17:21:35 +00:00
Code Issues Projects Releases Wiki Activity

Enable nested namespace (#951) (#2105)

Browse Source 
* Enable nested namespace (#951)

* Specify the namespace as array (#951)

* added an example to the document

Co-authored-by: Alex Crichton <alex@alexcrichton.com>
This commit is contained in:
Hajime Fukuda
2020-05-27 08:36:20 -07:00
committed by GitHub
parent e0ad7bfeac
commit 87663c6d2a
11 changed files with 144 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/backend/src/ast.rs
View File

@ -75,7 +75,7 @@ pub enum MethodSelf {
#[derive(Clone)]
pub struct Import {
pub module: ImportModule,
pub js_namespace: Option<Ident>,
pub js_namespace: Option<Vec<String>>,
pub kind: ImportKind,
}

31
crates/backend/src/codegen.rs
View File

@ -4,7 +4,7 @@ use crate::util::ShortHash;
use crate::Diagnostic;
use proc_macro2::{Ident, Literal, Span, TokenStream};
use quote::{quote, ToTokens};
use std::collections::HashSet;
use std::collections::{HashMap, HashSet};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Mutex;
use syn;
@ -32,10 +32,10 @@ impl TryToTokens for ast::Program {
for s in self.structs.iter() {
s.to_tokens(tokens);
}
let mut types = HashSet::new();
let mut types = HashMap::new();
for i in self.imports.iter() {
if let ast::ImportKind::Type(t) = &i.kind {
types.insert(t.rust_name.clone());
types.insert(t.rust_name.to_string(), t.rust_name.clone());
}
}
for i in self.imports.iter() {
@ -43,17 +43,20 @@ impl TryToTokens for ast::Program {
// If there is a js namespace, check that name isn't a type. If it is,
// this import might be a method on that type.
if let Some(ns) = &i.js_namespace {
if types.contains(ns) && i.kind.fits_on_impl() {
let kind = match i.kind.try_to_token_stream() {
Ok(kind) => kind,
Err(e) => {
errors.push(e);
continue;
}
};
(quote! { impl #ns { #kind } }).to_tokens(tokens);
continue;
if let Some(nss) = &i.js_namespace {
// When the namespace is `A.B`, the type name should be `B`.
if let Some(ns) = nss.last().and_then(|t| types.get(t)) {
if i.kind.fits_on_impl() {
let kind = match i.kind.try_to_token_stream() {
Ok(kind) => kind,
Err(e) => {
errors.push(e);
continue;
}
};
(quote! { impl #ns { #kind } }).to_tokens(tokens);
continue;
}
}
}

2
crates/backend/src/encode.rs
View File

@ -241,7 +241,7 @@ fn shared_import<'a>(i: &'a ast::Import, intern: &'a Interner) -> Result<Import<
ast::ImportModule::Inline(idx, _) => ImportModule::Inline(*idx as u32),
ast::ImportModule::None => ImportModule::None,
},
js_namespace: i.js_namespace.as_ref().map(|s| intern.intern(s)),
js_namespace: i.js_namespace.clone(),
kind: shared_import_kind(&i.kind, intern)?,
})
}