track pattern with vec

Author: tiye

Cargo.lock

@@ -13,10 +13,11 @@ 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.4-a3"
+cirru_edn = "0.6.4-a4"
 # cirru_edn = { path = "/Users/chenyong/repo/cirru/edn.rs" }
 cirru_parser = "0.1.29"
 regex = "1.10.4"
+lazy_static = "1.4.0"
 
 # [profile.release]
 # debug = true

Cargo.toml

@@ -70,10 +70,12 @@
                 assert= "\"22" $ re-find |q22 pattern
                 assert= ([] |1 |2 |3) (re-find-all |1q2q3 pattern)
                 assert= |XabXcX $ re-replace-all |1ab22c333 pattern "\"X"
+                w-log $ re-drop pattern
+                w-log $ re-drop pattern
       :ns $ %{} :CodeEntry (:doc |)
         :code $ quote
           ns regex.test $ :require
-            regex.core :refer $ re-matches re-find-index re-find re-find-all re-split re-replace-all re-pattern
+            regex.core :refer $ re-matches re-find-index re-find re-find-all re-split re-replace-all re-pattern re-drop
             regex.$meta :refer $ calcit-dirname calcit-filename
     |regex.util $ %{} :FileEntry
       :defs $ {}

calcit.cirru

@@ -1,8 +1,16 @@
-use std::{cell::RefCell, sync::Arc};
+use std::{
+  cell::RefCell,
+  sync::{Arc, Mutex},
+};
 
 use cirru_edn::{Edn, EdnAnyRef, EdnListView};
+use lazy_static::lazy_static;
 use regex::Regex;
 
+lazy_static! {
+  static ref PATTERNS: Mutex<Vec<EdnAnyRef>> = Mutex::from(vec![]);
+}
+
 #[no_mangle]
 pub fn abi_version() -> String {
   String::from("0.0.8")
@@ -15,9 +23,11 @@ pub fn re_pattern(args: Vec<Edn>) -> Result<Edn, String> {
       Edn::Str(s) => match Regex::new(s) {
         Ok(pattern) => {
           let p = Arc::from(RefCell::new(pattern));
-          let p2 = p.to_owned();
-          std::mem::forget(p);
-          Ok(Edn::AnyRef(EdnAnyRef(p2)))
+          // push to PATTERNS
+          let v = EdnAnyRef(p);
+          let mut patterns = PATTERNS.lock().unwrap();
+          patterns.push(v.to_owned());
+          Ok(Edn::AnyRef(v))
         }
         Err(e) => Err(format!("re-pattern failed, {}", e)),
       },
@@ -28,6 +38,37 @@ pub fn re_pattern(args: Vec<Edn>) -> Result<Edn, String> {
   }
 }
 
+/// re_drop drops pattern from global PATTERNS
+#[no_mangle]
+pub fn re_drop(args: Vec<Edn>) -> Result<Edn, String> {
+  if args.len() == 1 {
+    match &args[0] {
+      Edn::AnyRef(p) => {
+        let mut patterns = PATTERNS.lock().unwrap();
+        let mut i = 0;
+        let mut found = false;
+        for v in patterns.iter() {
+          if v == p {
+            found = true;
+            break;
+          }
+          i += 1;
+        }
+        println!("re-drop found {} at {}\n", found, i);
+        if found {
+          patterns.remove(i);
+          Ok(Edn::from(true))
+        } else {
+          Ok(Edn::from(false))
+        }
+      }
+      _ => Err(format!("re-drop expect 1 pattern, got {:?}", args)),
+    }
+  } else {
+    Err(format!("re-drop expect 1 pattern, got {:?}", args))
+  }
+}
+
 #[no_mangle]
 pub fn re_matches(args: Vec<Edn>) -> Result<Edn, String> {
   if args.len() == 2 {