From 734c66710e9bffa986c094e8c584295b33cd2f63 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Wed, 2 Nov 2011 13:57:11 +0000 Subject: merge GF.Infra.Modules and GF.Grammar.Grammar. This is a preparation for the separate PGF building --- src/compiler/GF/Grammar/Lookup.hs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/compiler/GF/Grammar/Lookup.hs') diff --git a/src/compiler/GF/Grammar/Lookup.hs b/src/compiler/GF/Grammar/Lookup.hs index 651fde4d0..7e743dd16 100644 --- a/src/compiler/GF/Grammar/Lookup.hs +++ b/src/compiler/GF/Grammar/Lookup.hs @@ -17,7 +17,6 @@ module GF.Grammar.Lookup ( lookupIdent, --- lookupIdentInfo, lookupOrigInfo, allOrigInfos, lookupResDef, @@ -34,7 +33,6 @@ module GF.Grammar.Lookup ( import GF.Data.Operations import GF.Infra.Ident -import GF.Infra.Modules import GF.Grammar.Macros import GF.Grammar.Grammar import GF.Grammar.Printer @@ -57,10 +55,10 @@ lookupIdent c t = Ok v -> return v Bad _ -> Bad ("unknown identifier" +++ showIdent c) -lookupIdentInfo :: ModInfo a -> Ident -> Err a +lookupIdentInfo :: SourceModInfo -> Ident -> Err Info lookupIdentInfo mo i = lookupIdent i (jments mo) -lookupQIdentInfo :: MGrammar info -> QIdent -> Err info +lookupQIdentInfo :: SourceGrammar -> QIdent -> Err Info lookupQIdentInfo gr (m,c) = flip lookupIdentInfo c =<< lookupModule gr m lookupResDef :: SourceGrammar -> QIdent -> Err Term -- cgit v1.2.3