From 243cbba4c62ef39545338ec44ac23e89e91e92d6 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Thu, 22 May 2008 15:43:25 +0000 Subject: [PATCH] move GF.Devel.TC and GF.Devel.TypeCheck to GF.Compile.* --- src-3.0/GF/Compile/CheckGrammar.hs | 9 ++++----- src-3.0/GF/{Devel => Compile}/TC.hs | 2 +- src-3.0/GF/{Devel => Compile}/TypeCheck.hs | 7 +++---- 3 files changed, 8 insertions(+), 10 deletions(-) rename src-3.0/GF/{Devel => Compile}/TC.hs (99%) rename src-3.0/GF/{Devel => Compile}/TypeCheck.hs (96%) diff --git a/src-3.0/GF/Compile/CheckGrammar.hs b/src-3.0/GF/Compile/CheckGrammar.hs index e556ea3ab..5e581cce2 100644 --- a/src-3.0/GF/Compile/CheckGrammar.hs +++ b/src-3.0/GF/Compile/CheckGrammar.hs @@ -24,20 +24,19 @@ module GF.Compile.CheckGrammar ( showCheckModule, justCheckLTerm, allOperDependencies, topoSortOpers) where -import GF.Grammar.Grammar import GF.Infra.Ident import GF.Infra.Modules -import GF.Grammar.Refresh ---- -import GF.Devel.TypeCheck -import GF.Grammar.Predef (cPredef, cPredefAbs) --- +import GF.Compile.TypeCheck +import GF.Grammar.Refresh +import GF.Grammar.Grammar import GF.Grammar.PrGrammar import GF.Grammar.Lookup import GF.Grammar.LookAbs import GF.Grammar.Predef import GF.Grammar.Macros -import GF.Grammar.ReservedWords ---- +import GF.Grammar.ReservedWords import GF.Grammar.PatternMatch import GF.Grammar.AppPredefined import GF.Grammar.Lockfield (isLockLabel) diff --git a/src-3.0/GF/Devel/TC.hs b/src-3.0/GF/Compile/TC.hs similarity index 99% rename from src-3.0/GF/Devel/TC.hs rename to src-3.0/GF/Compile/TC.hs index 3d97d4b56..c0c8a83ae 100644 --- a/src-3.0/GF/Devel/TC.hs +++ b/src-3.0/GF/Compile/TC.hs @@ -12,7 +12,7 @@ -- Thierry Coquand's type checking algorithm that creates a trace ----------------------------------------------------------------------------- -module GF.Devel.TC (AExp(..), +module GF.Compile.TC (AExp(..), Theory, checkExp, inferExp, diff --git a/src-3.0/GF/Devel/TypeCheck.hs b/src-3.0/GF/Compile/TypeCheck.hs similarity index 96% rename from src-3.0/GF/Devel/TypeCheck.hs rename to src-3.0/GF/Compile/TypeCheck.hs index 90edff8b0..0347dbab8 100644 --- a/src-3.0/GF/Devel/TypeCheck.hs +++ b/src-3.0/GF/Compile/TypeCheck.hs @@ -12,7 +12,7 @@ -- (Description of the module) ----------------------------------------------------------------------------- -module GF.Devel.TypeCheck (-- * top-level type checking functions; TC should not be called directly. +module GF.Compile.TypeCheck (-- * top-level type checking functions; TC should not be called directly. checkContext, checkTyp, checkEquation, @@ -26,11 +26,10 @@ import GF.Grammar.Abstract import GF.Grammar.Refresh import GF.Grammar.LookAbs import qualified GF.Grammar.Lookup as Lookup --- - -import GF.Devel.TC - import GF.Grammar.Unify --- +import GF.Compile.TC + import Control.Monad (foldM, liftM, liftM2) import Data.List (nub) ---