Improve error for type mismatch

Author: utkarshgupta137

engine/src/rhs_types/bytes.rs

@@ -1,8 +1,10 @@
+use crate::{Type, TypeMismatchError};
 use crate::{
     lex::{Lex, LexErrorKind, LexResult, take},
     strict_partial_ord::StrictPartialOrd,
 };
 use serde::{Serialize, Serializer};
+use std::num::IntErrorKind;
 use std::{
     fmt::{self, Debug, Formatter},
     hash::{Hash, Hasher},
@@ -160,6 +162,26 @@ fn fixed_byte(input: &str, digits: usize, radix: u32) -> LexResult<'_, u8> {
     let (digits, rest) = take(input, digits)?;
     match u8::from_str_radix(digits, radix) {
         Ok(b) => Ok((b, rest)),
+        Err(err)
+            if err.kind() == &IntErrorKind::InvalidDigit
+                && !digits.chars().any(|c| {
+                    if radix == 8 {
+                        matches!(c, '0'..='7')
+                    } else if radix == 16 {
+                        c.is_ascii_hexdigit()
+                    } else {
+                        false
+                    }
+                }) =>
+        {
+            Err((
+                LexErrorKind::TypeMismatch(TypeMismatchError {
+                    expected: Type::Int.into(),
+                    actual: Type::Bytes,
+                }),
+                digits,
+            ))
+        }
         Err(err) => Err((LexErrorKind::ParseInt { err, radix }, digits)),
     }
 }

engine/src/scheme.rs

@@ -1268,6 +1268,7 @@ fn test_parse_error() {
 
 #[test]
 fn test_parse_error_in_op() {
+    use crate::TypeMismatchError;
     use cidr::errors::NetworkParseError;
     use indoc::indoc;
     use std::{net::IpAddr, str::FromStr};
@@ -1479,6 +1480,33 @@ fn test_parse_error_in_op() {
         );
     }
 
+    {
+        let err = scheme.parse("str in {gh}").unwrap_err();
+        assert_eq!(
+            err,
+            ParseError {
+                kind: LexErrorKind::TypeMismatch(TypeMismatchError {
+                    expected: Type::Int.into(),
+                    actual: Type::Bytes,
+                }),
+                input: "str in {gh}",
+                line_number: 0,
+                span_start: 8,
+                span_len: 2
+            }
+        );
+        assert_eq!(
+            err.to_string(),
+            indoc!(
+                r#"
+                Filter parsing error (1:9):
+                str in {gh}
+                        ^^ expected value of type Int, but got Bytes
+                "#
+            )
+        );
+    }
+
     {
         let err = scheme.parse("str in {127.0.0.1}").unwrap_err();
         assert_eq!(