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/compiler/GF/Compile/Compute/AppPredefined.hs | 2 ++
 src/compiler/GF/Compile/Compute/Predef.hs        | 3 ++-
 src/compiler/GF/Compile/Compute/Value.hs         | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/compiler/GF/Compile/Compute')

diff --git a/src/compiler/GF/Compile/Compute/AppPredefined.hs b/src/compiler/GF/Compile/Compute/AppPredefined.hs
index 869052e0a..861a74a89 100644
--- a/src/compiler/GF/Compile/Compute/AppPredefined.hs
+++ b/src/compiler/GF/Compile/Compute/AppPredefined.hs
@@ -84,6 +84,8 @@ primitives = Map.fromList
                                          [(Explicit,varL,typeType),(Explicit,identW,mkFunType [typeStr] typeStr),(Explicit,identW,Vr varL)] (Vr varL) []))) Nothing)
   , (cNonExist , ResOper (Just (noLoc (mkProd -- Str
                                          [] typeStr []))) Nothing)
+  , (cBIND     , ResOper (Just (noLoc (mkProd -- Str
+                                         [] typeStr []))) Nothing)
   ]
   where
     fun from to = oper (mkFunType from to)
diff --git a/src/compiler/GF/Compile/Compute/Predef.hs b/src/compiler/GF/Compile/Compute/Predef.hs
index 11c4002b8..b8b7f7c77 100644
--- a/src/compiler/GF/Compile/Compute/Predef.hs
+++ b/src/compiler/GF/Compile/Compute/Predef.hs
@@ -78,7 +78,7 @@ predefList =
      (cError,Error),
      -- Canonical values:
      (cPBool,PBool),(cPFalse,PFalse),(cPTrue,PTrue),(cInt,Int),
-     (cInts,Ints),(cNonExist,NonExist)]
+     (cInts,Ints),(cNonExist,NonExist),(cBIND,BIND)]
     --- add more functions!!!
 
 delta f vs =
@@ -106,6 +106,7 @@ delta f vs =
       PFalse  -> canonical
       PTrue   -> canonical
       NonExist-> canonical
+      BIND    -> canonical
   where
     canonical = delay
     delay = return (VApp f vs) -- wrong number of arguments
diff --git a/src/compiler/GF/Compile/Compute/Value.hs b/src/compiler/GF/Compile/Compute/Value.hs
index 7dbaaa193..e72b06778 100644
--- a/src/compiler/GF/Compile/Compute/Value.hs
+++ b/src/compiler/GF/Compile/Compute/Value.hs
@@ -51,5 +51,5 @@ data Predefined = Drop | Take | Tk | Dp | EqStr | Occur | Occurs | ToUpper
              {- | Show | Read | ToStr | MapStr | EqVal -}
                 | Error
                 -- Canonical values below:
-                | PBool | PFalse | PTrue | Int | Ints | NonExist
+                | PBool | PFalse | PTrue | Int | Ints | NonExist | BIND
                 deriving (Show,Eq,Ord,Ix,Bounded,Enum)
-- 
cgit v1.2.3