diff --git a/src/rules.rs b/src/rules.rs index bcb812b..f011fc8 100644 --- a/src/rules.rs +++ b/src/rules.rs @@ -27,8 +27,8 @@ pub enum InstructionType { Local, Global, ControlFlow, - IntegerComparsion, - FloatComparsion, + IntegerComparison, + FloatComparison, Float, Conversion, FloatConversion, @@ -54,8 +54,8 @@ impl ::std::str::FromStr for InstructionType { "local" => Ok(InstructionType::Local), "global" => Ok(InstructionType::Global), "flow" => Ok(InstructionType::ControlFlow), - "integer_comp" => Ok(InstructionType::IntegerComparsion), - "float_comp" => Ok(InstructionType::FloatComparsion), + "integer_comp" => Ok(InstructionType::IntegerComparison), + "float_comp" => Ok(InstructionType::FloatComparison), "float" => Ok(InstructionType::Float), "conversion" => Ok(InstructionType::Conversion), "float_conversion" => Ok(InstructionType::FloatConversion), @@ -130,43 +130,43 @@ impl InstructionType { F32Const(_) => InstructionType::FloatConst, F64Const(_) => InstructionType::FloatConst, - I32Eqz => InstructionType::IntegerComparsion, - I32Eq => InstructionType::IntegerComparsion, - I32Ne => InstructionType::IntegerComparsion, - I32LtS => InstructionType::IntegerComparsion, - I32LtU => InstructionType::IntegerComparsion, - I32GtS => InstructionType::IntegerComparsion, - I32GtU => InstructionType::IntegerComparsion, - I32LeS => InstructionType::IntegerComparsion, - I32LeU => InstructionType::IntegerComparsion, - I32GeS => InstructionType::IntegerComparsion, - I32GeU => InstructionType::IntegerComparsion, + I32Eqz => InstructionType::IntegerComparison, + I32Eq => InstructionType::IntegerComparison, + I32Ne => InstructionType::IntegerComparison, + I32LtS => InstructionType::IntegerComparison, + I32LtU => InstructionType::IntegerComparison, + I32GtS => InstructionType::IntegerComparison, + I32GtU => InstructionType::IntegerComparison, + I32LeS => InstructionType::IntegerComparison, + I32LeU => InstructionType::IntegerComparison, + I32GeS => InstructionType::IntegerComparison, + I32GeU => InstructionType::IntegerComparison, - I64Eqz => InstructionType::IntegerComparsion, - I64Eq => InstructionType::IntegerComparsion, - I64Ne => InstructionType::IntegerComparsion, - I64LtS => InstructionType::IntegerComparsion, - I64LtU => InstructionType::IntegerComparsion, - I64GtS => InstructionType::IntegerComparsion, - I64GtU => InstructionType::IntegerComparsion, - I64LeS => InstructionType::IntegerComparsion, - I64LeU => InstructionType::IntegerComparsion, - I64GeS => InstructionType::IntegerComparsion, - I64GeU => InstructionType::IntegerComparsion, + I64Eqz => InstructionType::IntegerComparison, + I64Eq => InstructionType::IntegerComparison, + I64Ne => InstructionType::IntegerComparison, + I64LtS => InstructionType::IntegerComparison, + I64LtU => InstructionType::IntegerComparison, + I64GtS => InstructionType::IntegerComparison, + I64GtU => InstructionType::IntegerComparison, + I64LeS => InstructionType::IntegerComparison, + I64LeU => InstructionType::IntegerComparison, + I64GeS => InstructionType::IntegerComparison, + I64GeU => InstructionType::IntegerComparison, - F32Eq => InstructionType::FloatComparsion, - F32Ne => InstructionType::FloatComparsion, - F32Lt => InstructionType::FloatComparsion, - F32Gt => InstructionType::FloatComparsion, - F32Le => InstructionType::FloatComparsion, - F32Ge => InstructionType::FloatComparsion, + F32Eq => InstructionType::FloatComparison, + F32Ne => InstructionType::FloatComparison, + F32Lt => InstructionType::FloatComparison, + F32Gt => InstructionType::FloatComparison, + F32Le => InstructionType::FloatComparison, + F32Ge => InstructionType::FloatComparison, - F64Eq => InstructionType::FloatComparsion, - F64Ne => InstructionType::FloatComparsion, - F64Lt => InstructionType::FloatComparsion, - F64Gt => InstructionType::FloatComparsion, - F64Le => InstructionType::FloatComparsion, - F64Ge => InstructionType::FloatComparsion, + F64Eq => InstructionType::FloatComparison, + F64Ne => InstructionType::FloatComparison, + F64Lt => InstructionType::FloatComparison, + F64Gt => InstructionType::FloatComparison, + F64Le => InstructionType::FloatComparison, + F64Ge => InstructionType::FloatComparison, I32Clz => InstructionType::Bit, I32Ctz => InstructionType::Bit, @@ -307,7 +307,7 @@ impl Set { pub fn with_forbidden_floats(mut self) -> Self { self.entries.insert(InstructionType::Float, Metering::Forbidden); - self.entries.insert(InstructionType::FloatComparsion, Metering::Forbidden); + self.entries.insert(InstructionType::FloatComparison, Metering::Forbidden); self.entries.insert(InstructionType::FloatConst, Metering::Forbidden); self.entries.insert(InstructionType::FloatConversion, Metering::Forbidden); self