Change the Matcher interface to be generic interface for any kind of matchers

Author: AmrDeveloper

src/functions/matchers/combine.rs

@@ -4,14 +4,15 @@ use gitql_ast::types::varargs::VarargsType;
 use gitql_core::signature::Signature;
 use gitql_core::signature::StandardFunction;
 use gitql_core::values::base::Value;
+use inkwell::llvm_sys::prelude::LLVMValueRef;
 
 use crate::functions::binary_matchers_sides;
 use crate::ir::types::InstMatcherType;
 use crate::ir::values::InstMatcherValue;
 use crate::matchers::combine::CombineBinaryInstMatcher;
 use crate::matchers::combine::CombineInstMatcher;
 use crate::matchers::combine::CombineUnaryInstMatcher;
-use crate::matchers::InstMatcher;
+use crate::matchers::Matcher;
 
 #[inline(always)]
 pub fn register_combine_matchers_function(map: &mut HashMap<&'static str, StandardFunction>) {
@@ -101,7 +102,7 @@ pub fn register_combine_matchers_function_signatures(map: &mut HashMap<&'static
 }
 
 fn match_oneof_combine_inst(values: &[Box<dyn Value>]) -> Box<dyn Value> {
-    let mut matchers: Vec<Box<dyn InstMatcher>> = vec![];
+    let mut matchers: Vec<Box<dyn Matcher<LLVMValueRef>>> = vec![];
     for value in values.iter() {
         if let Some(inst_matcher) = value.as_any().downcast_ref::<InstMatcherValue>() {
             matchers.push(inst_matcher.matcher.to_owned());
@@ -112,7 +113,7 @@ fn match_oneof_combine_inst(values: &[Box<dyn Value>]) -> Box<dyn Value> {
 }
 
 fn match_allof_combine_inst(values: &[Box<dyn Value>]) -> Box<dyn Value> {
-    let mut matchers: Vec<Box<dyn InstMatcher>> = vec![];
+    let mut matchers: Vec<Box<dyn Matcher<LLVMValueRef>>> = vec![];
     for value in values.iter() {
         if let Some(inst_matcher) = value.as_any().downcast_ref::<InstMatcherValue>() {
             matchers.push(inst_matcher.matcher.to_owned());
@@ -123,7 +124,7 @@ fn match_allof_combine_inst(values: &[Box<dyn Value>]) -> Box<dyn Value> {
 }
 
 fn match_noneof_combine_inst(values: &[Box<dyn Value>]) -> Box<dyn Value> {
-    let mut matchers: Vec<Box<dyn InstMatcher>> = vec![];
+    let mut matchers: Vec<Box<dyn Matcher<LLVMValueRef>>> = vec![];
     for value in values.iter() {
         if let Some(inst_matcher) = value.as_any().downcast_ref::<InstMatcherValue>() {
             matchers.push(inst_matcher.matcher.to_owned());

src/functions/matchers/other.rs

@@ -17,6 +17,7 @@ use crate::ir::types::TypeMatcherType;
 use crate::ir::values::InstMatcherValue;
 use crate::ir::values::LLVMInstValue;
 use crate::ir::values::TypeMatcherValue;
+use crate::matchers::other::AnyInstMatcher;
 use crate::matchers::other::ArgumentMatcher;
 use crate::matchers::other::ExtractValueInstMatcher;
 use crate::matchers::other::InstTypeMatcher;
@@ -25,7 +26,6 @@ use crate::matchers::other::OperandCountMatcher;
 use crate::matchers::other::PoisonValueMatcher;
 use crate::matchers::other::ReturnInstMatcher;
 use crate::matchers::other::UnreachableInstMatcher;
-use crate::matchers::AnyInstMatcher;
 
 #[inline(always)]
 pub fn register_other_inst_matchers_functions(map: &mut HashMap<&'static str, StandardFunction>) {
@@ -136,7 +136,7 @@ fn match_inst(values: &[Box<dyn Value>]) -> Box<dyn Value> {
         .downcast_ref::<InstMatcherValue>()
         .unwrap();
 
-    let is_match = matcher.matcher.is_match(inst.llvm_value);
+    let is_match = matcher.matcher.is_match(&inst.llvm_value);
     Box::new(BoolValue { value: is_match })
 }
 

src/functions/mod.rs

@@ -8,6 +8,7 @@ use gitql_core::values::base::Value;
 
 use gitql_std::standard::standard_function_signatures;
 use gitql_std::standard::standard_functions;
+use inkwell::llvm_sys::prelude::LLVMValueRef;
 use matchers::arithmetic::register_arithmetic_matchers_function_signatures;
 use matchers::arithmetic::register_arithmetic_matchers_functions;
 use matchers::binary::register_binary_inst_matchers_function_signatures;
@@ -37,8 +38,8 @@ use matchers::usage::register_usage_matchers_functions;
 
 use crate::ir::types::InstMatcherType;
 use crate::ir::values::InstMatcherValue;
-use crate::matchers::AnyInstMatcher;
-use crate::matchers::InstMatcher;
+use crate::matchers::other::AnyInstMatcher;
+use crate::matchers::Matcher;
 
 pub(crate) mod matchers;
 
@@ -102,7 +103,10 @@ pub fn matcher_signature_without_parameters() -> Signature {
 #[inline]
 pub fn binary_matchers_sides(
     values: &[Box<dyn Value>],
-) -> (Box<dyn InstMatcher>, Box<dyn InstMatcher>) {
+) -> (
+    Box<dyn Matcher<LLVMValueRef>>,
+    Box<dyn Matcher<LLVMValueRef>>,
+) {
     let args_len = values.len();
 
     let lhs_matcher = if args_len > 0 {

src/ir/values.rs

@@ -11,8 +11,7 @@ use llvm_sys::prelude::LLVMValueRef;
 
 use crate::matchers::combine::CombineBinaryInstMatcher;
 use crate::matchers::combine::CombineUnaryInstMatcher;
-use crate::matchers::InstMatcher;
-use crate::matchers::TypeMatcher;
+use crate::matchers::Matcher;
 
 use super::types::InstMatcherType;
 use super::types::LLVMDataType;
@@ -102,7 +101,7 @@ impl Value for LLVMTypeValue {
 
 #[derive(Clone)]
 pub struct InstMatcherValue {
-    pub matcher: Box<dyn InstMatcher>,
+    pub matcher: Box<dyn Matcher<LLVMValueRef>>,
 }
 
 impl Value for InstMatcherValue {
@@ -170,7 +169,7 @@ impl Value for InstMatcherValue {
 
 #[derive(Clone)]
 pub struct TypeMatcherValue {
-    pub matcher: Box<dyn TypeMatcher>,
+    pub matcher: Box<dyn Matcher<LLVMTypeRef>>,
 }
 
 impl Value for TypeMatcherValue {