From 4891dbce7e857c1d9fb00438a16f0c13187acf27 Mon Sep 17 00:00:00 2001
From: "kr.angelov" <kr.angelov@gmail.com>
Date: Fri, 27 Sep 2013 15:09:48 +0000
Subject: [PATCH] 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/prelude/Predef.gf  | 1 +
 src/prelude/Prelude.gf | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/prelude/Predef.gf b/src/prelude/Predef.gf
index abe6563ad..10af6e3f2 100644
--- a/src/prelude/Predef.gf
+++ b/src/prelude/Predef.gf
@@ -37,5 +37,6 @@ resource Predef = {
   oper mapStr : (L : Type) -> (Str -> Str) -> L -> L = variants {} ; 
                -- map all strings in a data structure; experimental ---
   oper nonExist : Str = variants {} ;  -- a placeholder for non-existant morphological forms
+  oper BIND : Str = variants {} ;  -- a token for gluing
 
 } ;
diff --git a/src/prelude/Prelude.gf b/src/prelude/Prelude.gf
index 027910e3f..fd8ac6aef 100644
--- a/src/prelude/Prelude.gf
+++ b/src/prelude/Prelude.gf
@@ -114,7 +114,7 @@ oper
 
 -- These should be hidden, and never changed since they are hardcoded in (un)lexers
 
-    BIND : Str = "&+" ;
+    BIND : Str = Predef.BIND;
     PARA : Str = "&-" ;
     CAPIT : Str = "&|" ;