From 3b616b5260f2f477563508b6eec5370506565da9 Mon Sep 17 00:00:00 2001 From: Tyge Løvset Date: Thu, 8 Dec 2022 16:36:30 +0100 Subject: Changed/simplified cregex_replace*() API. --- src/cregex.c | 6 +++--- src/libstc.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/cregex.c b/src/cregex.c index 1747ed3f..53f33a16 100644 --- a/src/cregex.c +++ b/src/cregex.c @@ -1244,11 +1244,11 @@ cregex_replace_sv(const cregex* re, csview input, const char* replace, unsigned } cstr -cregex_replace_pattern(const char* pattern, const char* input, const char* replace, unsigned count, - bool (*mfun)(int, csview, cstr*), int crflags) { +cregex_replace_pattern_n(const char* pattern, const char* input, const char* replace, unsigned count, + bool (*mfun)(int, csview, cstr*), int crflags) { cregex re = cregex_init(); if (cregex_compile(&re, pattern, crflags) != cre_success) - return cstr_new("[[error: invalid regex pattern]]"); + assert(0); csview sv = {input, strlen(input)}; cstr out = cregex_replace_sv(&re, sv, replace, count, mfun, crflags); cregex_drop(&re); diff --git a/src/libstc.c b/src/libstc.c index 30c610c6..e8980a7a 100644 --- a/src/libstc.c +++ b/src/libstc.c @@ -1,11 +1,11 @@ -#define STC_EXTERN // implement common extern, non-templated functions, e.g. _clist_mergesort(). -#define STC_HEADER // don't implement clist_int itself, just dummy declare it. +#define STC_EXTERN // implement common extern, non-templated functions and dependencies. #define i_val int +#define i_header // don't implement clist_int itself, just dummy declare it. #include "../include/stc/clist.h" #define STC_IMPLEMENT // implement the following. -#include "../include/stc/cstr.h" +#include "../include/stc/cregex.h" #include "../include/stc/csview.h" -#include "../include/stc/crandom.h" +//#include "../include/stc/crandom.h" -- cgit v1.2.3