chore: fix clippy warning and add tests

VirusTotal · Jul 27, 2023 · 29dcacd · 29dcacd
1 parent c00ac2c
commit 29dcacd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/yara-x/src/re/compiler.rs b/yara-x/src/re/compiler.rs
@@ -291,14 +291,14 @@ impl Compiler {
     fn visit_post_class(&mut self, class: &Class) -> Location {
         match class {
             Class::Bytes(class) => {
-                if let Some(byte) = class_to_hex_byte(&class) {
+                if let Some(byte) = class_to_hex_byte(class) {
                     self.emit_masked_byte(byte)
                 } else if self.case_insensitive {
                     let mut class = class.clone();
                     class.case_fold_simple();
                     self.emit_class(&class)
                 } else {
-                    self.emit_class(&class)
+                    self.emit_class(class)
                 }
             }
             Class::Unicode(class) => {

diff --git a/yara-x/src/tests/mod.rs b/yara-x/src/tests/mod.rs
@@ -832,11 +832,20 @@ fn regexp_patterns_3() {
 
 #[test]
 fn regexp_nocase() {
+    pattern_match!(r#"/abc/ nocase"#, b"ABC", b"ABC");
     pattern_match!(r#"/a[bx]c/ nocase"#, b"ABC", b"ABC");
     pattern_match!(r#"/a[bx]c/ nocase"#, b"AXC", b"AXC");
     pattern_match!(r#"/a[0-9]*b/ nocase"#, b"AB", b"AB");
     pattern_match!(r#"/[a-z]+/ nocase"#, b"AbC", b"AbC");
     pattern_match!(r#"/(abc|xyz)+/ nocase"#, b"AbCxYz", b"AbCxYz");
+    pattern_match!(r#"/(a|x)bc/ nocase"#, b"ABC", b"ABC");
+    pattern_match!(r#"/(a|x)bc/ nocase"#, b"XBC", b"XBC");
+
+    // TODO
+    //pattern_match!(r#"/abc[^d]/ nocase"#, b"abce", b"abce");
+    //pattern_match!(r#"/abc[^d]/ nocase"#, b"ABCE", b"ABCE");
+    //pattern_false!(r#"/abc[^d]/ nocase"#, b"abcd");
+    //pattern_false!(r#"/abc[^d]/ nocase"#, b"ABCD");
 }
 
 #[test]