From 435bae5898962937121c26c6294128a5464e132c Mon Sep 17 00:00:00 2001 From: Sergey Pepyakin Date: Wed, 14 Feb 2018 13:36:17 +0300 Subject: [PATCH] Use wasmi ValueType for RuntimeValue instead pwasm (#52) `RuntimeValue::default` takes `parity_wasm::elements::ValueType` as an input parameter. This change fixes it to be wasmi's `ValueType`. --- src/runner.rs | 1 + src/value.rs | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/runner.rs b/src/runner.rs index 2b9d505..4f194c2 100644 --- a/src/runner.rs +++ b/src/runner.rs @@ -1101,6 +1101,7 @@ impl FunctionContext { let locals = locals.iter() .flat_map(|l| repeat(l.value_type()).take(l.count() as usize)) + .map(::types::ValueType::from_elements) .map(RuntimeValue::default) .collect::>(); self.locals.extend(locals); diff --git a/src/value.rs b/src/value.rs index 808210e..3cd6915 100644 --- a/src/value.rs +++ b/src/value.rs @@ -123,12 +123,12 @@ pub trait Float: ArithmeticOps { impl RuntimeValue { /// Creates new default value of given type. - pub fn default(value_type: ValueType) -> Self { + pub fn default(value_type: ::types::ValueType) -> Self { match value_type { - ValueType::I32 => RuntimeValue::I32(0), - ValueType::I64 => RuntimeValue::I64(0), - ValueType::F32 => RuntimeValue::F32(0f32), - ValueType::F64 => RuntimeValue::F64(0f64), + ::types::ValueType::I32 => RuntimeValue::I32(0), + ::types::ValueType::I64 => RuntimeValue::I64(0), + ::types::ValueType::F32 => RuntimeValue::F32(0f32), + ::types::ValueType::F64 => RuntimeValue::F64(0f64), } }