GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-26 03:08:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

GF.Compile.Compute.ConcreteNew now handles Predef.Float

Browse Source
This commit is contained in:
krasimir
2017-03-07 19:50:43 +00:00
parent 2e5499ba97
commit 7361d22059
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/GF/Compile/Compute/Predef.hs
View File

@@ -75,7 +75,7 @@ predefList =
-- cShow, cRead, cMapStr, cEqVal -- cShow, cRead, cMapStr, cEqVal
(cError,Error),(cTrace,Trace), (cError,Error),(cTrace,Trace),
-- Canonical values: -- Canonical values:
(cPBool,PBool),(cPFalse,PFalse),(cPTrue,PTrue),(cInt,Int), (cPBool,PBool),(cPFalse,PFalse),(cPTrue,PTrue),(cInt,Int),(cFloat,Float),
(cInts,Ints),(cNonExist,NonExist) (cInts,Ints),(cNonExist,NonExist)
,(cBIND,BIND),(cSOFT_BIND,SOFT_BIND),(cSOFT_SPACE,SOFT_SPACE) ,(cBIND,BIND),(cSOFT_BIND,SOFT_BIND),(cSOFT_SPACE,SOFT_SPACE)
,(cCAPIT,CAPIT),(cALL_CAPIT,ALL_CAPIT)] ,(cCAPIT,CAPIT),(cALL_CAPIT,ALL_CAPIT)]
@@ -103,6 +103,7 @@ delta f vs =
-- Canonical values: -- Canonical values:
PBool -> canonical PBool -> canonical
Int -> canonical Int -> canonical
Float -> canonical
Ints -> canonical Ints -> canonical
PFalse -> canonical PFalse -> canonical
PTrue -> canonical PTrue -> canonical

2
src/compiler/GF/Compile/Compute/Value.hs
View File

@@ -51,6 +51,6 @@ data Predefined = Drop | Take | Tk | Dp | EqStr | Occur | Occurs | ToUpper
{- | Show | Read | ToStr | MapStr | EqVal -} {- | Show | Read | ToStr | MapStr | EqVal -}
| Error | Trace | Error | Trace
-- Canonical values below: -- Canonical values below:
| PBool | PFalse | PTrue | Int | Ints | NonExist | PBool | PFalse | PTrue | Int | Float | Ints | NonExist
| BIND | SOFT_BIND | SOFT_SPACE | CAPIT | ALL_CAPIT | BIND | SOFT_BIND | SOFT_SPACE | CAPIT | ALL_CAPIT
deriving (Show,Eq,Ord,Ix,Bounded,Enum) deriving (Show,Eq,Ord,Ix,Bounded,Enum)