diff options
| author | kr.angelov <kr.angelov@gmail.com> | 2014-10-09 19:34:12 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@gmail.com> | 2014-10-09 19:34:12 +0000 |
| commit | f8b73d593ca147e48a723d3dceda7c5977d21ae6 (patch) | |
| tree | 674b540b555f240ca2b32f65cb86e233cd1f2af9 /src/compiler/GF/Compile/Compute | |
| parent | 86e9acc7a7b714307e08ab25117ca03cecb00936 (diff) | |
Prelude.CAPIT is now a built-in primitive. It still generates &| in the Haskell runtime but will be intepreted in the C runtime
Diffstat (limited to 'src/compiler/GF/Compile/Compute')
| -rw-r--r-- | src/compiler/GF/Compile/Compute/Predef.hs | 3 | ||||
| -rw-r--r-- | src/compiler/GF/Compile/Compute/Value.hs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/GF/Compile/Compute/Predef.hs b/src/compiler/GF/Compile/Compute/Predef.hs index b9bb01ce8..74697a89b 100644 --- a/src/compiler/GF/Compile/Compute/Predef.hs +++ b/src/compiler/GF/Compile/Compute/Predef.hs @@ -79,7 +79,7 @@ predefList = -- Canonical values: (cPBool,PBool),(cPFalse,PFalse),(cPTrue,PTrue),(cInt,Int), (cInts,Ints),(cNonExist,NonExist) - ,(cBIND,BIND),(cSOFT_BIND,SOFT_BIND)] + ,(cBIND,BIND),(cSOFT_BIND,SOFT_BIND),(cCAPIT,CAPIT)] --- add more functions!!! delta f vs = @@ -109,6 +109,7 @@ delta f vs = NonExist-> canonical BIND -> canonical SOFT_BIND->canonical + CAPIT -> 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 64683a3de..f076e47ba 100644 --- a/src/compiler/GF/Compile/Compute/Value.hs +++ b/src/compiler/GF/Compile/Compute/Value.hs @@ -52,5 +52,5 @@ data Predefined = Drop | Take | Tk | Dp | EqStr | Occur | Occurs | ToUpper | Error -- Canonical values below: | PBool | PFalse | PTrue | Int | Ints | NonExist - | BIND | SOFT_BIND + | BIND | SOFT_BIND | CAPIT deriving (Show,Eq,Ord,Ix,Bounded,Enum) |