From 426bc49a52b4efa0ef0129d713842d8c9abdf0ff Mon Sep 17 00:00:00 2001
From: "kr.angelov" <kr.angelov@gmail.com>
Date: Fri, 27 Sep 2013 15:09:48 +0000
Subject: 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.
---
 src/runtime/c/pgf/data.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/runtime/c/pgf/data.h')

diff --git a/src/runtime/c/pgf/data.h b/src/runtime/c/pgf/data.h
index 7717f89f9..2d7fc450e 100644
--- a/src/runtime/c/pgf/data.h
+++ b/src/runtime/c/pgf/data.h
@@ -131,8 +131,11 @@ extern GU_DECLARE_TYPE(PgfCncCat, abstract);
 bool
 pgf_tokens_equal(PgfTokens* t1, PgfTokens* t2);
 
+typedef GuSeq PgfSequence; // -> PgfSymbol
+typedef GuSeq PgfSequences;
+
 typedef struct {
-	PgfTokens* form;
+	PgfSequence* form;
 	/**< The form of this variant as a list of tokens. */
 
 	GuStrings* prefixes;
@@ -175,7 +178,8 @@ typedef enum {
 	PGF_SYMBOL_VAR,
 	PGF_SYMBOL_KS,
 	PGF_SYMBOL_KP,
-	PGF_SYMBOL_NE
+	PGF_SYMBOL_NE,
+	PGF_SYMBOL_BIND
 } PgfSymbolTag;
 
 typedef struct {
@@ -186,14 +190,14 @@ typedef struct {
 typedef PgfSymbolIdx PgfSymbolCat, PgfSymbolLit, PgfSymbolVar;
 
 typedef struct {
-	PgfTokens* tokens;
+	PgfToken token;
 } PgfSymbolKS;
 
 typedef struct PgfSymbolKP
 /** A prefix-dependent symbol. The form that this symbol takes
  * depends on the form of a prefix of the following symbol. */
 {
-	PgfTokens* default_form; 
+	PgfSequence* default_form; 
 	/**< Default form that this symbol takes if none of of the
 	 * variant forms is triggered. */
 
@@ -206,8 +210,8 @@ typedef struct PgfSymbolKP
 typedef struct {
 } PgfSymbolNE;
 
-typedef GuSeq PgfSequence; // -> PgfSymbol
-typedef GuSeq PgfSequences;
+typedef struct {
+} PgfSymbolBIND;
 
 typedef struct {
 	PgfAbsFun* absfun;
-- 
cgit v1.2.3