diff options
| author | hallgren <hallgren@chalmers.se> | 2012-12-18 13:03:20 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2012-12-18 13:03:20 +0000 |
| commit | c3beefba47d9b3affa35f736c29dfd64565728b4 (patch) | |
| tree | 10e49a04cffa86229f77229c8854c273c3937d16 /src/compiler/GF | |
| parent | 403420be2b45656037d3d2721d421d06d2b02463 (diff) | |
partial evaluator bug fix
Int was missing from the list of predefined canonical constants.
Diffstat (limited to 'src/compiler/GF')
| -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 c7ba532aa..813ee78d4 100644 --- a/src/compiler/GF/Compile/Compute/Predef.hs +++ b/src/compiler/GF/Compile/Compute/Predef.hs @@ -70,7 +70,7 @@ predefList = -- cShow, cRead, cMapStr, cEqVal (cError,Error), -- Canonical values: - (cPBool,PBool),(cPFalse,PFalse),(cPTrue,PTrue),(cInts,Ints)] + (cPBool,PBool),(cPFalse,PFalse),(cPTrue,PTrue),(cInt,Int),(cInts,Ints)] --- add more functions!!! delta f vs = @@ -93,6 +93,7 @@ delta f vs = Error -> ap1 VError -- Canonical values: PBool -> canonical + Int -> 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 bbc751ee4..e05d29e42 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 | Ints + | PBool | PFalse | PTrue | Int | Ints deriving (Show,Eq,Ord,Ix,Bounded,Enum) |