From 1e0d7be4f4322836093d744c916fe02bfbcf9418 Mon Sep 17 00:00:00 2001 From: krasimir Date: Mon, 11 May 2015 13:01:39 +0000 Subject: added all orthographic primitives --- src/compiler/GF/Compile/Compute/Predef.hs | 5 ++++- src/compiler/GF/Compile/Compute/Value.hs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/compiler/GF/Compile/Compute') diff --git a/src/compiler/GF/Compile/Compute/Predef.hs b/src/compiler/GF/Compile/Compute/Predef.hs index 768dc2e6b..ab74f1f63 100644 --- a/src/compiler/GF/Compile/Compute/Predef.hs +++ b/src/compiler/GF/Compile/Compute/Predef.hs @@ -79,7 +79,8 @@ predefList = -- Canonical values: (cPBool,PBool),(cPFalse,PFalse),(cPTrue,PTrue),(cInt,Int), (cInts,Ints),(cNonExist,NonExist) - ,(cBIND,BIND),(cSOFT_BIND,SOFT_BIND),(cCAPIT,CAPIT)] + ,(cBIND,BIND),(cSOFT_BIND,SOFT_BIND),(cSOFT_SPACE,SOFT_SPACE) + ,(cCAPIT,CAPIT),(cALL_CAPIT,ALL_CAPIT)] --- add more functions!!! delta f vs = @@ -109,7 +110,9 @@ delta f vs = NonExist-> canonical BIND -> canonical SOFT_BIND->canonical + SOFT_SPACE->canonical CAPIT -> canonical + ALL_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 016c6572e..9bc258562 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 | CAPIT + | BIND | SOFT_BIND | SOFT_SPACE | CAPIT | ALL_CAPIT deriving (Show,Eq,Ord,Ix,Bounded,Enum) -- cgit v1.2.3