diff options
| author | krasimir <krasimir@chalmers.se> | 2010-06-17 15:08:12 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2010-06-17 15:08:12 +0000 |
| commit | d8b049fdf840c9f8f383c7568882a5d2d11afecb (patch) | |
| tree | ecd1f2597f9a7dfd45e02bc659d37b340b6b171a /src/compiler/GF/Compile | |
| parent | 183c87817394aad6adf6eb7e1bf3e297e1982e6f (diff) | |
rename GF.Grammar.Predef.isPredefCat to isLiteralCat
Diffstat (limited to 'src/compiler/GF/Compile')
| -rw-r--r-- | src/compiler/GF/Compile/Abstract/TC.hs | 2 | ||||
| -rw-r--r-- | src/compiler/GF/Compile/Rename.hs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/GF/Compile/Abstract/TC.hs b/src/compiler/GF/Compile/Abstract/TC.hs index 4758bacdb..8236bcf44 100644 --- a/src/compiler/GF/Compile/Abstract/TC.hs +++ b/src/compiler/GF/Compile/Abstract/TC.hs @@ -161,7 +161,7 @@ checkInferExp th tenv@(k,_,_) e typ = do inferExp :: Theory -> TCEnv -> Exp -> Err (AExp, Val, [(Val,Val)]) inferExp th tenv@(k,rho,gamma) e = case e of Vr x -> mkAnnot (AVr x) $ noConstr $ lookupVar gamma x - Q (m,c) | m == cPredefAbs && isPredefCat c + Q (m,c) | m == cPredefAbs && isLiteralCat c -> return (ACn (m,c) vType, vType, []) | otherwise -> mkAnnot (ACn (m,c)) $ noConstr $ lookupConst th (m,c) QC c -> mkAnnot (ACn c) $ noConstr $ lookupConst th c ---- diff --git a/src/compiler/GF/Compile/Rename.hs b/src/compiler/GF/Compile/Rename.hs index a0ccdae12..a5645c26e 100644 --- a/src/compiler/GF/Compile/Rename.hs +++ b/src/compiler/GF/Compile/Rename.hs @@ -87,8 +87,8 @@ renameIdentTerm env@(act,imps) t = -- this facility is mainly for BWC with GF1: you need not import PredefAbs predefAbs c s - | isPredefCat c = return $ Q (cPredefAbs,c) - | otherwise = checkError s + | isLiteralCat c = return $ Q (cPredefAbs,c) + | otherwise = checkError s ident alt c = case lookupTree showIdent c act of Ok f -> return $ f c |