fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-04-03 16:31:02 +00:00
Code Issues Projects Releases Wiki Activity

feat(interface-types) Continue.

Browse Source
This commit is contained in:
Ivan Enderlin 2019-09-19 00:25:28 +02:00
parent dc3c72ea19
commit 2f3c37fbd5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/interface-types/src/instructions/interpreter.rs
View File

@ -1,12 +1,11 @@
use crate::instructions::{stack::Stack, Instruction}; use crate::instructions::{stack::Stack, Instruction};
use std::convert::TryFrom; use std::convert::TryFrom;
type ExecutableInstruction = dyn Fn(&mut Stack); type ExecutableInstruction = Box<dyn Fn(&mut Stack)>;
//trait ExecutableInstruction: Fn(&mut Stack) {}
pub(crate) struct Interpreter { pub(crate) struct Interpreter {
stack: Stack, stack: Stack,
instructions: Vec<Box<dyn Fn(&mut Stack) + 'static>>, instructions: Vec<ExecutableInstruction>,
} }
impl Interpreter { impl Interpreter {
@ -21,7 +20,7 @@ impl<'binary_input> TryFrom<&Vec<Instruction<'binary_input>>> for Interpreter {
fn try_from(instructions: &Vec<Instruction>) -> Result<Self, Self::Error> { fn try_from(instructions: &Vec<Instruction>) -> Result<Self, Self::Error> {
let executable_instructions = instructions let executable_instructions = instructions
.iter() .iter()
.map(|instruction| -> Box<dyn Fn(&mut Stack) + 'static> { .map(|instruction| -> ExecutableInstruction {
match instruction { match instruction {
Instruction::ArgumentGet(index) => { Instruction::ArgumentGet(index) => {
let index = index.to_owned(); let index = index.to_owned();
@ -50,7 +49,7 @@ impl<'binary_input> TryFrom<&Vec<Instruction<'binary_input>>> for Interpreter {
_ => unimplemented!(), _ => unimplemented!(),
} }
}) })
.collect::<Vec<_>>(); .collect();
Ok(Interpreter { Ok(Interpreter {
stack: Stack::new(), stack: Stack::new(),