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

make sure that pgf_concrete_load has no effect on grammars that are completely loaded

Browse Source
This commit is contained in:
kr.angelov
2013-12-17 13:57:16 +00:00
parent e0481e3b8a
commit a01e248ae6
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1234,9 +1234,11 @@ pgf_read_concrete(PgfReader* rdr, PgfAbstr* abstr, bool with_content)
concr->pool = NULL; concr->pool = NULL;
if (with_content) if (with_content) {
pgf_read_concrete_content(rdr, concr); pgf_read_concrete_content(rdr, concr);
else {
concr->fin.fn = NULL;
} else {
pgf_read_concrete_init_header(concr); pgf_read_concrete_init_header(concr);
concr->fin.fn = gu_concr_fini; concr->fin.fn = gu_concr_fini;
@@ -1250,7 +1252,7 @@ pgf_read_concrete(PgfReader* rdr, PgfAbstr* abstr, bool with_content)
void void
pgf_concrete_load(PgfConcr* concr, GuIn* in, GuExn* err) pgf_concrete_load(PgfConcr* concr, GuIn* in, GuExn* err)
{ {
if (concr->pool != NULL) if (concr->fin.fn == NULL || concr->pool != NULL)
return; // already loaded return; // already loaded
GuPool* pool = gu_new_pool(); GuPool* pool = gu_new_pool();
@@ -1286,6 +1288,9 @@ pgf_concrete_load(PgfConcr* concr, GuIn* in, GuExn* err)
void void
pgf_concrete_unload(PgfConcr* concr) pgf_concrete_unload(PgfConcr* concr)
{ {
if (concr->fin.fn == NULL)
return;
gu_concr_fini(&concr->fin); gu_concr_fini(&concr->fin);
} }