andy/mpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug in optimisation pass.

Browse Source
This commit is contained in:
Daniel Holden
2015-11-09 12:06:13 +00:00
parent 3c266180c4
commit 4932c86ec7
3 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,7 +1,7 @@
CC = gcc
STND=-ansi
CFLAGS = $(STND) -pedantic -O3 -g -Werror -Wall -Wextra -Wformat=2 -Wshadow \
CFLAGS = $(STND) -pedantic -O0 -g -Wall -Werror -Wextra -Wformat=2 -Wshadow \
-Wno-long-long -Wno-overlength-strings -Wno-format-nonliteral -Wcast-align \
-Wwrite-strings -Wstrict-prototypes -Wold-style-definition -Wredundant-decls \
-Wnested-externs -Wmissing-include-dirs -Wswitch-default

30
mpc.c
View File

@@ -2059,6 +2059,7 @@ mpc_parser_t *mpc_re(const char *re) {
RegexEnclose = mpc_whole(mpc_predictive(Regex), (mpc_dtor_t)mpc_delete);
mpc_optimise(RegexEnclose);
mpc_optimise(Regex);
mpc_optimise(Term);
mpc_optimise(Factor);
@@ -2073,8 +2074,9 @@ mpc_parser_t *mpc_re(const char *re) {
r.output = err_out;
}
mpc_delete(RegexEnclose);
mpc_cleanup(5, Regex, Term, Factor, Base, Range);
mpc_cleanup(6, RegexEnclose, Regex, Term, Factor, Base, Range);
mpc_optimise(r.output);
return r.output;
@@ -3023,6 +3025,8 @@ mpc_parser_t *mpca_grammar_st(const char *grammar, mpca_grammar_st_t *st) {
mpc_cleanup(5, GrammarTotal, Grammar, Term, Factor, Base);
mpc_optimise(r.output);
return (st->flags & MPCA_LANG_PREDICTIVE) ? mpc_predictive(r.output) : r.output;
}
@@ -3415,12 +3419,11 @@ static void mpc_optimise_unretained(mpc_parser_t *p, int force) {
t = p->data.and.xs[0];
n = p->data.and.n; m = t->data.and.n;
p->data.and.n = n + m - 1;
p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m -1));
p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m -1));
p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m - 1));
p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m - 1 - 1));
memmove(p->data.and.xs + m, p->data.and.xs + 1, (n - 1) * sizeof(mpc_parser_t*));
memmove(p->data.and.xs, t->data.and.xs, m * sizeof(mpc_parser_t*));
memmove(p->data.and.dxs + m, p->data.and.dxs + 1, (n - 1) * sizeof(mpc_dtor_t));
memmove(p->data.and.dxs, t->data.and.dxs, m * sizeof(mpc_dtor_t));
for (i = 0; i < p->data.and.n-1; i++) { p->data.and.dxs[i] = (mpc_dtor_t)mpc_ast_delete; }
free(t->data.and.xs); free(t->data.and.dxs); free(t->name); free(t);
continue;
}
@@ -3435,9 +3438,9 @@ static void mpc_optimise_unretained(mpc_parser_t *p, int force) {
n = p->data.and.n; m = t->data.and.n;
p->data.and.n = n + m - 1;
p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m -1));
p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m -1));
p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m - 1 - 1));
memmove(p->data.and.xs + n - 1, t->data.and.xs, m * sizeof(mpc_parser_t*));
memmove(p->data.and.dxs + n - 1, t->data.and.dxs, m * sizeof(mpc_dtor_t));
for (i = 0; i < p->data.and.n-1; i++) { p->data.and.dxs[i] = (mpc_dtor_t)mpc_ast_delete; }
free(t->data.and.xs); free(t->data.and.dxs); free(t->name); free(t);
continue;
}
@@ -3465,12 +3468,11 @@ static void mpc_optimise_unretained(mpc_parser_t *p, int force) {
t = p->data.and.xs[0];
n = p->data.and.n; m = t->data.and.n;
p->data.and.n = n + m - 1;
p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m -1));
p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m -1));
p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m - 1));
p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m - 1 - 1));
memmove(p->data.and.xs + m, p->data.and.xs + 1, (n - 1) * sizeof(mpc_parser_t*));
memmove(p->data.and.xs, t->data.and.xs, m * sizeof(mpc_parser_t*));
memmove(p->data.and.dxs + m, p->data.and.dxs + 1, (n - 1) * sizeof(mpc_dtor_t));
memmove(p->data.and.dxs, t->data.and.dxs, m * sizeof(mpc_dtor_t));
for (i = 0; i < p->data.and.n-1; i++) { p->data.and.dxs[i] = free; }
free(t->data.and.xs); free(t->data.and.dxs); free(t->name); free(t);
continue;
}
@@ -3485,9 +3487,9 @@ static void mpc_optimise_unretained(mpc_parser_t *p, int force) {
n = p->data.and.n; m = t->data.and.n;
p->data.and.n = n + m - 1;
p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m -1));
p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m -1));
p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m - 1 - 1));
memmove(p->data.and.xs + n - 1, t->data.and.xs, m * sizeof(mpc_parser_t*));
memmove(p->data.and.dxs + n - 1, t->data.and.dxs, m * sizeof(mpc_dtor_t));
for (i = 0; i < p->data.and.n-1; i++) { p->data.and.dxs[i] = free; }
free(t->data.and.xs); free(t->data.and.dxs); free(t->name); free(t);
continue;
}

38
tests/grammar.c
View File

@@ -91,8 +91,46 @@ void test_language_file(void) {
}
void test_doge(void) {
mpc_ast_t *t0;
mpc_parser_t* Adjective = mpc_new("adjective");
mpc_parser_t* Noun = mpc_new("noun");
mpc_parser_t* Phrase = mpc_new("phrase");
mpc_parser_t* Doge = mpc_new("doge");
mpca_lang(MPCA_LANG_DEFAULT,
" adjective : \"wow\" | \"many\" | \"so\" | \"such\"; "
" noun : \"lisp\" | \"language\" | \"c\" | \"book\" | \"build\"; "
" phrase : <adjective> <noun>; "
" doge : /^/ <phrase>* /$/; ",
Adjective, Noun, Phrase, Doge, NULL);
t0 =
mpc_ast_build(4, ">",
mpc_ast_new("regex", ""),
mpc_ast_build(2, "phrase|>",
mpc_ast_new("adjective|string", "so"),
mpc_ast_new("noun|string", "c")),
mpc_ast_build(2, "phrase|>",
mpc_ast_new("adjective|string", "so"),
mpc_ast_new("noun|string", "c")),
mpc_ast_new("regex", "")
);
PT_ASSERT(mpc_test_pass(Doge, "so c so c", t0, (int(*)(const void*,const void*))mpc_ast_eq, (mpc_dtor_t)mpc_ast_delete, (void(*)(const void*))mpc_ast_print));
PT_ASSERT(mpc_test_fail(Doge, "so a so c", t0, (int(*)(const void*,const void*))mpc_ast_eq, (mpc_dtor_t)mpc_ast_delete, (void(*)(const void*))mpc_ast_print));
mpc_ast_delete(t0);
mpc_cleanup(4, Adjective, Noun, Phrase, Doge);
}
void suite_grammar(void) {
pt_add_test(test_grammar, "Test Grammar", "Suite Grammar");
pt_add_test(test_language, "Test Language", "Suite Grammar");
pt_add_test(test_language_file, "Test Language File", "Suite Grammar");
pt_add_test(test_doge, "Test Doge", "Suite Grammar");
}