diff options
| author | bjorn <bjorn@bringert.net> | 2008-05-23 08:47:07 +0000 |
|---|---|---|
| committer | bjorn <bjorn@bringert.net> | 2008-05-23 08:47:07 +0000 |
| commit | 6027c10a0ce4b9c6282276125876092ffadac027 (patch) | |
| tree | 4835db42dec34f82ca03dd203981e26dfe87dd71 /src-3.0/GF/Grammar | |
| parent | 5aceb18bebac19a5fb0580dd7b232ead0b5bd878 (diff) | |
Get rid of the 'f' type parameter to the module types.
This was only ever instantiated with Option, and made it diificult to change the options type.
Diffstat (limited to 'src-3.0/GF/Grammar')
| -rw-r--r-- | src-3.0/GF/Grammar/Grammar.hs | 10 | ||||
| -rw-r--r-- | src-3.0/GF/Grammar/PrGrammar.hs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src-3.0/GF/Grammar/Grammar.hs b/src-3.0/GF/Grammar/Grammar.hs index 6431b33e9..f451d0b27 100644 --- a/src-3.0/GF/Grammar/Grammar.hs +++ b/src-3.0/GF/Grammar/Grammar.hs @@ -62,15 +62,15 @@ import GF.Data.Operations import qualified Data.ByteString.Char8 as BS -- | grammar as presented to the compiler -type SourceGrammar = MGrammar Ident Option Info +type SourceGrammar = MGrammar Ident Info -type SourceModInfo = ModInfo Ident Option Info +type SourceModInfo = ModInfo Ident Info type SourceModule = (Ident, SourceModInfo) -type SourceAbs = Module Ident Option Info -type SourceRes = Module Ident Option Info -type SourceCnc = Module Ident Option Info +type SourceAbs = Module Ident Info +type SourceRes = Module Ident Info +type SourceCnc = Module Ident Info -- this is created in CheckGrammar, and so are Val and PVal type PValues = [Term] diff --git a/src-3.0/GF/Grammar/PrGrammar.hs b/src-3.0/GF/Grammar/PrGrammar.hs index 186792eda..734aa13ca 100644 --- a/src-3.0/GF/Grammar/PrGrammar.hs +++ b/src-3.0/GF/Grammar/PrGrammar.hs @@ -245,5 +245,5 @@ lookupIdent c t = case lookupTree prt c t of Ok v -> return v _ -> prtBad "unknown identifier" c -lookupIdentInfo :: Module Ident f a -> Ident -> Err a +lookupIdentInfo :: Module Ident a -> Ident -> Err a lookupIdentInfo mo i = lookupIdent i (jments mo) |