GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-09-14 06:16:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

bugfixe in td_epsilon and better pretty printing

Browse Source
This commit is contained in:
Krasimir Angelov
2026-07-27 16:00:33 +02:00
parent 4e8bc0d872
commit ec7354ca1c
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/runtime/c/pgf/parser.cxx
+23 -23
View File
@@ -2,8 +2,8 @@
#include "printer.h" #include "printer.h"
#include "parser.h" #include "parser.h"
#define DEBUG_PARSER //#define DEBUG_PARSER
#define DEBUG_EXPRS //#define DEBUG_EXPRS
PgfAbstractParser::PgfAbstractParser(ref<PgfConcr> concr) PgfAbstractParser::PgfAbstractParser(ref<PgfConcr> concr)
{ {
@@ -535,20 +535,16 @@ void PgfAbstractParser::td_epsilon(State *state, Cont *cont, ref<PgfItem> pitem,
arg_ccat->covered = true; arg_ccat->covered = true;
} }
item->args[i] = arg_ccat; item->args[i] = arg_ccat;
}
/* if (!item->instantiate(item->rule->args[i], pitem->args[i]->value)) { if (!item->instantiate(item->rule->args[i], pitem->rule, &pitem->vars[0], pitem->rule->args[i])) {
delete item; delete item;
goto next; goto next;
}*/
} else {
/*if (!item->instantiate(item->rule->args[i], pitem->args[i]->value)) {
delete item;
continue;
}*/
} }
} }
process(item, state->start, false); process(item, state->start, false);
next:;
} }
} }
default:; default:;
@@ -652,12 +648,12 @@ void PgfAbstractParser::print_item(Item *item, const PgfTextSpot &spot)
if (item->cont) { if (item->cont) {
if (item->cont->ccat == NULL) { if (item->cont->ccat == NULL) {
printer.efun(&item->cont->lincat->name); printer.efun(&item->cont->lincat->name);
printer.puts("(");
printer.lparam(item->rule->res);
printer.puts(")");
} else { } else {
printer.emeta(item->cont->ccat->fid); printer.emeta(item->cont->ccat->fid);
} }
printer.puts("(");
printer.lparam(item->rule->res);
printer.puts(")");
} }
printer.puts(" -> "); printer.puts(" -> ");
@@ -674,12 +670,12 @@ void PgfAbstractParser::print_item(Item *item, const PgfTextSpot &spot)
CCat *ccat = item->args[i]; CCat *ccat = item->args[i];
if (ccat == NULL) { if (ccat == NULL) {
printer.efun(&lin->absfun->type->hypos[i].type->name); printer.efun(&lin->absfun->type->hypos[i].type->name);
printer.puts("(");
printer.lparam(item->rule->args[i]);
printer.puts(")");
} else { } else {
printer.emeta(ccat->fid); printer.emeta(ccat->fid);
} }
printer.puts("(");
printer.lparam(item->rule->args[i]);
printer.puts(")");
} }
printer.puts("]; "); printer.puts("]; ");
break; break;
@@ -724,6 +720,10 @@ void PgfAbstractParser::print_prod(CCat *ccat, Production *prod)
} }
printer.emeta(ccat->fid); printer.emeta(ccat->fid);
printer.puts("(");
printer.lparam(prod->rule->res);
printer.puts(")");
printer.puts(" -> "); printer.puts(" -> ");
switch (ref<object>::get_tag(prod->rule->container)) { switch (ref<object>::get_tag(prod->rule->container)) {
@@ -739,12 +739,12 @@ void PgfAbstractParser::print_prod(CCat *ccat, Production *prod)
CCat *ccat = prod->args[i]; CCat *ccat = prod->args[i];
if (ccat == NULL) { if (ccat == NULL) {
printer.efun(&lin->absfun->type->hypos[i].type->name); printer.efun(&lin->absfun->type->hypos[i].type->name);
printer.puts("(");
printer.lparam(prod->rule->args[i]);
printer.puts(")");
} else { } else {
printer.emeta(ccat->fid); printer.emeta(ccat->fid);
} }
printer.puts("(");
printer.lparam(prod->rule->args[i]);
printer.puts(")");
} }
printer.puts("]"); printer.puts("]");
break; break;
@@ -1368,7 +1368,7 @@ void PgfParser::print_expr_state_left(PgfPrinter *printer, PgfMarshaller *m, Exp
printer->puts("::"); printer->puts("::");
} }
void PgfParser::print_expr_state_right(PgfPrinter *printer, PgfMarshaller *m, ExprState *estate) void PgfParser::print_expr_state_right(PgfPrinter *printer, ExprState *estate)
{ {
for (size_t i = estate->index+1; i < estate->n_args; i++) { for (size_t i = estate->index+1; i < estate->n_args; i++) {
printer->puts(" "); printer->puts(" ");
@@ -1381,7 +1381,7 @@ void PgfParser::print_expr_state_right(PgfPrinter *printer, PgfMarshaller *m, Ex
if (estate->res && estate->res->pending.size() > 0) { if (estate->res && estate->res->pending.size() > 0) {
printer->puts(")"); printer->puts(")");
ExprState *parent = estate->res->pending[0]; ExprState *parent = estate->res->pending[0];
print_expr_state_right(printer, m, parent); print_expr_state_right(printer, parent);
} }
} }
@@ -1391,7 +1391,7 @@ void PgfParser::print_expr_state(PgfMarshaller *m, ExprState *estate)
printer.nprintf(64,"[%f] ",estate->prob); printer.nprintf(64,"[%f] ",estate->prob);
print_expr_state_left(&printer, m, estate); print_expr_state_left(&printer, m, estate);
printer.puts(" ."); printer.puts(" .");
print_expr_state_right(&printer, m, estate); print_expr_state_right(&printer, estate);
PgfText *text = printer.get_text(); PgfText *text = printer.get_text();
fprintf(stderr, "%s\n", text->text); fprintf(stderr, "%s\n", text->text);
src/runtime/c/pgf/parser.h
+1 -1
View File
@@ -261,7 +261,7 @@ class PGF_INTERNAL_DECL PgfParser : private PgfAbstractParser, public PgfExprEnu
static static
void print_expr_state_left(PgfPrinter *printer, PgfMarshaller *m, ExprState *estate); void print_expr_state_left(PgfPrinter *printer, PgfMarshaller *m, ExprState *estate);
static static
void print_expr_state_right(PgfPrinter *printer, PgfMarshaller *m, ExprState *estate); void print_expr_state_right(PgfPrinter *printer, ExprState *estate);
static static
void print_expr_state(PgfMarshaller *m, ExprState *estate); void print_expr_state(PgfMarshaller *m, ExprState *estate);