GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix the debug mode in the tree generator in the C runtime

Browse Source
This commit is contained in:
krasimir
2015-09-11 09:26:17 +00:00
parent a976a49cef
commit 21078c8bfe
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/runtime/c/pgf/reasoner.c
View File

@@ -12,7 +12,7 @@ typedef struct {
} PgfAnswers; } PgfAnswers;
#ifdef PGF_REASONER_DEBUG #ifdef PGF_REASONER_DEBUG
typedef void (*PgfStatePrinter)(PgfReasonerState* st, typedef void (*PgfStatePrinter)(PgfReasoner* rs, PgfReasonerState* st,
GuOut* out, GuExn* err, GuOut* out, GuExn* err,
GuPool* tmp_pool); GuPool* tmp_pool);
#endif #endif
@@ -76,21 +76,21 @@ pgf_expr_state_order = { cmp_expr_state };
#ifdef PGF_REASONER_DEBUG #ifdef PGF_REASONER_DEBUG
static void static void
pgf_print_parent_state(PgfExprState* st, pgf_print_parent_state(PgfReasoner* rs, PgfExprState* st,
GuOut* out, GuExn* err, GuBuf* stack) GuOut* out, GuExn* err, GuBuf* stack)
{ {
gu_buf_push(stack, int, (st->n_args - st->arg_idx - 1)); gu_buf_push(stack, int, (st->n_args - st->arg_idx - 1));
PgfExprState* parent = gu_buf_get(st->answers->parents, PgfExprState*, 0); PgfExprState* parent = gu_buf_get(st->answers->parents, PgfExprState*, 0);
if (parent != NULL) if (&parent->base.header != rs->start)
pgf_print_parent_state(parent, out, err, stack); pgf_print_parent_state(rs, parent, out, err, stack);
gu_puts(" (", out, err); gu_puts(" (", out, err);
pgf_print_expr(st->expr, NULL, 0, out, err); pgf_print_expr(st->expr, NULL, 0, out, err);
} }
static void static void
pgf_print_expr_state(PgfExprState* st, pgf_print_expr_state(PgfReasoner* rs, PgfExprState* st,
GuOut* out, GuExn* err, GuPool* tmp_pool) GuOut* out, GuExn* err, GuPool* tmp_pool)
{ {
gu_printf(out, err, "[%f] ", st->base.prob); gu_printf(out, err, "[%f] ", st->base.prob);
@@ -101,8 +101,8 @@ pgf_print_expr_state(PgfExprState* st,
PgfExprState* cont = PgfExprState* cont =
gu_buf_get(st->answers->parents, PgfExprState*, 0); gu_buf_get(st->answers->parents, PgfExprState*, 0);
if (cont != NULL) if (&cont->base.header != rs->start)
pgf_print_parent_state(cont, out, err, stack); pgf_print_parent_state(rs, cont, out, err, stack);
if (st->n_args > 0) if (st->n_args > 0)
gu_puts(" (", out, err); gu_puts(" (", out, err);
@@ -146,11 +146,12 @@ pgf_combine1_to_expr(PgfCombine1State* st, GuPool* pool, GuPool* out_pool) {
} }
static PgfExprState* static PgfExprState*
pgf_combine2_to_expr(PgfCombine2State* st, GuPool* pool, GuPool* out_pool) pgf_combine2_to_expr(PgfReasoner* rs, PgfCombine2State* st,
GuPool* pool, GuPool* out_pool)
{ {
PgfExprState* parent = PgfExprState* parent =
gu_buf_get(st->parents, PgfExprState*, st->choice); gu_buf_get(st->parents, PgfExprState*, st->choice);
if (parent == NULL) if (&parent->base.header == rs->start)
return NULL; return NULL;
PgfExprState* nst = PgfExprState* nst =
@@ -174,20 +175,20 @@ pgf_combine2_to_expr(PgfCombine2State* st, GuPool* pool, GuPool* out_pool)
#ifdef PGF_REASONER_DEBUG #ifdef PGF_REASONER_DEBUG
static void static void
pgf_print_combine1_state(PgfCombine1State* st, pgf_print_combine1_state(PgfReasoner* rs, PgfCombine1State* st,
GuOut* out, GuExn* err, GuPool* tmp_pool) GuOut* out, GuExn* err, GuPool* tmp_pool)
{ {
PgfExprState* nst = pgf_combine1_to_expr(st, tmp_pool, tmp_pool); PgfExprState* nst = pgf_combine1_to_expr(st, tmp_pool, tmp_pool);
pgf_print_expr_state(nst, out, err, tmp_pool); pgf_print_expr_state(rs, nst, out, err, tmp_pool);
} }
static void static void
pgf_print_combine2_state(PgfCombine2State* st, pgf_print_combine2_state(PgfReasoner* rs, PgfCombine2State* st,
GuOut* out, GuExn* err, GuPool* tmp_pool) GuOut* out, GuExn* err, GuPool* tmp_pool)
{ {
PgfExprState* nst = pgf_combine2_to_expr(st, tmp_pool); PgfExprState* nst = pgf_combine2_to_expr(rs, st, tmp_pool, tmp_pool);
if (nst != NULL) if (nst != NULL)
pgf_print_expr_state(nst, out, err, tmp_pool); pgf_print_expr_state(rs, nst, out, err, tmp_pool);
} }
#endif #endif
@@ -279,7 +280,7 @@ void
pgf_reasoner_combine2(PgfReasoner* rs, PgfClosure* closure) pgf_reasoner_combine2(PgfReasoner* rs, PgfClosure* closure)
{ {
PgfCombine2State* st = (PgfCombine2State*) closure; PgfCombine2State* st = (PgfCombine2State*) closure;
PgfExprState* nst = pgf_combine2_to_expr(st, rs->pool, rs->out_pool); PgfExprState* nst = pgf_combine2_to_expr(rs, st, rs->pool, rs->out_pool);
if (nst != NULL) { if (nst != NULL) {
rs->eval_gates->enter(rs, &nst->base.header); rs->eval_gates->enter(rs, &nst->base.header);
} }
@@ -337,7 +338,7 @@ pgf_reasoner_next(PgfReasoner* rs)
GuPool* tmp_pool = gu_new_pool(); GuPool* tmp_pool = gu_new_pool();
GuOut* out = gu_file_out(stderr, tmp_pool); GuOut* out = gu_file_out(stderr, tmp_pool);
GuExn* err = gu_exn(tmp_pool); GuExn* err = gu_exn(tmp_pool);
st->print(st, out, err, tmp_pool); st->print(rs, st, out, err, tmp_pool);
gu_pool_free(tmp_pool); gu_pool_free(tmp_pool);
} }
#endif #endif
@@ -373,6 +374,7 @@ pgf_new_reasoner(PgfPGF* pgf, GuExn* err, GuPool* pool, GuPool* out_pool)
rs->abstract = &pgf->abstract, rs->abstract = &pgf->abstract,
rs->table = gu_new_string_map(PgfAnswers*, &gu_null_struct, rs->pool), rs->table = gu_new_string_map(PgfAnswers*, &gu_null_struct, rs->pool),
rs->start = NULL;
rs->eval_gates = pgf->abstract.eval_gates; rs->eval_gates = pgf->abstract.eval_gates;
rs->pqueue = gu_new_buf(PgfReasonerState*, rs->pool); rs->pqueue = gu_new_buf(PgfReasonerState*, rs->pool);
@@ -401,9 +403,9 @@ pgf_generate_all(PgfPGF* pgf, PgfCId cat, GuExn* err, GuPool* pool, GuPool* out_
PgfAbsCat* abscat = gu_seq_binsearch(rs->abstract->cats, pgf_abscat_order, PgfAbsCat, cat); PgfAbsCat* abscat = gu_seq_binsearch(rs->abstract->cats, pgf_abscat_order, PgfAbsCat, cat);
if (abscat != NULL) { if (abscat != NULL) {
PgfClosure* closure = gu_new(PgfClosure, rs->pool); rs->start = gu_new(PgfClosure, rs->pool);
closure->code = abscat->predicate; rs->start->code = abscat->predicate;
rs->eval_gates->enter(rs, closure); rs->eval_gates->enter(rs, rs->start);
} }
return &rs->en; return &rs->en;

1
src/runtime/c/pgf/reasoner.h
View File

@@ -29,6 +29,7 @@ struct PgfReasoner {
PgfAbswersMap* table; PgfAbswersMap* table;
GuBuf* pqueue; GuBuf* pqueue;
GuBuf* exprs; GuBuf* exprs;
PgfClosure* start;
PgfEvalGates* eval_gates; // cached from pgf->abstr->eval_gates PgfEvalGates* eval_gates; // cached from pgf->abstr->eval_gates
GuExn* err; GuExn* err;
void* enter_stack_ptr; void* enter_stack_ptr;