From 77a2630ed94265da8f56648f61deeacaf92960b3 Mon Sep 17 00:00:00 2001
From: krangelov <kr.angelov@gmail.com>
Date: Sat, 11 Jul 2020 09:52:43 +0200
Subject: revert to using unconditional probabilities in the different lookup
 functions

---
 src/runtime/c/pgf/scanner.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/runtime/c')

diff --git a/src/runtime/c/pgf/scanner.c b/src/runtime/c/pgf/scanner.c
index ad78233ea..7a91b5c7c 100644
--- a/src/runtime/c/pgf/scanner.c
+++ b/src/runtime/c/pgf/scanner.c
@@ -115,7 +115,8 @@ pgf_morpho_iter(PgfProductionIdx* idx,
 		PgfCId lemma = entry->papp->fun->absfun->name;
 		GuString analysis = entry->ccat->cnccat->labels[entry->lin_idx];
 
-		prob_t prob = entry->papp->fun->absfun->ep.prob;
+		prob_t prob = entry->ccat->cnccat->abscat->prob +
+		              entry->papp->fun->absfun->ep.prob;
 		callback->callback(callback,
 						   lemma, analysis, prob, err);
 		if (!gu_ok(err))
-- 
cgit v1.2.3


From a2d7f1369c7bc83b550e6198ce1ce4ef1cc39141 Mon Sep 17 00:00:00 2001
From: krangelov <kr.angelov@gmail.com>
Date: Sun, 26 Jul 2020 15:55:18 +0200
Subject: filter out empty brackets

---
 src/runtime/c/pgf/parser.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'src/runtime/c')

diff --git a/src/runtime/c/pgf/parser.c b/src/runtime/c/pgf/parser.c
index c3255154d..1ee24ac59 100644
--- a/src/runtime/c/pgf/parser.c
+++ b/src/runtime/c/pgf/parser.c
@@ -2301,26 +2301,29 @@ pgf_get_parse_roots(PgfParsing* ps, GuPool* pool)
 PGF_API GuSeq*
 pgf_ccat_to_range(PgfParsing* ps, PgfCCat* ccat, GuPool* pool)
 {
-	PgfItemConts*  conts = ccat->conts;
 	PgfParseState* state = ps->before;
 	GuBuf* buf = gu_new_buf(PgfParseRange, pool);
 
-	while (conts != NULL) {
-		PgfParseRange* range = gu_buf_extend(buf);
-		range->start = conts->state->end_offset;
-		range->end   = conts->state->end_offset;
-		range->field = conts->ccat->cnccat->labels[conts->lin_idx];
-		
+	while (ccat->conts != NULL) {
+		size_t start = ccat->conts->state->end_offset;
+		size_t end   = start;
 		while (state != NULL) {
-			if (pgf_parsing_get_completed(state, conts) == ccat) {
-				if (state->start_offset >= range->start)
-					range->end = state->start_offset;
+			if (pgf_parsing_get_completed(state, ccat->conts) == ccat) {
+				if (state->start_offset >= start)
+					end = state->start_offset;
 				break;
 			}
 			state = state->next;
 		}
 
-		conts = conts->ccat->conts;
+		if (start != end) {
+			PgfParseRange* range = gu_buf_extend(buf);
+			range->start = start;
+			range->end   = end;
+			range->field = ccat->cnccat->labels[ccat->conts->lin_idx];
+		}
+
+		ccat = ccat->conts->ccat;
 	}
 
 	return gu_buf_data_seq(buf);
-- 
cgit v1.2.3