th-libs: th_regex.c annotate

annotate th_regex.c @ 638:c4bca120bfb0

Cleanups.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 21 Jan 2020 12:23:59 +0200
parents	d191ded8a790
children	8c957ad9d4c3

rev	line source
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * Simple regular expression matching functionality
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Programmed and designed by Matti 'ccr' Hamalainen
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 * (C) Copyright 2020 Tecnic Software productions (TNSP)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 *
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 * Please read file 'COPYING' for information on license and distribution.
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 */
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 #include "th_util.h"
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #include "th_regex.h"
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	12 #ifdef TH_EXPERIMENTAL_REGEX_DEBUG
d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	13 int th_dbg_re_flags = 0;
d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	14 # define DBG_RE_COMPILE(...) do { if (th_dbg_re_flags & TH_DBG_RE_COMPILE) fprintf(stderr, __VA_ARGS__); } while (0)
d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	15 # define DBG_RE_FREE(...) do { if (th_dbg_re_flags & TH_DBG_RE_FREE) fprintf(stderr, __VA_ARGS__); } while (0)
d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	16 # define DBG_RE_MATCH(...) do { if (th_dbg_re_flags & TH_DBG_RE_MATCH) fprintf(stderr, __VA_ARGS__); } while (0)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17 #else
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	18 # define DBG_RE_COMPILE(...)
d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	19 # define DBG_RE_FREE(...)
d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	20 # define DBG_RE_MATCH(...)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21 #endif
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	22
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23
614 afcaf5e38f56 Disable regex stuff from normal builds. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	24 #ifdef TH_EXPERIMENTAL_REGEX
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26 enum
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	27 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28 TH_RE_MATCH_ONCE,
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	29 TH_RE_MATCH_COUNT_GREEDY,
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	30 TH_RE_MATCH_COUNT_NONGREEDY,
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 TH_RE_MATCH_ANCHOR_START,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 TH_RE_MATCH_ANCHOR_END,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33 };
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 enum
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38 TH_RE_TYPE_CHAR,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 TH_RE_TYPE_ANY_CHAR,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40 TH_RE_TYPE_LIST,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41 TH_RE_TYPE_LIST_REVERSE,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 TH_RE_TYPE_SUBEXPR,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43 };
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	46 #ifdef TH_EXPERIMENTAL_REGEX_DEBUG
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47 static const char *re_match_modes[] =
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49 "ONCE",
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	50 "COUNT GREEDY",
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	51 "COUNT NONGREEDY",
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52 "ANCHOR_START",
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 "ANCHOR_END",
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54 };
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	56 static const char *re_match_types[] =
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	57 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	58 "CHAR",
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	59 "ANY",
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	60 "LIST",
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	61 "LIST_REVERSE",
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	62 "SUBEXPR",
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	63 };
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	64 #endif
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	65
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67 typedef struct
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 const th_regex_char *pattern;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70 size_t offs;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	72 th_regex_ctx *data;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	73
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	74 size_t nstack, stacksize;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	75 th_regex_ctx **stack;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	76 } th_regex_parse_ctx;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	77
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79 static void th_regex_node_init(th_regex_node *node)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81 memset(node, 0, sizeof(th_regex_node));
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82 node->mode = TH_RE_MATCH_ONCE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	84
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	86 static int th_regex_strndup(th_regex_char **pdst,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87 const th_regex_char *src, const size_t len)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89 if (pdst == NULL)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	90 return THERR_NULLPTR;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	91
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 if (UINTPTR_MAX / sizeof(th_regex_char) < len + 1)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93 return THERR_BOUNDS;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95 if ((pdst = (th_regex_char )
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96 th_malloc((len + 1) * sizeof(th_regex_char))) == NULL)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 return THERR_MALLOC;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 memcpy(pdst, src, len sizeof(th_regex_char));
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100 (*pdst)[len] = 0;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102 return THERR_OK;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	103 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	104
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106 static int th_regex_ctx_get_prev_node(
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	107 th_regex_parse_ctx ctx, th_regex_node *pnode)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 if (ctx->data != NULL && ctx->data->nnodes > 0)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111 *pnode = &ctx->data->nodes[ctx->data->nnodes - 1];
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112 return THERR_OK;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115 return THERR_INVALID_DATA;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	118
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119 static int th_regex_ctx_push(th_regex_parse_ctx *ctx)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121 if (ctx->stack == NULL \|\| ctx->nstack + 1 >= ctx->stacksize)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123 ctx->stacksize += 16;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125 if ((ctx->stack = th_realloc(ctx->stack,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126 ctx->stacksize * sizeof(th_regex_node *))) == NULL)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 return THERR_MALLOC;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130 ctx->stack[ctx->nstack] = ctx->data;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131 ctx->nstack++;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132 ctx->data = NULL;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134 return THERR_OK;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	137
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 static int th_regex_ctx_pop(th_regex_parse_ctx ctx, th_regex_ctx *data)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140 if (ctx->nstack > 0)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 *data = ctx->data;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 ctx->nstack--;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 ctx->data = ctx->stack[ctx->nstack];
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 return THERR_OK;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	147 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148 return THERR_INVALID_DATA;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	149 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	150
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	152 static int th_regex_ctx_node_commit(th_regex_parse_ctx ctx, th_regex_node node)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	153 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	154 th_regex_ctx *data = ctx->data;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	155
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 if (data == NULL)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 if ((data = ctx->data = th_malloc0(sizeof(th_regex_ctx))) == NULL)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 return THERR_MALLOC;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162 if (data->nodes == NULL \|\| data->nnodes + 1 >= data->nodessize)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164 data->nodessize += 16;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165 if ((data->nodes = th_realloc(data->nodes,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166 data->nodessize * sizeof(th_regex_node))) == NULL)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167 return THERR_MALLOC;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	169
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	170 memcpy(&data->nodes[data->nnodes], node, sizeof(th_regex_node));
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171 data->nnodes++;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	173 DBG_RE_COMPILE(
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174 "node [%" PRIu_SIZE_T " / %" PRIu_SIZE_T "]: "
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	175 "mode=%d, type=%d, rmin=%" PRId_SSIZE_T ", rmax=%" PRId_SSIZE_T "\n",
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176 data->nnodes, data->nodessize,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177 node->mode, node->type,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178 node->repeatMin, node->repeatMax);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 return THERR_OK;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184 static BOOL th_regex_find_next(const th_regex_char *str,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185 const size_t start, size_t *offs,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186 const th_regex_char delim)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	188 for (offs = start; str[offs] != 0; (*offs)++)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	189 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	190 if (str[*offs] == delim)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191 return TRUE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	192 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	193 return FALSE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	194 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	195
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	196
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197 static BOOL th_regex_parse_ssize_t(const th_regex_char *str,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	198 ssize_t *value)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200 th_regex_char ch;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201 BOOL neg;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	203 if (*str == '-')
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	204 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205 str++;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	206 neg = TRUE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	207 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	208 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	209 neg = FALSE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	210
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	211 // Is the value negative?
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	212 while ((ch = *str++))
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	213 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	214 if (ch >= '0' && ch <= '9')
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	215 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	216 value = 10;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217 *value += ch - '0';
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	219 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220 return FALSE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	222
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	223 if (neg)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	224 value = -(value);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	225
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	226 return TRUE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	227 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	228
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	229
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	230 int th_regex_compile(th_regex_ctx *pexpr, const th_regex_char pattern)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	231 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	232 int res = THERR_OK;
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	233 th_regex_parse_ctx ctx;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	234 th_regex_node node, *pnode;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	235 th_regex_char *tmp = NULL;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	236 size_t start;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	238 if (pexpr == NULL \|\| pattern == NULL)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239 {
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	240 res = THERR_NULLPTR;
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	241 goto exit;
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	242 }
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	243
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	244 memset(&ctx, 0, sizeof(ctx));
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	245 ctx.pattern = pattern;
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	246
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	247 for (; ctx.pattern[ctx.offs] != 0; ctx.offs++)
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	248 {
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	249 th_regex_char cch = ctx.pattern[ctx.offs];
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	250 DBG_RE_COMPILE("[%" PRIu_SIZE_T "] '%c'\n", ctx.offs, cch);
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	251 switch (cch)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	252 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	253 case '?':
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	254 case '*':
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	255 case '+':
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	256 if ((res = th_regex_ctx_get_prev_node(&ctx, &pnode)) != THERR_OK)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	257 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	258
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	259 if (cch == '?')
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	260 {
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	261 // Check if previous was a count
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	262 pnode->mode = (pnode->mode == TH_RE_MATCH_COUNT_GREEDY) ?
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	263 TH_RE_MATCH_COUNT_NONGREEDY : TH_RE_MATCH_COUNT_GREEDY;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	265 // Previous token is optional (repeat 0-1 times)
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	266 pnode->repeatMin = 0;
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	267 pnode->repeatMax = 1;
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	268 }
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	269 else
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	270 {
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	271 // Check if previous was a count
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	272 if (pnode->mode == TH_RE_MATCH_COUNT_GREEDY \|\|
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	273 pnode->mode == TH_RE_MATCH_COUNT_NONGREEDY)
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	274 {
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	275 res = THERR_INVALID_DATA;
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	276 goto exit;
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	277 }
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	278
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	279 pnode->mode = TH_RE_MATCH_COUNT_GREEDY;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	280
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	281 if (cch == '*')
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	282 {
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	283 // Previous token can repeat 0 or more times
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	284 pnode->repeatMin = 0;
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	285 pnode->repeatMax = -1;
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	286 }
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	287 else
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	288 {
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	289 // Previous token must repeat 1 or more times
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	290 pnode->repeatMin = 1;
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	291 pnode->repeatMax = -1;
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	292 }
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	293 }
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	294 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	295
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	296 case '{':
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	297 // {n} \| {min,max}
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	298 start = ctx.offs + 1;
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	299 if (!th_regex_find_next(ctx.pattern, start, &ctx.offs, '}'))
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	300 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	301 // End not found
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	302 res = THERR_INVALID_DATA;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	303 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	304 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	306 th_free(tmp);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	307
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	308 if ((res = th_regex_ctx_get_prev_node(&ctx, &pnode)) != THERR_OK \|\|
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	309 (res = th_regex_strndup(&tmp, ctx.pattern + start,
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	310 ctx.offs - start)) != THERR_OK)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	311 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	312
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	313 pnode->mode = TH_RE_MATCH_COUNT_GREEDY;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	314
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	315 if (th_regex_find_next(tmp, 0, &start, ','))
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	316 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	317 tmp[start] = 0;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	318 if (!th_regex_parse_ssize_t(tmp, &pnode->repeatMin) \|\|
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	319 !th_regex_parse_ssize_t(tmp + start + 1, &pnode->repeatMax))
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	320 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	321 res = THERR_INVALID_DATA;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	322 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	323 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	324 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	326 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327 if (!th_regex_parse_ssize_t(tmp, &pnode->repeatMin))
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	328 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	329 res = THERR_INVALID_DATA;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	330 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	331 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	332 pnode->repeatMax = pnode->repeatMin;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	333 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	334
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	335 if (pnode->repeatMin < 0 \|\| pnode->repeatMax < 1 \|\|
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336 pnode->repeatMax < pnode->repeatMin)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	337 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	338 // Invalid repeat counts
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	339 res = THERR_INVALID_DATA;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	341 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	342 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	344 case '(':
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	345 // Start of subpattern
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	346 if ((res = th_regex_ctx_push(&ctx)) != THERR_OK)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	347 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	348 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	349
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	350 case ')':
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351 // End of subpattern
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	352 th_regex_node_init(&node);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	353 node.type = TH_RE_TYPE_SUBEXPR;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	354
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	355 if ((res = th_regex_ctx_pop(&ctx, &node.match.expr)) != THERR_OK \|\|
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	356 (res = th_regex_ctx_node_commit(&ctx, &node)) != THERR_OK)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	359
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	360 case '^':
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	361 // Start of line anchor
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	362 th_regex_node_init(&node);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	363 node.mode = TH_RE_MATCH_ANCHOR_START;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	364
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	365 if ((res = th_regex_ctx_node_commit(&ctx, &node)) != THERR_OK)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	366 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	367 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	368
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	369 case '$':
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	370 // End of line anchor
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	371 th_regex_node_init(&node);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	372 node.mode = TH_RE_MATCH_ANCHOR_END;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	373
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	374 if ((res = th_regex_ctx_node_commit(&ctx, &node)) != THERR_OK)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	375 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	376 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	377
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	378 case '[':
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	379 // Start of char list
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	380 start = ctx.offs + 1;
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	381 if (!th_regex_find_next(ctx.pattern, start, &ctx.offs, ']') \|\|
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	382 ctx.offs == start)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	383 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384 res = THERR_INVALID_DATA;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	385 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	386 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	387
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	388 // XXX TODO Parse/support ranges [0-9a-zA-Z_-]
c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	389
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390 th_regex_node_init(&node);
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	391 node.type = (ctx.pattern[start] == '^') ?
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	392 TH_RE_TYPE_LIST_REVERSE : TH_RE_TYPE_LIST;
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	393 node.match.list.nchars = ctx.offs - start;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394 if ((res = th_regex_strndup(&node.match.list.chars,
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	395 ctx.pattern + start, node.match.list.nchars)) != THERR_OK)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	396 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	397
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	398 if ((res = th_regex_ctx_node_commit(&ctx, &node)) != THERR_OK)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	400 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	401
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402 case '.':
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403 // Any single character matches
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	404 th_regex_node_init(&node);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405 node.type = TH_RE_TYPE_ANY_CHAR;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	407 if ((res = th_regex_ctx_node_commit(&ctx, &node)) != THERR_OK)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	408 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	409 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	410
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	411 case '\\':
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	412 // Literal escape
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	413 ctx.offs++;
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	414 if (ctx.pattern[ctx.offs] == 0)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	415 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	416 // End of pattern, error
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	417 res = THERR_INVALID_DATA;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	418 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	420
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	421 th_regex_node_init(&node);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	422 node.type = TH_RE_TYPE_CHAR;
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	423 node.match.chr = ctx.pattern[ctx.offs];
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	424
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	425 if ((res = th_regex_ctx_node_commit(&ctx, &node)) != THERR_OK)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	426 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	427 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	428
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	429 default:
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	430 // Given character must match
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	431 th_regex_node_init(&node);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	432 node.type = TH_RE_TYPE_CHAR;
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	433 node.match.chr = ctx.pattern[ctx.offs];
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	434
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	435 if ((res = th_regex_ctx_node_commit(&ctx, &node)) != THERR_OK)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	436 goto exit;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	437 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	438 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	439 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	440
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441 exit:
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	442 *pexpr = ctx.data;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	443 th_free(tmp);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	444 return res;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	445 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	446
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	447
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	448 void th_regex_free(th_regex_ctx *expr)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	449 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	450 if (expr != NULL)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	451 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	452 for (size_t n = 0; n < expr->nnodes; n++)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	453 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	454 th_regex_node *node = &expr->nodes[n];
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	455
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	456 DBG_RE_FREE(
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	457 "node [%" PRIu_SIZE_T " / %" PRIu_SIZE_T "]: "
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	458 "mode=%d, type=%d, rmin=%" PRId_SSIZE_T ", rmax=%" PRId_SSIZE_T "\n",
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	459 n, expr->nnodes,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	460 node->mode, node->type,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	461 node->repeatMin, node->repeatMax);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	462
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	463 switch (node->type)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	464 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	465 case TH_RE_TYPE_SUBEXPR:
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	466 DBG_RE_FREE(" SUBEXPR: %p vs %p\n",
c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	467 (void ) expr, (void ) node->match.expr);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	468 th_regex_free(node->match.expr);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	469 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	470
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	471 case TH_RE_TYPE_LIST:
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472 case TH_RE_TYPE_LIST_REVERSE:
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	473 DBG_RE_FREE(" list='%s'\n", node->match.list.chars);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	474 th_free(node->match.list.chars);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	475 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	476
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	477 #ifdef TH_EXPERIMENTAL_REGEX_DEBUG
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	478 case TH_RE_TYPE_ANY_CHAR:
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	479 DBG_RE_FREE(" any char\n");
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	480 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	481
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	482 case TH_RE_TYPE_CHAR:
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	483 DBG_RE_FREE(" char='%c'\n", node->match.chr);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	484 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	485 #endif
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	486 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	487 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	488
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	489 th_free(expr->nodes);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	490 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	491 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	492
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	493
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	494 static BOOL th_regex_do_match_expr(const th_regex_ctx *expr,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	495 const th_regex_char haystack, size_t offs, const int flags);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	496
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	497
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	498 static BOOL th_regex_do_match_node(const th_regex_char *haystack,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	499 size_t offs, const th_regex_node node, const int flags)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	500 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	501 th_regex_char cch;
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	502 BOOL res = FALSE;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	503
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	504 DBG_RE_MATCH(" node_START [%s]: '%s': ",
c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	505 re_match_types[node->type], haystack + *offs);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	507 switch (node->type)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	508 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	509 case TH_RE_TYPE_SUBEXPR:
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	510 DBG_RE_MATCH("subexpr ..\n");
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	511 res = th_regex_do_match_expr(node->match.expr, haystack, offs, flags);
c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	512 return res;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	513 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	515 case TH_RE_TYPE_LIST:
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	516 case TH_RE_TYPE_LIST_REVERSE:
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	517 DBG_RE_MATCH("[%s]", node->match.list.chars);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	518 if ((cch = haystack[*offs]) == 0)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 goto out;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	521 // Could be optimized, perhaps .. sort match.chars, binary search etc?
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	522 // XXX TODO Ranges are not supported yet
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	523 for (size_t n = 0; n < node->match.list.nchars; n++)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	524 if (node->match.list.chars[n] == cch)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	525 {
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	526 res = TRUE;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	528 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	529
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530 if (node->type == TH_RE_TYPE_LIST_REVERSE)
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	531 res = !res;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	533 (*offs)++;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	535
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536 case TH_RE_TYPE_ANY_CHAR:
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537 if ((cch = haystack[*offs]) == 0)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538 goto out;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	540 res = TRUE;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	541 (*offs)++;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	542 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544 case TH_RE_TYPE_CHAR:
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	545 DBG_RE_MATCH("'%c'", node->match.chr);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546 if ((cch = haystack[*offs]) == 0)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547 goto out;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	549 res = (cch == node->match.chr);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550 (*offs)++;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	553
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	554 out:
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	555 DBG_RE_MATCH(", match=%s\n",
c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	556 res ? "YES" : "NO");
c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	557
c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	558 return res;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	559 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562 static BOOL th_regex_do_match_expr(const th_regex_ctx *expr,
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 const th_regex_char haystack, size_t offs, const int flags)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	564 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 for (size_t n = 0; n < expr->nnodes; n++)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567 const th_regex_node *node = &expr->nodes[n];
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568 size_t soffs;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	569
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	570 DBG_RE_MATCH(" expr [%" PRIu_SIZE_T "/%" PRIu_SIZE_T "]: %s ",
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	571 n, expr->nnodes, re_match_modes[node->mode]);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	572
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	573 switch (node->mode)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	574 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575 case TH_RE_MATCH_ONCE:
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576 {
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	577 DBG_RE_MATCH("\n");
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578 soffs = *offs;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 if (!th_regex_do_match_node(haystack, &soffs, node, flags))
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580 return FALSE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581 *offs = soffs;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	584
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	585 case TH_RE_MATCH_COUNT_GREEDY:
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	586 case TH_RE_MATCH_COUNT_NONGREEDY:
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	587 {
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	588 BOOL done = FALSE;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	589 ssize_t count = 0;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	590
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	591 DBG_RE_MATCH("min=%" PRId_SSIZE_T ", max=%" PRId_SSIZE_T "\n", node->repeatMin, node->repeatMax);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	593 do
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	594 {
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	595 BOOL match;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	596 soffs = *offs;
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	597
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	598 match = th_regex_do_match_node(haystack, &soffs, node, flags);
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	599 for (size_t qn = n + 1; qn < expr->nnodes && haystack[soffs] != 0; qn++)
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	600 {
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	601 const th_regex_node *next = &expr->nodes[qn];
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	602 do {
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	603 match = th_regex_do_match_node(haystack, &soffs, next, flags);
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	604 } while (haystack[soffs] != 0 && !match);
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	605 }
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	606
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	607 if (match)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609 // Node matched
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	610 count++;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611 done = (node->repeatMax > 0 && count >= node->repeatMax);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612 *offs = soffs;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	614 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	615 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	616 // Node did not match, check if we got the minimum if set
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617 done = (node->repeatMin >= 0 && count >= node->repeatMin);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618 soffs = *offs;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	620 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	621 } while (!done);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	622
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	623 DBG_RE_MATCH("RESULT: %" PRId_SSIZE_T " = %s\n", count, done ? "YES" : "NO");
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	624
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	625 if (!done)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	626 return FALSE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	627
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	628 *offs = soffs;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	629 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	630 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	631
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	632 case TH_RE_MATCH_ANCHOR_START:
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	633 DBG_RE_MATCH("offs=%" PRIu_SIZE_T "\n", *offs);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	634 if (*offs != 0)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	635 return FALSE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	636 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	637
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	638 case TH_RE_MATCH_ANCHOR_END:
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	639 DBG_RE_MATCH("is end=%d\n", haystack[*offs]);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	640 if (haystack[*offs] != 0)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	641 return FALSE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	642 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	643 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	644 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	645
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	646 return TRUE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	647 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	648
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	649
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	650 int th_regex_match(const th_regex_ctx expr, const th_regex_char haystack,
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	651 size_t pnmatches, th_regex_match_node *pmatches, const size_t maxmatches,
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	652 const int flags)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	653 {
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	654 size_t nmatches = 0;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	655
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	656 if (pnmatches != NULL)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	657 *pnmatches = 0;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	659 // Check given pattern and string
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	660 if (expr == NULL \|\| haystack == NULL)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661 return THERR_NULLPTR;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	663 // Start matching
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	664 // XXX NOTE .. lots to think about and to take into account:
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	665 // - anchored and unanchored expressions
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	666 // - how to check if the expression has consumed all possibilities?
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	667 // ..
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	668 for (size_t soffs = 0; haystack[soffs] != 0; )
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	669 {
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	670 BOOL matched;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	671 size_t coffs = soffs;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	672
635 d191ded8a790 Improve the experimental regex matching debugging macros. Matti Hamalainen <ccr@tnsp.org> parents: 614 diff changeset	673 DBG_RE_MATCH("\nTRY_MATCH @ startoffs=%" PRIu_SIZE_T ": '%s'\n",
612 cc9ec51b4875 Add some comments and debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	674 soffs, haystack + soffs);
cc9ec51b4875 Add some comments and debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	675
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	676 if ((matched = th_regex_do_match_expr(expr, haystack, &coffs, flags)))
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	677 {
612 cc9ec51b4875 Add some comments and debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	678 // A match was found, increase count
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	679 nmatches++;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	680
612 cc9ec51b4875 Add some comments and debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	681 // Deliver to caller if required
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	682 if (pnmatches != NULL)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	683 *pnmatches = nmatches;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	684
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	685 if (pmatches != NULL)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	686 {
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	687 th_regex_match_node *match = th_malloc0(sizeof(th_regex_match_node));
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	688 if (match == NULL)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	689 return THERR_MALLOC;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	690
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	691 match->start = soffs;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	692 match->len = coffs - soffs;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	693
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	694 th_llist_append_node((th_llist_t *) pmatches, (th_llist_t ) match);
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	695 }
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	696
612 cc9ec51b4875 Add some comments and debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	697 // Check match count limit, if set
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	698 if (maxmatches > 0 && nmatches >= maxmatches)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	699 break;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	700
612 cc9ec51b4875 Add some comments and debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	701 // If offset was not advanced, increase by one
cc9ec51b4875 Add some comments and debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	702 // otherwise use end of match offset as new start
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	703 if (soffs == coffs)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	704 soffs++;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	705 else
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	706 soffs = coffs;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	707 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	708 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	709 {
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	710 soffs++;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	711 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	712 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	713
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	714 return THERR_OK;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	715 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	716
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	717
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	718 static void th_regex_free_match(th_regex_match_node *node)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	719 {
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	720 (void) node;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	721 // Nothing to do here at the moment
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	722 }
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	723
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	724
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	725 void th_regex_free_matches(th_regex_match_node *matches)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	726 {
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	727 th_llist_free_func_node((th_llist_t *) matches,
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	728 (void ()(th_llist_t )) th_regex_free_match);
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	729 }
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	730
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	731 #endif // TH_EXPERIMENTAL_REGEX

Mercurial > hg > th-libs

annotate th_regex.c @ 638:c4bca120bfb0