xeos
/
wasmi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove another TODO

This commit is contained in:
Sergey Pepyakin 2019-04-16 16:36:16 +02:00
parent 88c48aa1ea
commit 36e671bc31
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
validation/src/func.rs
View File

@ -1121,11 +1121,10 @@ fn push_value(
Ok(value_stack.push(value_type.into())?) Ok(value_stack.push(value_type.into())?)
} }
// TODO: Rename value_type -> expected_value_ty
fn pop_value( fn pop_value(
value_stack: &mut StackWithLimit<StackValueType>, value_stack: &mut StackWithLimit<StackValueType>,
frame_stack: &StackWithLimit<BlockFrame>, frame_stack: &StackWithLimit<BlockFrame>,
value_type: StackValueType, expected_value_ty: StackValueType,
) -> Result<StackValueType, Error> { ) -> Result<StackValueType, Error> {
let (is_stack_polymorphic, label_value_stack_len) = { let (is_stack_polymorphic, label_value_stack_len) = {
let frame = top_label(frame_stack); let frame = top_label(frame_stack);
@ -1145,13 +1144,13 @@ fn pop_value(
value_stack.pop()? value_stack.pop()?
}; };
match actual_value { match actual_value {
StackValueType::Specific(stack_value_type) if stack_value_type == value_type => { StackValueType::Specific(stack_value_type) if stack_value_type == expected_value_ty => {
Ok(actual_value) Ok(actual_value)
} }
StackValueType::Any => Ok(actual_value), StackValueType::Any => Ok(actual_value),
stack_value_type @ _ => Err(Error(format!( stack_value_type @ _ => Err(Error(format!(
"Expected value of type {:?} on top of stack. Got {:?}", "Expected value of type {:?} on top of stack. Got {:?}",
value_type, stack_value_type expected_value_ty, stack_value_type
))), ))),
} }
} }