Merge remote-tracking branch 'origin/master' into basque

4 files changed, 69 insertions, 35 deletions

diff --git a/src/runtime/c/pgf/expr.c b/src/runtime/c/pgf/expr.c
index 2a1d0de15..92e92f04f 100644
--- a/src/runtime/c/pgf/expr.c
+++ b/src/runtime/c/pgf/expr.c
@@ -1650,10 +1650,10 @@ pgf_print_hypo(PgfHypo *hypo, PgfPrintContext* ctxt, int prec,
         } else {
             pgf_print_type(hypo->type, ctxt, prec, out, err);
         }
-        
+
         gu_pool_free(tmp_pool);
     }
-    
+
 	PgfPrintContext* new_ctxt = malloc(sizeof(PgfPrintContext));
 	new_ctxt->name = hypo->cid;
 	new_ctxt->next = ctxt;
@@ -1668,7 +1668,7 @@ pgf_print_type(PgfType *type, PgfPrintContext* ctxt, int prec,
     
     if (n_hypos > 0) {
 		if (prec > 0) gu_putc('(', out, err);
-		
+
 		PgfPrintContext* new_ctxt = ctxt;
 		for (size_t i = 0; i < n_hypos; i++) {
 			PgfHypo *hypo = gu_seq_index(type->hypos, PgfHypo, i);
@@ -1708,6 +1708,22 @@ pgf_print_type(PgfType *type, PgfPrintContext* ctxt, int prec,
 }
 
 PGF_API void
+pgf_print_context(PgfHypos *hypos, PgfPrintContext* ctxt,
+                  GuOut *out, GuExn *err)
+{
+	PgfPrintContext* new_ctxt = ctxt;
+
+    size_t n_hypos = gu_seq_length(hypos);
+	for (size_t i = 0; i < n_hypos; i++) {
+		if (i > 0)
+			gu_putc(' ', out, err);
+
+		PgfHypo *hypo = gu_seq_index(hypos, PgfHypo, i);
+		new_ctxt = pgf_print_hypo(hypo, new_ctxt, 4, out, err);		
+	}
+}
+
+PGF_API void
 pgf_print_expr_tuple(size_t n_exprs, PgfExpr exprs[], PgfPrintContext* ctxt,
                      GuOut* out, GuExn* err)
 {
@@ -1720,30 +1736,6 @@ pgf_print_expr_tuple(size_t n_exprs, PgfExpr exprs[], PgfPrintContext* ctxt,
 	gu_putc('>', out, err);
 }
 
-PGF_API_DECL void
-pgf_print_category(PgfPGF *gr, PgfCId catname,
-                   GuOut* out, GuExn *err)
-{
-	PgfAbsCat* abscat =
-		gu_seq_binsearch(gr->abstract.cats, pgf_abscat_order, PgfAbsCat, catname);
-	if (abscat == NULL) {
-		GuExnData* exn = gu_raise(err, PgfExn);
-		exn->data = "Unknown category";
-		return;
-	}
-
-	gu_puts(abscat->name, out, err);
-
-	PgfPrintContext* ctxt = NULL;
-	size_t n_hypos = gu_seq_length(abscat->context);
-	for (size_t i = 0; i < n_hypos; i++) {
-		PgfHypo *hypo = gu_seq_index(abscat->context, PgfHypo, i);
-
-		gu_putc(' ', out, err);
-		ctxt = pgf_print_hypo(hypo, ctxt, 4, out, err);
-	}
-}
-
 PGF_API bool
 pgf_type_eq(PgfType* t1, PgfType* t2)
 {
diff --git a/src/runtime/c/pgf/expr.h b/src/runtime/c/pgf/expr.h
index 0fc6774ac..e560d3a83 100644
--- a/src/runtime/c/pgf/expr.h
+++ b/src/runtime/c/pgf/expr.h
@@ -235,14 +235,14 @@ pgf_print_type(PgfType *type, PgfPrintContext* ctxt, int prec,
                GuOut* out, GuExn *err);
 
 PGF_API_DECL void
-pgf_print_expr_tuple(size_t n_exprs, PgfExpr exprs[], PgfPrintContext* ctxt,
-                     GuOut* out, GuExn* err);
+pgf_print_context(PgfHypos *hypos, PgfPrintContext* ctxt,
+                  GuOut *out, GuExn *err);
 
 PGF_API_DECL void
-pgf_print_category(PgfPGF *gr, PgfCId catname,
-                   GuOut* out, GuExn *err);
+pgf_print_expr_tuple(size_t n_exprs, PgfExpr exprs[], PgfPrintContext* ctxt,
+                     GuOut* out, GuExn* err);
 
-PGF_API prob_t
+PGF_API_DECL prob_t
 pgf_compute_tree_probability(PgfPGF *gr, PgfExpr expr);
 
 #endif /* EXPR_H_ */
diff --git a/src/runtime/c/pgf/pgf.c b/src/runtime/c/pgf/pgf.c
index 7e519cbbf..5317830fb 100644
--- a/src/runtime/c/pgf/pgf.c
+++ b/src/runtime/c/pgf/pgf.c
@@ -140,6 +140,29 @@ pgf_start_cat(PgfPGF* pgf, GuPool* pool)
 	return type;
 }
 
+PGF_API PgfHypos*
+pgf_category_context(PgfPGF *gr, PgfCId catname)
+{
+	PgfAbsCat* abscat =
+		gu_seq_binsearch(gr->abstract.cats, pgf_abscat_order, PgfAbsCat, catname);
+	if (abscat == NULL) {
+		return NULL;
+	}
+
+	return abscat->context;
+}
+
+PGF_API prob_t
+pgf_category_prob(PgfPGF* pgf, PgfCId catname)
+{
+	PgfAbsCat* abscat =
+		gu_seq_binsearch(pgf->abstract.cats, pgf_abscat_order, PgfAbsCat, catname);
+	if (abscat == NULL)
+		return INFINITY;
+
+	return abscat->prob;
+}
+
 PGF_API GuString
 pgf_language_code(PgfConcr* concr)
 {
@@ -173,7 +196,7 @@ pgf_iter_functions(PgfPGF* pgf, GuMapItor* itor, GuExn* err)
 }
 
 PGF_API void
-pgf_iter_functions_by_cat(PgfPGF* pgf, PgfCId catname, 
+pgf_iter_functions_by_cat(PgfPGF* pgf, PgfCId catname,
                           GuMapItor* itor, GuExn* err) 
 {
 	size_t n_funs = gu_seq_length(pgf->abstract.funs);
@@ -199,7 +222,17 @@ pgf_function_type(PgfPGF* pgf, PgfCId funname)
 	return absfun->type;
 }
 
-PGF_API double
+PGF_API_DECL bool
+pgf_function_is_constructor(PgfPGF* pgf, PgfCId funname)
+{
+	PgfAbsFun* absfun =
+		gu_seq_binsearch(pgf->abstract.funs, pgf_absfun_order, PgfAbsFun, funname);
+	if (absfun == NULL)
+		return false;
+	return (absfun->defns == NULL);
+}
+
+PGF_API prob_t
 pgf_function_prob(PgfPGF* pgf, PgfCId funname) 
 {
 	PgfAbsFun* absfun =
diff --git a/src/runtime/c/pgf/pgf.h b/src/runtime/c/pgf/pgf.h
index c7a14dceb..d4cc63097 100644
--- a/src/runtime/c/pgf/pgf.h
+++ b/src/runtime/c/pgf/pgf.h
@@ -81,6 +81,12 @@ pgf_iter_categories(PgfPGF* pgf, GuMapItor* itor, GuExn* err);
 PGF_API_DECL PgfType*
 pgf_start_cat(PgfPGF* pgf, GuPool* pool);
 
+PGF_API_DECL PgfHypos*
+pgf_category_context(PgfPGF *gr, PgfCId catname);
+
+PGF_API_DECL prob_t
+pgf_category_prob(PgfPGF* pgf, PgfCId catname);
+
 PGF_API_DECL void
 pgf_iter_functions(PgfPGF* pgf, GuMapItor* itor, GuExn* err);
 
@@ -91,7 +97,10 @@ pgf_iter_functions_by_cat(PgfPGF* pgf, PgfCId catname,
 PGF_API_DECL PgfType*
 pgf_function_type(PgfPGF* pgf, PgfCId funname);
 
-PGF_API_DECL double
+PGF_API_DECL bool
+pgf_function_is_constructor(PgfPGF* pgf, PgfCId funname);
+
+PGF_API_DECL prob_t
 pgf_function_prob(PgfPGF* pgf, PgfCId funname);
 
 PGF_API_DECL GuString