Skip to content

Commit

Permalink
Try #286:
Browse files Browse the repository at this point in the history
  • Loading branch information
bors[bot] committed Mar 25, 2019
2 parents bf3af66 + 225b82a commit c307f17
Show file tree
Hide file tree
Showing 2 changed files with 130 additions and 0 deletions.
122 changes: 122 additions & 0 deletions lib/runtime-core/src/import.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
use crate::export::Export;
use hashbrown::{hash_map::Entry, HashMap};
use std::collections::VecDeque;
use std::{
cell::{Ref, RefCell},
rc::Rc,
};

pub trait LikeNamespace {
fn get_export(&self, name: &str) -> Option<Export>;
fn get_exports(&self) -> Vec<(String, Export)>;
fn maybe_insert(&mut self, name: &str, export: Export) -> Option<()>;
}

pub trait IsExport {
Expand Down Expand Up @@ -97,6 +100,53 @@ impl ImportObject {
map: Rc::clone(&self.map),
}
}

fn get_objects(&self) -> VecDeque<(String, String, Export)> {
let mut out = VecDeque::new();
for (name, ns) in self.map.borrow().iter() {
for (id, exp) in ns.get_exports() {
out.push_back((name.clone(), id, exp));
}
}
out
}
}

pub struct ImportObjectIterator {
elements: VecDeque<(String, String, Export)>,
}

impl Iterator for ImportObjectIterator {
type Item = (String, String, Export);
fn next(&mut self) -> Option<Self::Item> {
self.elements.pop_front()
}
}

impl IntoIterator for ImportObject {
type IntoIter = ImportObjectIterator;
type Item = (String, String, Export);

fn into_iter(self) -> Self::IntoIter {
ImportObjectIterator {
elements: self.get_objects(),
}
}
}

impl Extend<(String, String, Export)> for ImportObject {
fn extend<T: IntoIterator<Item = (String, String, Export)>>(&mut self, iter: T) {
let mut map = self.map.borrow_mut();
for (ns, id, exp) in iter.into_iter() {
if let Some(like_ns) = map.get_mut(&ns) {
like_ns.maybe_insert(&id, exp);
} else {
let mut new_ns = Namespace::new();
new_ns.insert(id, exp);
map.insert(ns, Box::new(new_ns));
}
}
}
}

pub struct Namespace {
Expand All @@ -123,4 +173,76 @@ impl LikeNamespace for Namespace {
fn get_export(&self, name: &str) -> Option<Export> {
self.map.get(name).map(|is_export| is_export.to_export())
}

fn get_exports(&self) -> Vec<(String, Export)> {
self.map
.iter()
.map(|(k, v)| (k.clone(), v.to_export()))
.collect()
}

fn maybe_insert(&mut self, name: &str, export: Export) -> Option<()> {
self.map.insert(name.to_owned(), Box::new(export));
Some(())
}
}

#[cfg(test)]
mod test {
use crate::export::Export;
use crate::global::Global;
use crate::types::Value;

#[test]
fn extending_works() {
let mut imports1 = imports! {
"dog" => {
"happy" => Global::new(Value::I32(0)),
},
};

let imports2 = imports! {
"dog" => {
"small" => Global::new(Value::I32(2)),
},
"cat" => {
"small" => Global::new(Value::I32(3)),
},
};

imports1.extend(imports2);

let cat_ns = imports1.get_namespace("cat").unwrap();
assert!(cat_ns.get_export("small").is_some());

let dog_ns = imports1.get_namespace("dog").unwrap();
assert!(dog_ns.get_export("happy").is_some());
assert!(dog_ns.get_export("small").is_some());
}

#[test]
fn extending_conflict_overwrites() {
let mut imports1 = imports! {
"dog" => {
"happy" => Global::new(Value::I32(0)),
},
};

let imports2 = imports! {
"dog" => {
"happy" => Global::new(Value::I32(4)),
},
};

imports1.extend(imports2);
let dog_ns = imports1.get_namespace("dog").unwrap();

assert!(
if let Export::Global(happy_dog_global) = dog_ns.get_export("happy").unwrap() {
happy_dog_global.get() == Value::I32(4)
} else {
false
}
);
}
}
8 changes: 8 additions & 0 deletions lib/runtime-core/src/instance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,14 @@ impl LikeNamespace for Instance {

Some(self.inner.get_export_from_index(&self.module, export_index))
}

fn get_exports(&self) -> Vec<(String, Export)> {
unimplemented!("Use the exports method instead");
}

fn maybe_insert(&mut self, _name: &str, _export: Export) -> Option<()> {
None
}
}

/// A representation of an exported WebAssembly function.
Expand Down

0 comments on commit c307f17

Please sign in to comment.