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

libpgf: the concrete categories were allocated from the temporary pool

Browse Source
This commit is contained in:
kr.angelov
2012-01-23 13:43:17 +00:00
parent e9014902ef
commit f2cfa9888e
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,6 @@ struct PgfReader {
GuIn* in; GuIn* in;
GuExn* err; GuExn* err;
GuPool* opool; GuPool* opool;
GuPool* pool;
GuSymTable* symtab; GuSymTable* symtab;
PgfSequences* curr_sequences; PgfSequences* curr_sequences;
PgfCncFuns* curr_cncfuns; PgfCncFuns* curr_cncfuns;
@@ -435,7 +434,7 @@ pgf_read_to_PgfCCatId(GuType* type, PgfReader* rdr, void* to)
PgfCCat* ccat = gu_map_get(rdr->curr_ccats, &fid, PgfCCat*); PgfCCat* ccat = gu_map_get(rdr->curr_ccats, &fid, PgfCCat*);
if (!ccat) { if (!ccat) {
ccat = gu_new(PgfCCat, rdr->pool); ccat = gu_new(PgfCCat, rdr->opool);
ccat->cnccat = NULL; ccat->cnccat = NULL;
ccat->lindefs = gu_map_get(rdr->curr_lindefs, &fid, PgfFunIds*); ccat->lindefs = gu_map_get(rdr->curr_lindefs, &fid, PgfFunIds*);
ccat->prods = gu_null_seq; ccat->prods = gu_null_seq;
@@ -737,7 +736,7 @@ pgf_read_new_PgfCncCat(GuType* type, PgfReader* rdr, GuPool* pool,
int fid = first + i; int fid = first + i;
PgfCCat* ccat = gu_map_get(rdr->curr_ccats, &fid, PgfCCat*); PgfCCat* ccat = gu_map_get(rdr->curr_ccats, &fid, PgfCCat*);
if (!ccat) { if (!ccat) {
ccat = gu_new(PgfCCat, rdr->pool); ccat = gu_new(PgfCCat, rdr->opool);
ccat->cnccat = NULL; ccat->cnccat = NULL;
ccat->lindefs = gu_map_get(rdr->curr_lindefs, &fid, PgfFunIds*); ccat->lindefs = gu_map_get(rdr->curr_lindefs, &fid, PgfFunIds*);
ccat->prods = gu_null_seq; ccat->prods = gu_null_seq;
@@ -815,18 +814,17 @@ pgf_read_new_table = GU_TYPETABLE(
); );
static PgfReader* static PgfReader*
pgf_new_reader(GuIn* in, GuPool* opool, GuPool* pool, GuExn* err) pgf_new_reader(GuIn* in, GuPool* opool, GuPool* tmp_pool, GuExn* err)
{ {
PgfReader* rdr = gu_new(PgfReader, pool); PgfReader* rdr = gu_new(PgfReader, tmp_pool);
rdr->opool = opool; rdr->opool = opool;
rdr->symtab = gu_new_symtable(opool, pool); rdr->symtab = gu_new_symtable(opool, tmp_pool);
rdr->err = err; rdr->err = err;
rdr->in = in; rdr->in = in;
rdr->curr_sequences = NULL; rdr->curr_sequences = NULL;
rdr->curr_cncfuns = NULL; rdr->curr_cncfuns = NULL;
rdr->read_to_map = gu_new_type_map(&pgf_read_to_table, pool); rdr->read_to_map = gu_new_type_map(&pgf_read_to_table, tmp_pool);
rdr->read_new_map = gu_new_type_map(&pgf_read_new_table, pool); rdr->read_new_map = gu_new_type_map(&pgf_read_new_table, tmp_pool);
rdr->pool = pool;
return rdr; return rdr;
} }