From 2360e81263e430eb27bf6230905957a830648dd2 Mon Sep 17 00:00:00 2001
From: yangwentong <425822674@qq.com>
Date: Tue, 27 Dec 2022 14:33:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 re2/filtered_re2.cc | 10 ++++++++++
 re2/re2.cc          |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/re2/filtered_re2.cc b/re2/filtered_re2.cc
index 1e1cac5..2b96923 100644
--- a/re2/filtered_re2.cc
+++ b/re2/filtered_re2.cc
@@ -279,4 +279,14 @@ namespace re2
     AtomsToRegexps(re2_vec_, atoms, potential_regexps, prefilter_tree_->getMinAtomLen());
   }
 
+  void FilteredRE2::RegexpsGivenStrings(const std::vector<int>& matched_atoms,
+                                      std::vector<int>* passed_regexps) 
+  {
+    // RegexpsGivenStrings为filtered_re2.h中定义的私有成员函数，re2-rust中并没有使用
+  }
+  void FilteredRE2::PrintPrefilter(int regexpid) 
+  {
+    // PrintPrefilter为filtered_re2.h中定义的私有成员函数，re2-rust中并没有使用
+  }
+
 } // namespace re2
diff --git a/re2/re2.cc b/re2/re2.cc
index fd7282f..4091209 100644
--- a/re2/re2.cc
+++ b/re2/re2.cc
@@ -252,7 +252,7 @@ namespace re2
 
     return *named_groups_;
   }
-  /*
+  
   // Returns group_names_, computing it if needed.
   const std::map<int, std::string> &RE2::CapturingGroupNames() const
   {
@@ -272,7 +272,6 @@ namespace re2
 
     return *group_names_;
   }
-  */
 
   /***** Convenience interfaces *****/
 
-- 
Gitee


From bcab2c7411f1e42c2f3009a3ed6a5eb07f682ada Mon Sep 17 00:00:00 2001
From: yangwentong <425822674@qq.com>
Date: Tue, 27 Dec 2022 21:01:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4abort?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 regex-capi/src/lib.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/regex-capi/src/lib.rs b/regex-capi/src/lib.rs
index 5784a95..e5f2ffe 100644
--- a/regex-capi/src/lib.rs
+++ b/regex-capi/src/lib.rs
@@ -29,7 +29,6 @@ use regex::{bytes, Regex};
 use crate::error::{Error, ErrorKind};
 use std::io;
 use std::io::Write;
-use std::process::abort;
 
 include!("lib_internal.rs");
 
@@ -125,7 +124,6 @@ extern "C" fn rure_compile_must(pattern: *const c_char) -> *const RegexBytes {
     if err.is_err() {
         let _ = writeln!(&mut io::stderr(), "{}", err);
         let _ = writeln!(&mut io::stderr(), "aborting from rure_compile_must");
-        abort()
     }
     re
 }
@@ -410,7 +408,6 @@ extern "C" fn rure_escape_must(pattern: *const c_char) -> *const c_char {
         println!("aborting from rure_escape_must");
         let _ = writeln!(&mut io::stderr(), "{}", err);
         let _ = writeln!(&mut io::stderr(), "aborting from rure_escape_must");
-        abort()
     }
     esc
 }
-- 
Gitee