msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

fix the crash in the reader when there aren't any productions per category.

Browse Source
This commit is contained in:
kr.angelov
2012-01-21 10:25:43 +00:00
parent 2eee382a62
commit d164ddfbe1
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/runtime/c/pgf/reader.c
View File

@@ -49,7 +49,6 @@ struct PgfReader {
PgfSequences* curr_sequences; PgfSequences* curr_sequences;
PgfCncFuns* curr_cncfuns; PgfCncFuns* curr_cncfuns;
GuMap* curr_ccats; GuMap* curr_ccats;
GuMap* ccat_locs;
GuMap* curr_lindefs; GuMap* curr_lindefs;
GuMap* curr_coercions; GuMap* curr_coercions;
GuTypeMap* read_to_map; GuTypeMap* read_to_map;
@@ -435,16 +434,16 @@ pgf_read_to_PgfCCatId(GuType* type, PgfReader* rdr, void* to)
int fid = pgf_read_int(rdr); int fid = pgf_read_int(rdr);
gu_return_on_exn(rdr->err,); gu_return_on_exn(rdr->err,);
PgfCCat* ccat = gu_map_get(rdr->curr_ccats, &fid, PgfCCat*); PgfCCat* ccat = gu_map_get(rdr->curr_ccats, &fid, PgfCCat*);
if (ccat) { if (!ccat) {
*pto = ccat; ccat = gu_new(PgfCCat, rdr->pool);
return; ccat->cnccat = NULL;
ccat->prods = gu_null_seq;
ccat->fid = fid;
gu_map_put(rdr->curr_ccats, &fid, PgfCCat*, ccat);
} }
GuBuf* locs = gu_map_get(rdr->ccat_locs, &fid, GuBuf*);
if (!locs) { *pto = ccat;
locs = gu_new_buf(PgfCCat**, rdr->pool);
gu_map_put(rdr->ccat_locs, &fid, GuBuf*, locs);
}
gu_buf_push(locs, PgfCCat**, pto);
} }
static void static void
@@ -457,14 +456,6 @@ pgf_read_to_PgfCCat(GuType* type, PgfReader* rdr, void* to)
pgf_read_to(rdr, gu_type(PgfProductionSeq), &cat->prods); pgf_read_to(rdr, gu_type(PgfProductionSeq), &cat->prods);
int* fidp = rdr->curr_key; int* fidp = rdr->curr_key;
cat->fid = *fidp; cat->fid = *fidp;
GuBuf* locs_buf = gu_map_get(rdr->ccat_locs, fidp, GuBuf*);
if (locs_buf) {
size_t len = gu_buf_length(locs_buf);
PgfCCat*** locs = gu_buf_data(locs_buf);
for (size_t n = 0; n < len; n++) {
*(locs[n]) = cat;
}
}
gu_exit("<-"); gu_exit("<-");
} }
@@ -474,7 +465,11 @@ static void*
pgf_read_new_PgfCCat(GuType* type, PgfReader* rdr, GuPool* pool, pgf_read_new_PgfCCat(GuType* type, PgfReader* rdr, GuPool* pool,
size_t* size_out) size_t* size_out)
{ {
PgfCCat* ccat = gu_new(PgfCCat, pool); PgfCCat* ccat = gu_map_get(rdr->curr_ccats, rdr->curr_key, PgfCCat*);
if (!ccat) {
ccat = gu_new(PgfCCat, pool);
gu_map_put(rdr->curr_ccats, rdr->curr_key, PgfCCat*, ccat);
}
pgf_read_to_PgfCCat(type, rdr, ccat); pgf_read_to_PgfCCat(type, rdr, ccat);
*size_out = sizeof(PgfCCat); *size_out = sizeof(PgfCCat);
return ccat; return ccat;
@@ -737,19 +732,22 @@ pgf_read_new_PgfCncCat(GuType* type, PgfReader* rdr, GuPool* pool,
PgfCCatIds* cats = gu_new_list(PgfCCatIds, pool, len); PgfCCatIds* cats = gu_new_list(PgfCCatIds, pool, len);
int n_lins = -1; int n_lins = -1;
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
int n = first + i; int fid = first + i;
PgfCCat* ccat = gu_map_get(rdr->curr_ccats, &n, PgfCCat*); PgfCCat* ccat = gu_map_get(rdr->curr_ccats, &fid, PgfCCat*);
/* ccat can be NULL if the PGF is optimized and the if (!ccat) {
* category has been erased as useless */ ccat = gu_new(PgfCCat, rdr->pool);
ccat->cnccat = NULL;
ccat->prods = gu_null_seq;
ccat->fid = fid;
gu_map_put(rdr->curr_ccats, &fid, PgfCCat*, ccat);
}
gu_list_index(cats, i) = ccat; gu_list_index(cats, i) = ccat;
if (ccat != NULL) {
// TODO: error if overlap ccat->cnccat = cnccat;
ccat->cnccat = cnccat; if (!pgf_ccat_n_lins(ccat, &n_lins)) {
if (!pgf_ccat_n_lins(ccat, &n_lins)) { gu_raise(rdr->err, PgfReadExn);
gu_raise(rdr->err, PgfReadExn); goto fail;
goto fail;
}
} }
gu_debug("range[%d] = %d", i, ccat ? ccat->fid : -1); gu_debug("range[%d] = %d", i, ccat ? ccat->fid : -1);
} }