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

avoid using the wildcard constant

Browse Source
This commit is contained in:
krangelov
2021-10-12 19:07:21 +02:00
parent a2e7d20b7a
commit 2a5434df96
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/runtime/c/pgf/expr.cxx
View File

@@ -460,7 +460,10 @@ void PgfExprParser::token()
if (!getc())
break;
} while (pgf_is_ident_rest(ch));
token_tag = PGF_TOKEN_IDENT;
if (token_value->size == 1 && strcmp(token_value->text,"_")==0)
token_tag = PGF_TOKEN_WILD;
else
token_tag = PGF_TOKEN_IDENT;
} else if (isdigit(ch)) {
digit:
do {
@@ -628,9 +631,6 @@ PgfExpr PgfExprParser::parse_arg()
return arg;
}
// PGF_INTERNAL PgfText wildcard = {size: 1, text: {'_',0}};
PGF_INTERNAL PgfText wildcard = {size: 1, text: {}}; // TODO
PgfBind *PgfExprParser::parse_bind(PgfBind *next)
{
PgfBind *last = next;
@@ -643,10 +643,8 @@ PgfBind *PgfExprParser::parse_bind(PgfBind *next)
for (;;) {
PgfText *var;
if (token_tag == PGF_TOKEN_IDENT) {
if (token_tag == PGF_TOKEN_IDENT || token_tag == PGF_TOKEN_WILD) {
var = token_value;
} else if (token_tag == PGF_TOKEN_WILD) {
var = &wildcard;
} else {
goto error;
}
@@ -785,10 +783,8 @@ bool PgfExprParser::parse_hypos(size_t *n_hypos, PgfTypeHypo **hypos)
}
PgfText *var;
if (token_tag == PGF_TOKEN_IDENT) {
if (token_tag == PGF_TOKEN_IDENT || token_tag == PGF_TOKEN_WILD) {
var = token_value;
} else if (token_tag == PGF_TOKEN_WILD) {
var = &wildcard;
} else {
return false;
}
@@ -821,6 +817,18 @@ bool PgfExprParser::parse_hypos(size_t *n_hypos, PgfTypeHypo **hypos)
return true;
}
static
PgfText *mk_wildcard()
{
PgfText *t = (PgfText *) malloc(sizeof(PgfText)+2);
if (t != NULL) {
t->size = 1;
t->text[0] = '_';
t->text[1] = 0;
}
return t;
}
PgfType PgfExprParser::parse_type()
{
PgfType type = 0;
@@ -856,7 +864,7 @@ PgfType PgfExprParser::parse_type()
hypos = (PgfTypeHypo*) realloc(hypos, sizeof(PgfTypeHypo)*(n_hypos+1));
PgfTypeHypo *bt = &hypos[n_hypos];
bt->bind_type = PGF_BIND_TYPE_EXPLICIT;
bt->cid = textdup(&wildcard);
bt->cid = mk_wildcard();
bt->type = 0;
n_hypos++;
}
@@ -903,7 +911,7 @@ PgfType PgfExprParser::parse_type()
hypos = (PgfTypeHypo*) realloc(hypos, sizeof(PgfTypeHypo)*(n_hypos+1));
PgfTypeHypo *bt = &hypos[n_hypos];
bt->bind_type = PGF_BIND_TYPE_EXPLICIT;
bt->cid = textdup(&wildcard);
bt->cid = mk_wildcard();
bt->type = u->dtyp(0,NULL,cat,n_args,args);
n_hypos++;

2
src/runtime/c/pgf/expr.h
View File

@@ -267,8 +267,6 @@ public:
prob_t get_prob() { return prob; };
};
PGF_INTERNAL_DECL extern PgfText wildcard;
/* The following functions release the memory in the database,
* allocated for values of the corresponding types.
*/

2
src/runtime/c/pgf/printer.cxx
View File

@@ -382,7 +382,7 @@ PgfLiteral PgfPrinter::lstr(PgfText *v)
void PgfPrinter::hypo(PgfTypeHypo *hypo, int prio)
{
if (textcmp(hypo->cid, &wildcard) == 0) {
if (hypo->cid->size == 1 && strcmp(hypo->cid->text, "_") == 0) {
this->prio = prio;
m->match_type(this, hypo->type);
} else {