filterx: move regexp_subst to separate file

refactor to use func-flags to handle flag args Signed-off-by: shifter <shifter@axoflow.com>
axoflow · Dec 9, 2024 · 199f067 · 199f067
1 parent b6f3f4b
commit 199f067
Show file tree

Hide file tree

Showing 9 changed files with 425 additions and 357 deletions.
diff --git a/lib/filterx/CMakeLists.txt b/lib/filterx/CMakeLists.txt
@@ -18,6 +18,7 @@ set(FILTERX_HEADERS
     filterx/expr-plus.h
     filterx/expr-regexp-common.h
     filterx/expr-regexp-search.h
+    filterx/expr-regexp-subst.h
     filterx/expr-regexp.h
     filterx/expr-set-subscript.h
     filterx/expr-setattr.h
@@ -83,6 +84,7 @@ set(FILTERX_SOURCES
     filterx/expr-plus.c
     filterx/expr-regexp-common.c
     filterx/expr-regexp-search.c
+    filterx/expr-regexp-subst.c
     filterx/expr-regexp.c
     filterx/expr-set-subscript.c
     filterx/expr-setattr.c

diff --git a/lib/filterx/Makefile.am b/lib/filterx/Makefile.am
@@ -20,6 +20,7 @@ filterxinclude_HEADERS = 			\
 	lib/filterx/expr-plus.h \
 	lib/filterx/expr-regexp-common.h \
 	lib/filterx/expr-regexp-search.h \
+	lib/filterx/expr-regexp-subst.h \
 	lib/filterx/expr-regexp.h \
 	lib/filterx/expr-set-subscript.h \
 	lib/filterx/expr-setattr.h \
@@ -85,6 +86,7 @@ filterx_sources = 				\
 	lib/filterx/expr-plus.c \
 	lib/filterx/expr-regexp-common.c \
 	lib/filterx/expr-regexp-search.c \
+	lib/filterx/expr-regexp-subst.c \
 	lib/filterx/expr-regexp.c \
 	lib/filterx/expr-set-subscript.c \
 	lib/filterx/expr-setattr.c \

diff --git a/lib/filterx/expr-regexp-common.h b/lib/filterx/expr-regexp-common.h
@@ -52,4 +52,22 @@ gboolean filterx_regexp_extract_optional_arg_flag(FLAGSET *flags, const gchar **
 gboolean filterx_regexp_match(FilterXReMatchState *state, pcre2_code_8 *pattern, gint start_offset);
 gboolean filterx_regexp_match_eval(FilterXExpr *lhs_expr, pcre2_code_8 *pattern, FilterXReMatchState *state);
 
+static inline gint
+match_start_offset(PCRE2_SIZE *ovector)
+{
+  return ovector[0];
+}
+
+static inline gint
+match_end_offset(PCRE2_SIZE *ovector)
+{
+  return ovector[1];
+}
+
+static inline gboolean
+is_zero_length_match(PCRE2_SIZE *ovector)
+{
+  return ovector[0] == ovector[1];
+}
+
 #endif