a major refactoring in the C and the Haskell runtimes. Note incompatible change in the PGF format!!!

The following are the outcomes:

   - Predef.nonExist is fully supported by both the Haskell and the C runtimes

   - Predef.BIND is now an internal compiler defined token. For now
     it behaves just as usual for the Haskell runtime, i.e. it generates &+.
     However, the special treatment will let us to handle it properly in 
     the C runtime.

   - This required a major change in the PGF format since both 
     nonExist and BIND may appear inside 'pre' and this was not supported
     before.

1 files changed, 4 insertions, 7 deletions

diff --git a/src/runtime/c/pgf/literals.c b/src/runtime/c/pgf/literals.c
index a11097781..7e0c664c6 100644
--- a/src/runtime/c/pgf/literals.c
+++ b/src/runtime/c/pgf/literals.c
@@ -42,7 +42,7 @@ pgf_match_string_lit(PgfConcr* concr, PgfItem* item, PgfToken tok,
 			gu_new_variant(PGF_LITERAL_STR,
 						   PgfLiteralStr,
 						   &expr_lit->lit, pool);
-		lit_str->val = gu_seq_get(sks->tokens, PgfToken, 0);
+		lit_str->val = sks->token;
 
 		*out_ep = ep;
 		accepted = false;
@@ -80,10 +80,9 @@ pgf_match_int_lit(PgfConcr* concr, PgfItem* item, PgfToken tok,
 	} else if (n_syms == 1) {
 		PgfSymbolKS* sks =
 			gu_variant_data(gu_seq_get(seq, PgfSymbol, 0));
-		PgfToken tok = gu_seq_get(sks->tokens, PgfToken, 0);
 
 		int val;
-		if (!gu_string_to_int(tok, &val)) {
+		if (!gu_string_to_int(sks->token, &val)) {
 			*out_ep = NULL;
 		} else {
 			PgfExprProb* ep = gu_new(PgfExprProb, pool);
@@ -137,10 +136,9 @@ pgf_match_float_lit(PgfConcr* concr, PgfItem* item, PgfToken tok,
 	} else if (n_syms == 1) {
 		PgfSymbolKS* sks =
 			gu_variant_data(gu_seq_get(seq, PgfSymbol, 0));
-		PgfToken tok = gu_seq_get(sks->tokens, PgfToken, 0);
 
 		double val;
-		if (!gu_string_to_double(tok, &val)) {
+		if (!gu_string_to_double(sks->token, &val)) {
 			*out_ep = NULL;
 		} else {
 			PgfExprProb* ep = gu_new(PgfExprProb, pool);
@@ -209,9 +207,8 @@ pgf_match_name_lit(PgfConcr* concr, PgfItem* item, PgfToken tok,
 			PgfSymbol sym = gu_seq_get(seq, PgfSymbol, i);
 			gu_assert(gu_variant_tag(sym) == PGF_SYMBOL_KS);
 			PgfSymbolKS* sks = gu_variant_data(sym);
-			PgfToken tok = gu_seq_get(sks->tokens, PgfToken, 0);
 
-			gu_string_write(tok, out, err);
+			gu_string_write(sks->token, out, err);
 		}
 
 		PgfExprProb* ep = gu_new(PgfExprProb, pool);