diff options
| author | krasimir <krasimir@chalmers.se> | 2017-03-07 19:50:43 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2017-03-07 19:50:43 +0000 |
| commit | 7361d220597015a9592d35971ce8108a201485b2 (patch) | |
| tree | 82aad9caa79f9f360f08cb0fbcd3db016c351530 /src | |
| parent | 2e5499ba9727f97c1dd53f22faa6b6cbceb51c5f (diff) | |
GF.Compile.Compute.ConcreteNew now handles Predef.Float
Diffstat (limited to 'src')
| -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 0acf85720..609a17798 100644 --- a/src/compiler/GF/Compile/Compute/Predef.hs +++ b/src/compiler/GF/Compile/Compute/Predef.hs @@ -75,7 +75,7 @@ predefList = -- cShow, cRead, cMapStr, cEqVal (cError,Error),(cTrace,Trace), -- Canonical values: - (cPBool,PBool),(cPFalse,PFalse),(cPTrue,PTrue),(cInt,Int), + (cPBool,PBool),(cPFalse,PFalse),(cPTrue,PTrue),(cInt,Int),(cFloat,Float), (cInts,Ints),(cNonExist,NonExist) ,(cBIND,BIND),(cSOFT_BIND,SOFT_BIND),(cSOFT_SPACE,SOFT_SPACE) ,(cCAPIT,CAPIT),(cALL_CAPIT,ALL_CAPIT)] @@ -103,6 +103,7 @@ delta f vs = -- Canonical values: PBool -> canonical Int -> canonical + Float -> canonical Ints -> canonical PFalse -> canonical PTrue -> canonical diff --git a/src/compiler/GF/Compile/Compute/Value.hs b/src/compiler/GF/Compile/Compute/Value.hs index 1cf1d88ee..7eb0c3bfb 100644 --- a/src/compiler/GF/Compile/Compute/Value.hs +++ b/src/compiler/GF/Compile/Compute/Value.hs @@ -51,6 +51,6 @@ data Predefined = Drop | Take | Tk | Dp | EqStr | Occur | Occurs | ToUpper {- | Show | Read | ToStr | MapStr | EqVal -} | Error | Trace -- Canonical values below: - | PBool | PFalse | PTrue | Int | Ints | NonExist + | PBool | PFalse | PTrue | Int | Float | Ints | NonExist | BIND | SOFT_BIND | SOFT_SPACE | CAPIT | ALL_CAPIT deriving (Show,Eq,Ord,Ix,Bounded,Enum) |