anon/jeger
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

>most tests pass >hl completelly breaks

Browse Source
This commit is contained in:
anon 2023-09-23 15:55:36 +02:00
parent 9ca9006a9a
commit e0a5c54b62
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/jeger.c
View File

@ -734,11 +734,18 @@ bool regex_assert(const regex_t * const regex,
if ((delta->in == state) if ((delta->in == state)
&& (delta->input == *s)) { && (delta->input == *s)) {
bool do_reset = false;
was_found = true; was_found = true;
if (!match->_pos_ptr && delta->match_width) {
match->_pos_ptr = s;
do_reset = true;
}
const int r = regex_assert(regex, s + delta->pattern_width, delta->to, match); const int r = regex_assert(regex, s + delta->pattern_width, delta->to, match);
if(r){ if(r){
match->width += delta->match_width; match->width += delta->match_width;
return r; return r;
} else if (do_reset) {
match->_pos_ptr = NULL;
} }
} }
} }
@ -750,9 +757,6 @@ bool regex_assert(const regex_t * const regex,
if (my_catch && (!my_catch->pattern_width || !last_stand)) { if (my_catch && (!my_catch->pattern_width || !last_stand)) {
state = my_catch->to; state = my_catch->to;
s += my_catch->pattern_width; s += my_catch->pattern_width;
if (match->position < 1) {
match->position = my_catch->match_width;
}
match->width += my_catch->match_width; match->width += my_catch->match_width;
goto LOOP; goto LOOP;
} }
@ -786,15 +790,15 @@ match_t * regex_match(const regex_t * const regex,
initial_state = (int)(!(is_start_of_string && (s == string))); initial_state = (int)(!(is_start_of_string && (s == string)));
*match = (match_t){ *match = (match_t){
.position = -1, ._pos_ptr = NULL,
.width = 0, .width = 0,
}; };
if (regex_assert(regex, s, initial_state, match)) { if (regex_assert(regex, s, initial_state, match)) {
if(match->position == -1){ if (match->_pos_ptr) {
match->position = (s - string); match->position = (match->_pos_ptr - string);
}else{ } else {
match->position += (s - string); match->position = (s - string);
} }
vector_push(&matches, match); vector_push(&matches, match);

5
source/jeger.h
View File

@ -15,7 +15,10 @@ typedef struct {
} regex_t; } regex_t;
typedef struct { typedef struct {
int position; union {
int position;
const char * _pos_ptr;
};
int width; int width;
} match_t; } match_t;