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

Get rid of unreachable in StackValueType

This commit is contained in:
Sergey Pepyakin 2019-04-18 17:38:59 +02:00
parent fb6638c163
commit 2a058136b9
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
validation/src/func.rs
View File

@ -51,22 +51,6 @@ pub enum StackValueType {
Specific(ValueType), Specific(ValueType),
} }
impl StackValueType {
fn is_any(&self) -> bool {
match self {
&StackValueType::Any => true,
_ => false,
}
}
fn value_type(&self) -> ValueType {
match self {
&StackValueType::Any => unreachable!("must be checked by caller"),
&StackValueType::Specific(value_type) => value_type,
}
}
}
impl From<ValueType> for StackValueType { impl From<ValueType> for StackValueType {
fn from(value_type: ValueType) -> Self { fn from(value_type: ValueType) -> Self {
StackValueType::Specific(value_type) StackValueType::Specific(value_type)
@ -75,20 +59,22 @@ impl From<ValueType> for StackValueType {
impl PartialEq<StackValueType> for StackValueType { impl PartialEq<StackValueType> for StackValueType {
fn eq(&self, other: &StackValueType) -> bool { fn eq(&self, other: &StackValueType) -> bool {
if self.is_any() || other.is_any() { match (*self, *other) {
true // Any type is equal with any other type.
} else { (StackValueType::Any, _) => true,
self.value_type() == other.value_type() (_, StackValueType::Any) => true,
(StackValueType::Specific(self_ty), StackValueType::Specific(other_ty)) => {
self_ty == other_ty
}
} }
} }
} }
impl PartialEq<ValueType> for StackValueType { impl PartialEq<ValueType> for StackValueType {
fn eq(&self, other: &ValueType) -> bool { fn eq(&self, other: &ValueType) -> bool {
if self.is_any() { match *self {
true StackValueType::Any => true,
} else { StackValueType::Specific(value_ty) => value_ty == *other,
self.value_type() == *other
} }
} }
} }