diff options
| author | krasimir <krasimir@chalmers.se> | 2010-07-01 08:51:59 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2010-07-01 08:51:59 +0000 |
| commit | 5ae7be358daf169a3852d93f36c30c4ce7d0363e (patch) | |
| tree | dcbc25272686a5e04da654c657bd140c349aac2b /src/compiler/GF/Grammar | |
| parent | 706b215fce733ab4e342bce4fc9cc37c16f9875c (diff) | |
redesign the open-literals API
Diffstat (limited to 'src/compiler/GF/Grammar')
| -rw-r--r-- | src/compiler/GF/Grammar/Lookup.hs | 6 | ||||
| -rw-r--r-- | src/compiler/GF/Grammar/Predef.hs | 6 | ||||
| -rw-r--r-- | src/compiler/GF/Grammar/Values.hs | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/compiler/GF/Grammar/Lookup.hs b/src/compiler/GF/Grammar/Lookup.hs index f942bdcaf..d1473bbcd 100644 --- a/src/compiler/GF/Grammar/Lookup.hs +++ b/src/compiler/GF/Grammar/Lookup.hs @@ -60,8 +60,8 @@ lookupIdentInfo mo i = lookupIdent i (jments mo) lookupResDef :: SourceGrammar -> QIdent -> Err Term lookupResDef gr (m,c) - | isLiteralCat c = lock c defLinType - | otherwise = look m c + | isPredefCat c = lock c defLinType + | otherwise = look m c where look m c = do mo <- lookupModule gr m @@ -161,7 +161,7 @@ lookupAbsDef gr m c = errIn (render (text "looking up absdef of" <+> ppIdent c)) _ -> return (Nothing,Nothing) lookupLincat :: SourceGrammar -> Ident -> Ident -> Err Type -lookupLincat gr m c | isLiteralCat c = return defLinType --- ad hoc; not needed? +lookupLincat gr m c | isPredefCat c = return defLinType --- ad hoc; not needed? lookupLincat gr m c = do mo <- lookupModule gr m info <- lookupIdentInfo mo c diff --git a/src/compiler/GF/Grammar/Predef.hs b/src/compiler/GF/Grammar/Predef.hs index f16765433..f9c2c5d18 100644 --- a/src/compiler/GF/Grammar/Predef.hs +++ b/src/compiler/GF/Grammar/Predef.hs @@ -25,7 +25,7 @@ module GF.Grammar.Predef , cErrorType , cOverload , cUndefinedType - , isLiteralCat + , isPredefCat , cPTrue, cPFalse @@ -92,8 +92,8 @@ cOverload = identC (BS.pack "overload") cUndefinedType :: Ident cUndefinedType = identC (BS.pack "UndefinedType") -isLiteralCat :: Ident -> Bool -isLiteralCat c = elem c [cInt,cString,cFloat,cVar] +isPredefCat :: Ident -> Bool +isPredefCat c = elem c [cInt,cString,cFloat] cPTrue :: Ident cPTrue = identC (BS.pack "PTrue") diff --git a/src/compiler/GF/Grammar/Values.hs b/src/compiler/GF/Grammar/Values.hs index c5646f5b4..1a68ddc89 100644 --- a/src/compiler/GF/Grammar/Values.hs +++ b/src/compiler/GF/Grammar/Values.hs @@ -19,7 +19,7 @@ module GF.Grammar.Values (-- * values used in TC type checking Binds, Constraints, MetaSubst, -- * for TC valAbsInt, valAbsFloat, valAbsString, vType, - isLiteralCat, + isPredefCat, eType, --Z tree2exp, loc2treeFocus ) where |