Merge pull request #4 from calcit-lang/dyn-eq

trying DynEq

Author: NoEgAm

.github/workflows/check.yaml

@@ -16,7 +16,7 @@ jobs:
 
       - uses: calcit-lang/[email protected]
         with:
-          version: "0.8.52"
+          version: "0.8.56"
 
       - uses: dtolnay/rust-toolchain@stable
         with:

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "calcit_regex"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["jiyinyiyong <[email protected]>"]
 edition = "2021"
 
@@ -13,7 +13,7 @@ crate-type = ["dylib"] # Creates dynamic lib
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cirru_edn = "0.6.8"
+cirru_edn = "0.6.10"
 # cirru_edn = { path = "/Users/chenyong/repo/cirru/edn.rs" }
 cirru_parser = "0.1.29"
 regex = "1.10.4"

Cargo.toml

@@ -1,6 +1,6 @@
 
 {} (:package |regex)
-  :configs $ {} (:init-fn |regex.test/main!) (:reload-fn |regex.test/reload!) (:version |0.0.7)
+  :configs $ {} (:init-fn |regex.test/main!) (:reload-fn |regex.test/reload!) (:version |0.0.8)
     :modules $ []
   :entries $ {}
   :files $ {}

calcit.cirru

@@ -1,8 +1,26 @@
 use std::sync::{Arc, RwLock};
 
-use cirru_edn::{Edn, EdnAnyRef, EdnListView};
+use cirru_edn::{DynEq, Edn, EdnAnyRef, EdnListView};
 use regex::Regex;
 
+#[derive(Debug)]
+struct RegexWrapper(pub Regex);
+
+impl DynEq for RegexWrapper {
+  fn as_any(&self) -> &dyn std::any::Any {
+    &self.0
+  }
+
+  fn do_eq(&self, rhs: &dyn DynEq) -> bool {
+    if let Some(_rhs_concrete) = rhs.as_any().downcast_ref::<Regex>() {
+      // does not compare the regex pattern
+      false
+    } else {
+      false
+    }
+  }
+}
+
 #[no_mangle]
 pub fn abi_version() -> String {
   String::from("0.0.9")
@@ -14,8 +32,7 @@ pub fn re_pattern(args: Vec<Edn>) -> Result<Edn, String> {
     match &args[0] {
       Edn::Str(s) => match Regex::new(s) {
         Ok(pattern) => {
-          let p = Arc::from(RwLock::new(pattern));
-
+          let p = Arc::from(RwLock::new(RegexWrapper(pattern)));
           Ok(Edn::AnyRef(EdnAnyRef(p)))
         }
         Err(e) => Err(format!("re-pattern failed, {}", e)),
@@ -36,7 +53,7 @@ pub fn re_matches(args: Vec<Edn>) -> Result<Edn, String> {
         Err(e) => Err(format!("re-matches failed, {}", e)),
       },
       (Edn::Str(s), Edn::AnyRef(EdnAnyRef(p))) => {
-        if let Some(pattern) = p.read().map_err(|e| e.to_string())?.downcast_ref::<Regex>() {
+        if let Some(pattern) = p.read().map_err(|e| e.to_string())?.as_any().downcast_ref::<Regex>() {
           Ok(Edn::Bool(pattern.is_match(s)))
         } else {
           Err(format!("re-matches expected a regex, got {:?}", p))
@@ -63,7 +80,7 @@ pub fn re_find_index(args: Vec<Edn>) -> Result<Edn, String> {
         }
       }
       (Edn::Str(s), Edn::AnyRef(EdnAnyRef(p))) => {
-        if let Some(pattern) = p.read().map_err(|e| e.to_string())?.downcast_ref::<Regex>() {
+        if let Some(pattern) = p.read().map_err(|e| e.to_string())?.as_any().downcast_ref::<Regex>() {
           match pattern.find(s) {
             Some(matched) => Ok(Edn::Number(matched.start() as f64)),
             None => Ok(Edn::Number(-1.0)), // TODO maybe nil
@@ -97,7 +114,7 @@ pub fn re_find(args: Vec<Edn>) -> Result<Edn, String> {
         }
       }
       (Edn::Str(s), Edn::AnyRef(EdnAnyRef(p))) => {
-        if let Some(pattern) = p.read().map_err(|e| e.to_string())?.downcast_ref::<Regex>() {
+        if let Some(pattern) = p.read().map_err(|e| e.to_string())?.as_any().downcast_ref::<Regex>() {
           let mut matched = pattern.find_iter(s);
           match matched.next() {
             Some(v) => Ok(Edn::str(v.as_str().to_string())),
@@ -129,7 +146,7 @@ pub fn re_find_all(args: Vec<Edn>) -> Result<Edn, String> {
         Err(e) => Err(format!("re-find-all failed, {}", e)),
       },
       (Edn::Str(s), Edn::AnyRef(EdnAnyRef(p))) => {
-        if let Some(pattern) = p.read().map_err(|e| e.to_string())?.downcast_ref::<Regex>() {
+        if let Some(pattern) = p.read().map_err(|e| e.to_string())?.as_any().downcast_ref::<Regex>() {
           let mut ys: Vec<Edn> = vec![];
           for v in pattern.find_iter(s) {
             ys.push(Edn::Str(v.as_str().to_string().into()))
@@ -161,7 +178,7 @@ pub fn re_split(args: Vec<Edn>) -> Result<Edn, String> {
         Err(e) => Err(format!("re-split failed, {}", e)),
       },
       (Edn::Str(s), Edn::AnyRef(EdnAnyRef(p))) => {
-        if let Some(pattern) = p.read().map_err(|e| e.to_string())?.downcast_ref::<Regex>() {
+        if let Some(pattern) = p.read().map_err(|e| e.to_string())?.as_any().downcast_ref::<Regex>() {
           let mut ys: Vec<Edn> = vec![];
           for piece in pattern.split(s) {
             ys.push(Edn::str(piece));
@@ -187,7 +204,7 @@ pub fn re_replace_all(args: Vec<Edn>) -> Result<Edn, String> {
         Err(e) => Err(format!("re-replace-all failed, {}", e)),
       },
       (Edn::Str(s), Edn::AnyRef(EdnAnyRef(p)), Edn::Str(next)) => {
-        if let Some(pattern) = p.read().map_err(|e| e.to_string())?.downcast_ref::<Regex>() {
+        if let Some(pattern) = p.read().map_err(|e| e.to_string())?.as_any().downcast_ref::<Regex>() {
           Ok(Edn::str(pattern.replace_all(s, &**next).into_owned()))
         } else {
           Err(format!("re-replace-all expected a regex, got {:?}", p))