From 7fcaa81858959699938ae0f032583a498c63019a Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Mon, 23 Jan 2012 09:46:45 +0000 Subject: libpgf: move the lindefs field from PgfCncCat to PgfCCat. display the list in the grammar printout --- src/runtime/c/pgf/data.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/runtime/c/pgf/data.c') diff --git a/src/runtime/c/pgf/data.c b/src/runtime/c/pgf/data.c index 19aa51f23..6356da8b1 100644 --- a/src/runtime/c/pgf/data.c +++ b/src/runtime/c/pgf/data.c @@ -4,11 +4,10 @@ #include #include - -PgfCCat pgf_ccat_string = { NULL, GU_NULL_SEQ, -1 }; -PgfCCat pgf_ccat_int = { NULL, GU_NULL_SEQ, -2 }; -PgfCCat pgf_ccat_float = { NULL, GU_NULL_SEQ, -3 }; -PgfCCat pgf_ccat_var = { NULL, GU_NULL_SEQ, -4 }; +PgfCCat pgf_ccat_string = { NULL, NULL, GU_NULL_SEQ, -1 }; +PgfCCat pgf_ccat_int = { NULL, NULL, GU_NULL_SEQ, -2 }; +PgfCCat pgf_ccat_float = { NULL, NULL, GU_NULL_SEQ, -3 }; +PgfCCat pgf_ccat_var = { NULL, NULL, GU_NULL_SEQ, -4 }; PgfCCatId pgf_literal_cat(PgfLiteral lit) @@ -59,6 +58,7 @@ typedef GuType_GuStringMap GuType_PgfCIdMap; GU_DEFINE_TYPE(PgfCCat, struct, GU_MEMBER_S(PgfCCat, cnccat, PgfCncCat), + GU_MEMBER_P(PgfCCat, lindefs, PgfFunIds), GU_MEMBER(PgfCCat, prods, PgfProductionSeq)); GU_DEFINE_TYPE(PgfCCatId, shared, gu_type(PgfCCat)); @@ -100,7 +100,6 @@ GU_DEFINE_TYPE( GU_MEMBER(PgfCncCat, cid, PgfCId), GU_MEMBER_P(PgfCncCat, cats, PgfCCatIds), GU_MEMBER(PgfCncCat, n_lins, size_t), - GU_MEMBER_P(PgfCncCat, lindefs, PgfFunIds), GU_MEMBER_P(PgfCncCat, labels, GuStringL)); // GU_DEFINE_TYPE(PgfSequence, GuList, gu_ptr_type(PgfSymbol)); -- cgit v1.2.3