From 2bc0ca739022918a0809b60949a603827112e911 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Thu, 27 Oct 2022 12:49:31 -0400 Subject: Revert "Moving to each_match() API" This reverts commit 9380a54d7cf1795b26be79cd7abbb74a415d0788. --- match.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'match.h') diff --git a/match.h b/match.h index 9e5d050..cf4f977 100644 --- a/match.h +++ b/match.h @@ -25,13 +25,15 @@ typedef struct match_s { struct match_s *_children[3]; } match_t; -typedef void (*bp_errhand_t)(const char *err_msg); - -typedef enum {BP_STOP = 0, BP_CONTINUE} bp_match_behavior; -typedef bp_match_behavior (*bp_match_callback)(match_t *m, int matchnum, void *userdata); -int each_match(bp_match_callback fn, void *userdata, const char *start, const char *end, pat_t *pat, pat_t *defs, pat_t *skip, bool ignorecase); -bp_errhand_t set_match_error_handler(bp_errhand_t errhand); +typedef void (*bp_errhand_t)(pat_t *pat, const char *err_msg); +__attribute__((nonnull)) +void recycle_match(match_t **at_m); +size_t free_all_matches(void); +size_t recycle_all_matches(void); +bool next_match(match_t **m, const char *start, const char *end, pat_t *pat, pat_t *defs, pat_t *skip, bool ignorecase); +#define stop_matching(m) next_match(m, NULL, NULL, NULL, NULL, NULL, 0) +bool next_match_safe(match_t **m, const char *start, const char *end, pat_t *pat, pat_t *defs, pat_t *skip, bool ignorecase, bp_errhand_t errhand); __attribute__((nonnull)) match_t *get_numbered_capture(match_t *m, int n); __attribute__((nonnull, pure)) -- cgit v1.2.3