cdo/regex-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove class desugaring

Browse Source
This commit is contained in:
Camden Dixie O'Brien
2024-11-03 11:54:08 +00:00
parent 38b5b48289
commit 3c89cc4e99
2 changed files with 25 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/desugar.c
View File

@@ -9,30 +9,6 @@
#include <stdlib.h>
#include <string.h>
static void desugar_class(regex_term_t *term)
{
assert(!term->class.negated);
const int count = term->class.count;
regex_sequence_t *alternatives
= malloc(count * sizeof(regex_sequence_t));
assert(NULL != alternatives);
for (int i = 0; i < count; ++i) {
regex_term_t *terms = malloc(sizeof(regex_term_t));
terms[0].quantifier = REGEX_QUANTIFIER_NONE;
terms[0].type = REGEX_TERM_LITERAL;
terms[0].literal = term->class.contents[i];
alternatives[i].count = alternatives[i].capacity = 1;
alternatives[i].contents = terms;
}
regex_class_free(&term->class);
term->type = REGEX_TERM_SUBEXPR;
term->subexpr.count = term->subexpr.capacity = count;
term->subexpr.contents = alternatives;
}
static void deep_copy_term(regex_term_t *dst, regex_term_t *src);
static void deep_copy_sequence(regex_sequence_t *dst, regex_sequence_t *src)
@@ -48,10 +24,10 @@ static void deep_copy_sequence(regex_sequence_t *dst, regex_sequence_t *src)
static void deep_copy_term(regex_term_t *dst, regex_term_t *src)
{
assert(REGEX_TERM_WILDCARD != src->type);
assert(REGEX_TERM_CLASS != src->type);
memcpy(dst, src, sizeof(regex_term_t));
if (REGEX_TERM_SUBEXPR == src->type) {
switch (src->type) {
case REGEX_TERM_SUBEXPR:
dst->subexpr.capacity = src->subexpr.count;
dst->subexpr.contents
= malloc(dst->subexpr.capacity * sizeof(regex_sequence_t));
@@ -61,6 +37,19 @@ static void deep_copy_term(regex_term_t *dst, regex_term_t *src)
deep_copy_sequence(
&dst->subexpr.contents[i], &src->subexpr.contents[i]);
}
break;
case REGEX_TERM_CLASS:
dst->class.count = src->class.count;
dst->class.capacity = src->class.capacity;
dst->class.contents
= malloc(dst->class.capacity * sizeof(regex_sequence_t));
assert(NULL != dst->class.contents);
memcpy(dst->class.contents, src->class.contents, src->class.count);
break;
default:
break;
}
}
@@ -113,14 +102,12 @@ static void desugar_term(regex_term_t *term)
case REGEX_TERM_WILDCARD:
assert(false);
break;
case REGEX_TERM_CLASS:
desugar_class(term);
break;
case REGEX_TERM_SUBEXPR:
desugar_regex(&term->subexpr);
break;
case REGEX_TERM_CLASS:
case REGEX_TERM_LITERAL:
case REGEX_TERM_EMPTY:
break;
@@ -143,8 +130,7 @@ static void desugar_term(regex_term_t *term)
void desugar_regex(regex_t *regex)
{
for (int i = 0; i < regex->count; ++i) {
for (int j = 0; j < regex->contents[i].count; ++j) {
for (int j = 0; j < regex->contents[i].count; ++j)
desugar_term(&regex->contents[i].contents[j]);
}
}
}