From 14dfbcc624dadffcb54e58cbb26f3af24b77595a Mon Sep 17 00:00:00 2001 From: krasimir Date: Mon, 14 Sep 2009 16:23:23 +0000 Subject: clean up the GF.Grammar API --- src/GF/Compile/AbsCompute.hs | 2 +- src/GF/Compile/GrammarToGFCC.hs | 2 +- src/GF/Compile/ReadFiles.hs | 1 - src/GF/Compile/TC.hs | 3 +-- src/GF/Compile/TypeCheck.hs | 3 +-- 5 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/GF/Compile') diff --git a/src/GF/Compile/AbsCompute.hs b/src/GF/Compile/AbsCompute.hs index f08313895..48499eb74 100644 --- a/src/GF/Compile/AbsCompute.hs +++ b/src/GF/Compile/AbsCompute.hs @@ -23,7 +23,7 @@ module GF.Compile.AbsCompute (LookDef, import GF.Data.Operations -import GF.Grammar.Abstract +import GF.Grammar import GF.Grammar.Lookup import GF.Compile.Compute diff --git a/src/GF/Compile/GrammarToGFCC.hs b/src/GF/Compile/GrammarToGFCC.hs index df9203f4f..bd60e7bdb 100644 --- a/src/GF/Compile/GrammarToGFCC.hs +++ b/src/GF/Compile/GrammarToGFCC.hs @@ -14,7 +14,7 @@ import GF.Grammar.Predef import GF.Grammar.Printer import GF.Grammar.Grammar import qualified GF.Grammar.Lookup as Look -import qualified GF.Grammar.Abstract as A +import qualified GF.Grammar as A import qualified GF.Grammar.Macros as GM import qualified GF.Compile.Compute as Compute ---- import qualified GF.Infra.Modules as M diff --git a/src/GF/Compile/ReadFiles.hs b/src/GF/Compile/ReadFiles.hs index b12ced07e..a1e0c287d 100644 --- a/src/GF/Compile/ReadFiles.hs +++ b/src/GF/Compile/ReadFiles.hs @@ -28,7 +28,6 @@ import GF.Infra.Option import GF.Infra.Ident import GF.Infra.Modules import GF.Data.Operations -import qualified GF.Source.AbsGF as S import GF.Grammar.Lexer import GF.Grammar.Parser import GF.Grammar.Grammar diff --git a/src/GF/Compile/TC.hs b/src/GF/Compile/TC.hs index 4508c8a17..7ee3e9755 100644 --- a/src/GF/Compile/TC.hs +++ b/src/GF/Compile/TC.hs @@ -22,9 +22,8 @@ module GF.Compile.TC (AExp(..), ) where import GF.Data.Operations +import GF.Grammar import GF.Grammar.Predef -import GF.Grammar.Abstract -import GF.Grammar.Printer import Control.Monad import Data.List (sortBy) diff --git a/src/GF/Compile/TypeCheck.hs b/src/GF/Compile/TypeCheck.hs index 20c53c234..f2f494c31 100644 --- a/src/GF/Compile/TypeCheck.hs +++ b/src/GF/Compile/TypeCheck.hs @@ -22,10 +22,9 @@ module GF.Compile.TypeCheck (-- * top-level type checking functions; TC should n import GF.Data.Operations import GF.Infra.CheckM -import GF.Grammar.Abstract +import GF.Grammar import GF.Grammar.Lookup import GF.Grammar.Unify -import GF.Grammar.Printer import GF.Compile.Refresh import GF.Compile.AbsCompute import GF.Compile.TC -- cgit v1.2.3