fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-28 14:11:57 +00:00
Code Issues Projects Releases Wiki Activity

fix also for signature collection

Browse Source
This commit is contained in:
NikVolf
2017-04-11 14:06:59 +03:00
parent 9c960b7009
commit 5a73b10ff8
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/builder/module.rs
View File

@ -144,6 +144,7 @@ impl<F> ModuleBuilder<F> where F: Invoke<elements::Module> {
fn resolve_type_ref(&mut self, signature: code::Signature) -> u32 { fn resolve_type_ref(&mut self, signature: code::Signature) -> u32 {
match signature { match signature {
code::Signature::Inline(func_type) => { code::Signature::Inline(func_type) => {
// todo: maybe search for existing type
self.module.types.types_mut().push(elements::Type::Function(func_type)); self.module.types.types_mut().push(elements::Type::Function(func_type));
self.module.types.types().len() as u32 - 1 self.module.types.types().len() as u32 - 1
} }
@ -161,27 +162,9 @@ impl<F> ModuleBuilder<F> where F: Invoke<elements::Module> {
/// Push signatures in the module, returning corresponding indices of pushed signatures /// Push signatures in the module, returning corresponding indices of pushed signatures
pub fn push_signatures(&mut self, signatures: code::SignatureBindings) -> Vec<u32> { pub fn push_signatures(&mut self, signatures: code::SignatureBindings) -> Vec<u32> {
let mut result = Vec::new(); signatures.into_iter().map(|binding|
self.resolve_type_ref(binding)
// todo: maybe reuse existing types with the equal signatures ).collect()
let raw_functions: Vec<u32> = signatures.into_iter().map(|binding|
match binding {
code::Signature::Inline(func_type) => {
self.module.types.types_mut().push(elements::Type::Function(func_type));
self.module.types.types().len() as u32 - 1
}
code::Signature::TypeReference(type_ref) => {
type_ref
}
}
).collect();
for function in raw_functions {
self.module.functions.entries_mut().push(elements::Func::new(function));
result.push(self.module.functions.entries_mut().len() as u32 - 1);
}
result
} }
pub fn function(self) -> FunctionBuilder<Self> { pub fn function(self) -> FunctionBuilder<Self> {