th-libs: th_regex.c annotate

annotate th_regex.c @ 647:1e7e3f96632e

And some more work.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 25 Jan 2020 06:47:41 +0200
parents	b897995101b7
children	91c43398c6fc

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
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	13 BOOL th_dbg_re_flags = FALSE;
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	14
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	15 # define DBG_RE_MATCH(...) do { \
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	16 if (th_dbg_re_flags) \
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	17 { \
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	18 th_regex_dump_indent(stdout, level); \
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	19 fprintf(stdout, __VA_ARGS__); \
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	20 } \
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	21 } while (0)
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	22 #else
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	23 # define DBG_RE_MATCH(...)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	24 #endif
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	25
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	26
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	27 #ifdef TH_EXPERIMENTAL_REGEX
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	28
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	29 enum
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	30 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	31 TH_RE_MATCH_ONCE,
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	32 TH_RE_MATCH_COUNT,
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	33 TH_RE_MATCH_ANCHOR_START,
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	34 TH_RE_MATCH_ANCHOR_END,
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	35 };
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	36
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	37
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	38 enum
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	39 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	40 TH_RE_TYPE_CHAR,
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	41 TH_RE_TYPE_STR,
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	42 TH_RE_TYPE_ANY_CHAR,
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	43 TH_RE_TYPE_LIST,
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	44 TH_RE_TYPE_LIST_REVERSE,
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	45 TH_RE_TYPE_SUBEXPR,
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	46 };
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	47
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	48
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	49 static const char *re_match_modes[] =
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	50 {
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	51 "ONCE",
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	52 "COUNT",
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	53 "ANCHOR START",
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	54 "ANCHOR END",
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	55 };
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	56
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	57
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	58 static const char *re_match_types[] =
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	59 {
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	60 "CHAR",
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	61 "STR",
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	62 "ANY",
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	63 "LIST",
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	64 "LIST REVERSE",
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	65 "SUBEXPR",
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	66 };
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	67
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	69 typedef struct
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	70 {
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	71 int type;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	72 th_regex_char_t start, end;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	73
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	74 size_t nchars;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	75 th_regex_char_t *chars;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	76 } th_regex_list_item_t;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	77
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	78
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	79 typedef struct
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	80 {
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	81 size_t nitems, itemssize;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	82 th_regex_list_item_t *items;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	83 } th_regex_list_t;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	84
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	85
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	86 typedef struct
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	87 {
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	88 int mode, type;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	89 ssize_t repeatMin, repeatMax;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	90
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	91 struct {
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	92 th_regex_char_t chr;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	93 th_regex_char_t *str;
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	94 th_regex_list_t list;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	95
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	96 th_regex_t *expr;
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	97 } match;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	98 } th_regex_node_t;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	99
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	100
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	101 struct th_regex_t
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	102 {
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	103 size_t nnodes, nodessize;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	104 th_regex_node_t *nodes;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	105 };
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	106
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	107
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	108 typedef struct
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	110 const th_regex_char_t *pattern;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	111 size_t offs;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	113 th_regex_t *data;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	114
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	115 size_t nstack, stacksize;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	116 th_regex_t **stack;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	117
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	118 th_regex_char_t *buf;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	119 size_t bufSize, bufPos;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	120
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	121 } th_regex_parse_ctx_t;
605 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
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	124 static void th_regex_node_init(th_regex_node_t *node)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	126 memset(node, 0, sizeof(th_regex_node_t));
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 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	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
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	131 static int th_regex_strndup(th_regex_char_t **pdst,
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	132 const th_regex_char_t *src, const size_t len)
605 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 if (pdst == NULL)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 return THERR_NULLPTR;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	137 if (UINTPTR_MAX / sizeof(th_regex_char_t) < len + 1)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 return THERR_BOUNDS;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	140 if ((pdst = (th_regex_char_t )
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	141 th_malloc((len + 1) * sizeof(th_regex_char_t))) == NULL)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 return THERR_MALLOC;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	144 memcpy(pdst, src, len sizeof(th_regex_char_t));
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 (*pdst)[len] = 0;
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 return THERR_OK;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148 }
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
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	151 static int th_regex_parse_ctx_get_prev_node(
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	152 th_regex_parse_ctx_t ctx, th_regex_node_t *pnode)
605 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 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	155 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 *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	157 return THERR_OK;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160 return THERR_INVALID_DATA;
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
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	164 static int th_regex_parse_ctx_push(th_regex_parse_ctx_t *ctx)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166 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	167 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168 ctx->stacksize += 16;
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 if ((ctx->stack = th_realloc(ctx->stack,
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	171 ctx->stacksize * sizeof(th_regex_node_t *))) == NULL)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172 return THERR_MALLOC;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	173 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	175 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	176 ctx->nstack++;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177 ctx->data = NULL;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179 return THERR_OK;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 }
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
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	183 static int th_regex_parse_ctx_pop(th_regex_parse_ctx_t ctx, th_regex_t *data)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185 if (ctx->nstack > 0)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187 *data = ctx->data;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	188 ctx->nstack--;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	189 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	190 return THERR_OK;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	192 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	193 return THERR_INVALID_DATA;
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
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	197 static int th_regex_parse_ctx_node_commit(th_regex_parse_ctx_t ctx, th_regex_node_t node)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	198 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	199 th_regex_t *data = ctx->data;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201 if (data == NULL)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	203 if ((data = ctx->data = th_malloc0(sizeof(th_regex_t))) == NULL)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	204 return THERR_MALLOC;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	206
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	207 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	208 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	209 data->nodessize += 16;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	210 if ((data->nodes = th_realloc(data->nodes,
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	211 data->nodessize * sizeof(th_regex_node_t))) == NULL)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	212 return THERR_MALLOC;
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
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	215 memcpy(&data->nodes[data->nnodes], node, sizeof(th_regex_node_t));
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	216 data->nnodes++;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218 return THERR_OK;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	219 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	222 static BOOL th_regex_find_next(const th_regex_char_t *str,
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	223 const size_t start, size_t *offs,
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	224 const th_regex_char_t delim)
605 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 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	227 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	228 if (str[*offs] == delim)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	229 return TRUE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	230 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	231 return FALSE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	232 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	233
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	234
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	235 static BOOL th_regex_parse_ssize_t(const th_regex_char_t *str,
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	236 ssize_t *value)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	238 th_regex_char_t ch;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239 BOOL neg;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	240
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	241 if (*str == '-')
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	242 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	243 str++;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	244 neg = TRUE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	245 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	246 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	247 neg = FALSE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	248
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	249 // Is the value negative?
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	250 while ((ch = *str++))
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	251 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	252 if (ch >= '0' && ch <= '9')
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	253 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	254 value = 10;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	255 *value += ch - '0';
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	256 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	257 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	258 return FALSE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	259 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	261 if (neg)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 value = -(value);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	263
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264 return TRUE;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	265 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	266
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	267
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	268 static void th_regex_list_item_init(th_regex_list_item_t *item)
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	269 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	270 memset(item, 0, sizeof(th_regex_list_item_t));
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	271 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	272
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	273
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	274 static int th_regex_list_add_item(th_regex_list_t list, th_regex_list_item_t item)
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	275 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	276 if (list->items == NULL \|\| list->nitems + 1 >= list->itemssize)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	277 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	278 list->itemssize += 16;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	279
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	280 if ((list->items = th_realloc(list->items,
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	281 list->itemssize * sizeof(th_regex_list_item_t))) == NULL)
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	282 return THERR_MALLOC;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	283 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	284
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	285 memcpy(&list->items[list->nitems], item, sizeof(th_regex_list_item_t));
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	286 list->nitems++;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	287
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	288 return THERR_OK;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	289 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	290
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	291
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	292 static void th_regex_list_free(th_regex_list_t *list)
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	293 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	294 if (list != NULL)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	295 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	296 for (size_t n = 0; n < list->nitems; n++)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	297 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	298 th_free(list->items[n].chars);
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	299 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	300 th_free(list->items);
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	301 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	302 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	303
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	304
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	305 static int th_regex_parse_list(const th_regex_char_t *str,
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	306 const size_t slen, th_regex_list_t *list)
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	307 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	308 th_regex_char_t *tmp = NULL;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	309 th_regex_list_item_t item;
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	310 int res;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	311
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	312 if ((res = th_regex_strndup(&tmp, str, slen)) != THERR_OK)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	313 goto out;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	314
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	315 // Handle ranges like [A-Z]
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	316 for (size_t offs = 0; offs < slen; offs++)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	317 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	318 th_regex_char_t
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	319 *prev = (offs > 0) ? tmp + offs - 1 : NULL,
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	320 *curr = tmp + offs,
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	321 *next = (offs + 1 < slen) ? tmp + offs + 1 : NULL;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	322
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	323 if (*curr == '-')
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	324 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	325 if (prev != NULL && next != NULL)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	326 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	327 // Range
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	328 th_regex_list_item_init(&item);
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	329 item.type = 1;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	330 item.start = *prev;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	331 item.end = *next;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	332
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	333 if (item.start >= item.end)
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	334 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	335 res = THERR_INVALID_DATA;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	336 goto out;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	337 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	338
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	339 curr = prev = *next = 0;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	340
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	341 if ((res = th_regex_list_add_item(list, &item)) != THERR_OK)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	342 goto out;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	343 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	344 else
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	345 if (next != NULL)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	346 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	347 res = THERR_INVALID_DATA;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	348 goto out;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	349 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	350 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	351 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	352
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	353 // Count number of remaining characters
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	354 th_regex_list_item_init(&item);
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	355 item.type = 0;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	356 item.nchars = 0;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	357
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	358 for (size_t offs = 0; offs < slen; offs++)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	359 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	360 th_regex_char_t curr = tmp[offs];
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	361 if (curr != 0)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	362 item.nchars++;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	363 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	364
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	365 if (item.nchars > 0)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	366 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	367 if ((item.chars = th_malloc(sizeof(th_regex_char_t) * item.nchars)) == NULL)
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	368 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	369 res = THERR_MALLOC;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	370 goto out;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	371 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	372
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	373 for (size_t offs = 0, n = 0; offs < slen; offs++)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	374 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	375 th_regex_char_t curr = tmp[offs];
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	376 if (curr != 0)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	377 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	378 item.chars[n] = curr;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	379 n++;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	380 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	381 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	382
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	383 if ((res = th_regex_list_add_item(list, &item)) != THERR_OK)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	384 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	385 th_free(item.chars);
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	386 goto out;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	387 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	388 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	389
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	390 out:
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	391 th_free(tmp);
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	392 return res;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	393 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	394
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	395
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	396 static int th_regex_parse_ctx_node_commit_strchr_do(th_regex_parse_ctx_t *ctx,
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	397 const th_regex_char_t *buf, const size_t bufLen)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	398 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	399 th_regex_node_t node;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	400 th_regex_node_init(&node);
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	401
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	402 if (bufLen > 1)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	403 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	404 int res;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	405 node.type = TH_RE_TYPE_STR;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	406 if ((res = th_regex_strndup(&node.match.str, buf, bufLen)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	407 return res;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	408 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	409 else
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	410 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	411 node.type = TH_RE_TYPE_CHAR;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	412 node.match.chr = buf[0];
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	413 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	414
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	415 return th_regex_parse_ctx_node_commit(ctx, &node);
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	416 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	417
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	418
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	419 static int th_regex_parse_ctx_node_commit_strchr(th_regex_parse_ctx_t *ctx, const BOOL split)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	420 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	421 int res = THERR_OK;;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	422
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	423 if (ctx->bufPos > 0)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	424 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	425 if (ctx->bufPos > 1 && split)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	426 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	427 if ((res = th_regex_parse_ctx_node_commit_strchr_do(ctx, ctx->buf, ctx->bufPos - 1)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	428 return res;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	429
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	430 res = th_regex_parse_ctx_node_commit_strchr_do(ctx, ctx->buf + ctx->bufPos - 1, 1);
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	431 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	432 else
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	433 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	434 res = th_regex_parse_ctx_node_commit_strchr_do(ctx, ctx->buf, ctx->bufPos);
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	435 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	436 ctx->bufPos = 0;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	437 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	438
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	439 return res;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	440 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	441
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	442
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	443 int th_regex_compile(th_regex_t *pexpr, const th_regex_char_t pattern)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	444 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	445 int res = THERR_OK;
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	446 th_regex_parse_ctx_t ctx;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	447 th_regex_node_t node, *pnode;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	448 th_regex_char_t *tmp = NULL;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	449 size_t start;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	450
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	451 // Check pointers
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	452 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	453 {
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	454 res = THERR_NULLPTR;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	455 goto out;
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	456 }
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	457
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	458 // Initialize parsing context
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	459 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	460 ctx.pattern = pattern;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	461 ctx.bufSize = 256;
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	462
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	463 if ((ctx.buf = th_malloc(ctx.bufSize * sizeof(th_regex_char_t))) == NULL)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	464 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	465 res = THERR_MALLOC;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	466 goto out;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	467 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	468
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	469 // Start parsing the pattern
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	470 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	471 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	472 th_regex_char_t cch = ctx.pattern[ctx.offs];
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	473
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	474 switch (cch)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	475 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	476 case '?':
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	477 case '*':
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	478 case '+':
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	479 if ((res = th_regex_parse_ctx_node_commit_strchr(&ctx, TRUE)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	480 goto out;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	481
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	482 if ((res = th_regex_parse_ctx_get_prev_node(&ctx, &pnode)) != THERR_OK)
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	483 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	484
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	485 if (cch == '?')
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	486 {
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	487 // Previous token is optional (repeat 0-1 times) (non-greedy matching)
a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	488 pnode->mode = TH_RE_MATCH_COUNT;
a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	489 pnode->repeatMin = 0;
a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	490 pnode->repeatMax = 1;
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	491 }
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	492 else
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	493 {
641 9a1ed82abefd Fix parsing of +? and ?. Matti Hamalainen <ccr@tnsp.org>* parents: 640 diff changeset	494 // Check if previous was a count ("*", "+", etc.)
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	495 if (pnode->mode == TH_RE_MATCH_COUNT)
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	496 {
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	497 res = THERR_INVALID_DATA;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	498 goto out;
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	499 }
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	500
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	501 pnode->mode = TH_RE_MATCH_COUNT;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	502
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	503 if (cch == '*')
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	504 {
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	505 // Previous token can repeat 0 or more times
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	506 pnode->repeatMin = 0;
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	507 pnode->repeatMax = -1;
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	508 }
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	509 else
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	510 {
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	511 // Previous token must repeat 1 or more times
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	512 pnode->repeatMin = 1;
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	513 pnode->repeatMax = -1;
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	514 }
2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	515 }
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	516 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	517
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	518 case '{':
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	519 if ((res = th_regex_parse_ctx_node_commit_strchr(&ctx, TRUE)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	520 goto out;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	521
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	522 // {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	523 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	524 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	525 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526 // End not found
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527 res = THERR_INVALID_DATA;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	528 goto out;
605 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
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531 th_free(tmp);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	533 if ((res = th_regex_parse_ctx_get_prev_node(&ctx, &pnode)) != THERR_OK \|\|
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	534 (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	535 ctx.offs - start)) != THERR_OK)
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	536 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	538 pnode->mode = TH_RE_MATCH_COUNT;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540 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	541 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	542 tmp[start] = 0;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543 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	544 !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	545 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546 res = THERR_INVALID_DATA;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	547 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	549 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552 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	553 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	554 res = THERR_INVALID_DATA;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	555 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	556 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	557 pnode->repeatMax = pnode->repeatMin;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	558 }
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 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	561 pnode->repeatMax < pnode->repeatMin)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 // Invalid repeat counts
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	564 res = THERR_INVALID_DATA;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	565 goto out;
605 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 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	569 case '(':
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	570 if ((res = th_regex_parse_ctx_node_commit_strchr(&ctx, FALSE)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	571 goto out;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	572
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	573 // Start of subpattern
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	574 if ((res = th_regex_parse_ctx_push(&ctx)) != THERR_OK)
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	575 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578 case ')':
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	579 if ((res = th_regex_parse_ctx_node_commit_strchr(&ctx, FALSE)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	580 goto out;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	581
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582 // End of subpattern
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 th_regex_node_init(&node);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	584 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	585
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	586 if ((res = th_regex_parse_ctx_pop(&ctx, &node.match.expr)) != THERR_OK \|\|
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	587 (res = th_regex_parse_ctx_node_commit(&ctx, &node)) != THERR_OK)
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	588 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	589 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	590
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	591 case '^':
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	592 if ((res = th_regex_parse_ctx_node_commit_strchr(&ctx, FALSE)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	593 goto out;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	594
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595 // Start of line anchor
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	596 th_regex_node_init(&node);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597 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	598
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	599 if ((res = th_regex_parse_ctx_node_commit(&ctx, &node)) != THERR_OK)
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	600 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	601 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	602
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	603 case '$':
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	604 if ((res = th_regex_parse_ctx_node_commit_strchr(&ctx, FALSE)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	605 goto out;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	606
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607 // End of line anchor
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608 th_regex_node_init(&node);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609 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	610
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	611 if ((res = th_regex_parse_ctx_node_commit(&ctx, &node)) != THERR_OK)
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	612 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	614
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	615 case '[':
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	616 if ((res = th_regex_parse_ctx_node_commit_strchr(&ctx, FALSE)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	617 goto out;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	618
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619 // 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	620 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	621 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	622 ctx.offs == start)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	623 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	624 res = THERR_INVALID_DATA;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	625 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	626 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	627
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	628 th_regex_node_init(&node);
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	629 if (ctx.pattern[start] == '^')
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	630 {
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	631 node.type = TH_RE_TYPE_LIST_REVERSE;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	632 start++;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	633 }
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	634 else
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	635 node.type = TH_RE_TYPE_LIST;
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	636
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	637 if ((res = th_regex_parse_list(ctx.pattern + start,
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	638 ctx.offs - start, &node.match.list)) != THERR_OK \|\|
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	639 (res = th_regex_parse_ctx_node_commit(&ctx, &node)) != THERR_OK)
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	640 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	641 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	642
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	643 case '.':
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	644 if ((res = th_regex_parse_ctx_node_commit_strchr(&ctx, FALSE)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	645 goto out;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	646
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	647 // Any single character matches
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	648 th_regex_node_init(&node);
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	649 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	650
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	651 if ((res = th_regex_parse_ctx_node_commit(&ctx, &node)) != THERR_OK)
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	652 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	653 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	654
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	655 case '\\':
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	656 // Literal escape
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	657 ctx.offs++;
d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	658 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	659 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	660 // End of pattern, error
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661 res = THERR_INVALID_DATA;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	662 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	663 }
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	664 // fall-through
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	665
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	666 default:
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	667 // Given character must match
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	668 if (ctx.bufPos < ctx.bufSize)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	669 ctx.buf[ctx.bufPos++] = ctx.pattern[ctx.offs];
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	670 else
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	671 if ((res = th_regex_parse_ctx_node_commit_strchr(&ctx, FALSE)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	672 goto out;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	673 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	674 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	675 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	676
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	677 // Commit last string/char if any
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	678 if ((res = th_regex_parse_ctx_node_commit_strchr(&ctx, FALSE)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	679 goto out;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	680
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	681 // Create root node
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	682 th_regex_node_init(&node);
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	683 node.type = TH_RE_TYPE_SUBEXPR;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	684 node.match.expr = ctx.data;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	685 ctx.data = NULL;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	686
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	687 if ((res = th_regex_parse_ctx_node_commit(&ctx, &node)) != THERR_OK)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	688 goto out;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	689
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	690 out:
611 d895b0fd6ad6 Combine code from th_regex_compile() to th_regex_compile_do(). Matti Hamalainen <ccr@tnsp.org> parents: 610 diff changeset	691 *pexpr = ctx.data;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	692
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	693 // Free temporary buffers
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	694 th_free(tmp);
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	695 th_free(ctx.buf);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	696 return res;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	697 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	698
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	699
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	700 void th_regex_free(th_regex_t *expr)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	701 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	702 if (expr != NULL)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	703 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	704 for (size_t nnode = 0; nnode < expr->nnodes; nnode++)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	705 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	706 th_regex_node_t *node = &expr->nodes[nnode];
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	707
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	708 th_regex_free(node->match.expr);
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	709 th_regex_list_free(&node->match.list);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	710 }
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 th_free(expr->nodes);
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 }
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
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	717 static void th_regex_dump_indent(FILE *fh, const int level)
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	718 {
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	719 for (int indent = 0; indent < level; indent++)
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	720 fprintf(fh, " ");
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	721 }
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	722
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	723
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	724 static void th_regex_dump_node(FILE fh, const th_regex_node_t node)
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	725 {
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	726 fprintf(fh,
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	727 "%s %s ",
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	728 re_match_modes[node->mode],
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	729 re_match_types[node->type]);
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	730
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	731 if (node->mode == TH_RE_MATCH_COUNT)
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	732 {
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	733 fprintf(fh, "min=%" PRId_SSIZE_T ", max=%" PRId_SSIZE_T " : ",
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	734 node->repeatMin, node->repeatMax);
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	735 }
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	736
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	737 switch (node->type)
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	738 {
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	739 case TH_RE_TYPE_CHAR:
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	740 fprintf(fh, "'%c'", node->match.chr);
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	741 break;
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	742
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	743 case TH_RE_TYPE_STR:
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	744 fprintf(fh, "\"%s\"", node->match.str);
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	745 break;
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	746
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	747 case TH_RE_TYPE_ANY_CHAR:
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	748 fprintf(fh, ".");
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	749 break;
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	750
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	751 case TH_RE_TYPE_LIST:
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	752 case TH_RE_TYPE_LIST_REVERSE:
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	753 fprintf(fh, "[ ");
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	754 for (size_t n = 0; n < node->match.list.nitems; n++)
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	755 {
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	756 const th_regex_list_item_t *li = &node->match.list.items[n];
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	757 if (li->type)
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	758 {
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	759 fprintf(fh, "'%c-%c' ", li->start, li->end);
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	760 }
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	761 else
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	762 {
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	763 for (size_t i = 0; i < li->nchars; i++)
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	764 fprintf(fh, "'%c' ", li->chars[i]);
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	765 }
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	766 }
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	767 fprintf(fh, "]");
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	768 break;
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	769 }
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	770 }
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	771
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	772
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	773 void th_regex_dump(FILE fh, const int level, const th_regex_t expr)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	774 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	775 if (expr != NULL)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	776 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	777 for (size_t nnode = 0; nnode < expr->nnodes; nnode++)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	778 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	779 th_regex_node_t *node = &expr->nodes[nnode];
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	780
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	781 th_regex_dump_indent(fh, level);
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	782
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	783 fprintf(fh,
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	784 "[%" PRIu_SIZE_T "/%" PRIu_SIZE_T "] ",
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	785 nnode + 1, expr->nnodes);
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	786
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	787 th_regex_dump_node(fh, node);
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	788 fprintf(fh, "\n");
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	789
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	790 if (node->type == TH_RE_TYPE_SUBEXPR)
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	791 th_regex_dump(fh, level + 1, node->match.expr);
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	792 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	793 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	794 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	795
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	796
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	797 static BOOL th_regex_match_list(const th_regex_list_t *list, const th_regex_char_t cch)
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	798 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	799 // Could be optimized, perhaps .. sort match.chars, binary search etc?
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	800 for (size_t nitem = 0; nitem < list->nitems; nitem++)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	801 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	802 const th_regex_list_item_t *item = &list->items[nitem];
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	803
639 8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	804 if (item->type == 0)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	805 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	806 for (size_t n = 0; n < item->nchars; n++)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	807 if (item->chars[n] == cch)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	808 return TRUE;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	809 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	810 else
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	811 {
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	812 if (cch >= item->start && cch <= item->end)
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	813 return TRUE;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	814 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	815 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	816
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	817 return FALSE;
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	818 }
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	819
8c957ad9d4c3 Some more work on regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 638 diff changeset	820
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	821 static BOOL th_regex_match_expr(
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	822 const th_regex_char_t *haystack,
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	823 size_t *poffs,
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	824 const th_regex_t *expr,
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	825 const size_t startnode,
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	826 const int flags,
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	827 const int level
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	828 );
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	829
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	830
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	831 static BOOL th_regex_match_one(
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	832 const th_regex_char_t *haystack,
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	833 size_t *poffs,
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	834 const th_regex_node_t *node,
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	835 const int flags,
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	836 const int level
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	837 )
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	838 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	839 th_regex_char_t cch;
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	840 BOOL res = FALSE;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	841
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	842 switch (node->type)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	843 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	844 case TH_RE_TYPE_SUBEXPR:
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	845 res = th_regex_match_expr(haystack, poffs, node->match.expr, 0, flags, level + 1);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	846 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	847
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	848 case TH_RE_TYPE_LIST:
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	849 case TH_RE_TYPE_LIST_REVERSE:
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	850 if ((cch = haystack[*poffs]) == 0)
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	851 res = FALSE;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	852 else
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	853 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	854 res = th_regex_match_list(&node->match.list, cch);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	855
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	856 if (node->type == TH_RE_TYPE_LIST_REVERSE)
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	857 res = !res;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	858
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	859 (*poffs)++;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	860 }
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	861 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	862
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	863 case TH_RE_TYPE_ANY_CHAR:
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	864 if ((cch = haystack[*poffs]) == 0)
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	865 res = FALSE;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	866 else
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	867 {
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	868 res = TRUE;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	869 (*poffs)++;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	870 }
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	871 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	872
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	873 case TH_RE_TYPE_CHAR:
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	874 if ((cch = haystack[*poffs]) == 0)
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	875 res = FALSE;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	876 else
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	877 {
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	878 res = (cch == node->match.chr);
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	879 (*poffs)++;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	880 }
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	881 break;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	882
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	883 case TH_RE_TYPE_STR:
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	884 res = TRUE;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	885 for (th_regex_char_t str = node->match.str; str != 0; )
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	886 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	887 if (haystack[poffs] != str)
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	888 {
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	889 res = FALSE;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	890 break;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	891 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	892 str++;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	893 (*poffs)++;
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	894 }
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	895 break;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	896 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	897
638 c4bca120bfb0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 635 diff changeset	898 return res;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	899 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	900
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	901
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	902 static BOOL th_regex_match_expr(
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	903 const th_regex_char_t *haystack,
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	904 size_t *poffs,
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	905 const th_regex_t *expr,
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	906 const size_t startnode,
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	907 const int flags,
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	908 const int level
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	909 )
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	910 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	911 BOOL res = TRUE;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	912 size_t soffs = *poffs;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	913
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	914 for (size_t nnode = startnode; res && nnode < expr->nnodes; nnode++)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	915 {
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	916 const th_regex_node_t *node = &expr->nodes[nnode];
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	917
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	918 #ifdef TH_EXPERIMENTAL_REGEX_DEBUG
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	919 th_regex_dump_indent(stdout, level);
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	920 fprintf(stdout,
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	921 "[%" PRIu_SIZE_T "/%" PRIu_SIZE_T "] ",
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	922 nnode + 1, expr->nnodes);
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	923
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	924 th_regex_dump_node(stdout, node);
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	925
1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	926 fprintf(stdout, " <-> \"%s\"\n",
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	927 haystack + soffs);
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	928 #endif
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	929
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	930 switch (node->mode)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	931 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	932 case TH_RE_MATCH_ONCE:
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	933 res = th_regex_match_one(haystack, &soffs, node, flags, level);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	934 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	935
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	936 case TH_RE_MATCH_COUNT:
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	937 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	938 ssize_t count = 0;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	939
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	940 do
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	941 {
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	942 BOOL match;
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	943 size_t toffs = soffs, tnode;
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	944
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	945 DBG_RE_MATCH(" ROUND #%" PRIu_SIZE_T ": '%s'\n",
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	946 count, haystack + toffs);
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	947
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	948 do
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	949 {
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	950 match = TRUE;
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	951 size_t noffs = toffs;
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	952 for (tnode = nnode; match && tnode < expr->nnodes && haystack[toffs] != 0; )
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	953 {
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	954 match = th_regex_match_one(haystack, &toffs, &expr->nodes[tnode], flags, level + 1);
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	955 if (match)
a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	956 tnode++;
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	957 }
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	958
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	959 DBG_RE_MATCH(" '%s': %d (tnode=%" PRIu_SIZE_T ")\n",
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	960 haystack + noffs, match, tnode);
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	961
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	962 if (node->repeatMin >= 0 && match)
a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	963 break;
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	964 } while (!match && haystack[toffs] != 0);
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	965
645 b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	966 DBG_RE_MATCH(" ROUND #%" PRIu_SIZE_T " END: match=%s, tnode=%" PRIu_SIZE_T "\n",
b897995101b7 More fiddling and twiddling. Add parsing to string nodes instead of separate character nodes. Matti Hamalainen <ccr@tnsp.org> parents: 643 diff changeset	967 count, match ? "YES" : "NO", tnode);
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	968
613 2e3b81ae8c8a More work on regexes. Matti Hamalainen <ccr@tnsp.org> parents: 612 diff changeset	969 if (match)
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	970 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	971 // Node matched
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	972 count++;
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	973 soffs = toffs;
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	974 nnode = tnode;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	975 res = (node->repeatMax > 0 && count >= node->repeatMax);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	976 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	977 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	978 {
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	979 // Node did not match, check if we got the minimum if set
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	980 res = (node->repeatMin >= 0 && count >= node->repeatMin);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	981 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	982
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	983 } while (!res);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	984
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	985 DBG_RE_MATCH(" RESULT: count=%" PRId_SSIZE_T ", done=%s\n",
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	986 count, res ? "YES" : "NO");
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	987 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	988 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	989
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	990 case TH_RE_MATCH_ANCHOR_START:
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	991 res = (soffs == 0);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	992 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	993
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	994 case TH_RE_MATCH_ANCHOR_END:
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	995 res = (haystack[soffs] == 0);
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	996 break;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	997 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	998 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	999
643 a2bf1ea05b05 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 642 diff changeset	1000 if (res)
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	1001 *poffs = soffs;
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	1002
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	1003 return res;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1004 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1005
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1006
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	1007 int th_regex_match(const th_regex_t expr, const th_regex_char_t haystack,
9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	1008 size_t pnmatches, th_regex_match_t *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	1009 const int flags)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1010 {
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1011 size_t nmatches = 0;
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	1012 int level = 0;
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	1013 (void) flags;
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1014
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1015 if (pnmatches != NULL)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1016 *pnmatches = 0;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1017
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1018 // Check given pattern and string
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1019 if (expr == NULL \|\| haystack == NULL)
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1020 return THERR_NULLPTR;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1021
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1022 // Start matching
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1023 // 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	1024 // - anchored and unanchored expressions
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1025 // - 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	1026 // ..
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1027 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	1028 {
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1029 size_t coffs = soffs;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1030
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	1031 if (th_regex_match_expr(haystack, &coffs, expr, 0, flags, level))
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1032 {
612 cc9ec51b4875 Add some comments and debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	1033 // 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	1034 nmatches++;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1035
612 cc9ec51b4875 Add some comments and debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	1036 // Deliver to caller if required
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1037 if (pnmatches != NULL)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1038 *pnmatches = nmatches;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1039
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1040 if (pmatches != NULL)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1041 {
647 1e7e3f96632e And some more work. Matti Hamalainen <ccr@tnsp.org> parents: 645 diff changeset	1042 // Add the match region to the list
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	1043 th_regex_match_t *match = th_malloc0(sizeof(th_regex_match_t));
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1044 if (match == NULL)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1045 return THERR_MALLOC;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1046
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1047 match->start = soffs;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1048 match->len = coffs - soffs;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1049
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1050 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	1051 }
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1052
612 cc9ec51b4875 Add some comments and debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	1053 // 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	1054 if (maxmatches > 0 && nmatches >= maxmatches)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1055 break;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1056
612 cc9ec51b4875 Add some comments and debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	1057 // If offset was not advanced, increase by one
cc9ec51b4875 Add some comments and debug messages. Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	1058 // 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	1059 if (soffs == coffs)
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1060 soffs++;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1061 else
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1062 soffs = coffs;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1063 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1064 else
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1065 {
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1066 soffs++;
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1067 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1068 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1069
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1070 return THERR_OK;
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1071 }
566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1072
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1073
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	1074 static void th_regex_free_match(th_regex_match_t *node)
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1075 {
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1076 (void) node;
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1077 // 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	1078 }
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1079
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1080
640 9e1f9e1d1487 Aaand some more work. Still just a broken concept. Matti Hamalainen <ccr@tnsp.org> parents: 639 diff changeset	1081 void th_regex_free_matches(th_regex_match_t *matches)
610 a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1082 {
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1083 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	1084 (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	1085 }
a0e8d9c6300b A bit more work on the regex stuff. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	1086
605 566e6ef41f9d Initial commit of the highly experimental and unfinished regular expression Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1087 #endif // TH_EXPERIMENTAL_REGEX

Mercurial > hg > th-libs

annotate th_regex.c @ 647:1e7e3f96632e