Fixed module names and imports after giant file move.

2005-04-21 15:21:02 +00:00
parent 8e44d9a8c1
commit 93af0c8535
209 changed files with 2038 additions and 2036 deletions
--- a/src/GF/Grammar/AbsCompute.hs
+++ b/src/GF/Grammar/AbsCompute.hs
@@ -5,31 +5,31 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/18 19:21:12 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.6 $
+-- > CVS $Date: 2005/04/21 16:22:18 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.7 $
 --
 -- computation in abstract syntax w.r.t. explicit definitions.
 --
 -- old GF computation; to be updated
 -----------------------------------------------------------------------------

-module AbsCompute (LookDef, 
+module GF.Grammar.AbsCompute (LookDef,
 		   compute, 
 		   computeAbsTerm, 
 		   computeAbsTermIn, 
 		   beta
 		  ) where

-import Operations
+import GF.Data.Operations

-import Abstract
-import PrGrammar
-import LookAbs
-import PatternMatch
-import Compute
+import GF.Grammar.Abstract
+import GF.Grammar.PrGrammar
+import GF.Grammar.LookAbs
+import GF.Grammar.PatternMatch
+import GF.Grammar.Compute

-import Monad (liftM, liftM2)
+import Control.Monad (liftM, liftM2)

 compute :: GFCGrammar -> Exp -> Err Exp
 compute = computeAbsTerm
--- a/src/GF/Grammar/Abstract.hs
+++ b/src/GF/Grammar/Abstract.hs
@@ -5,32 +5,32 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/18 19:21:12 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.3 $
+-- > CVS $Date: 2005/04/21 16:22:18 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.4 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------

-module Abstract (
+module GF.Grammar.Abstract (

-module Grammar,
-module Values,
-module Macros,
-module Ident,
-module MMacros,
-module PrGrammar,
+module GF.Grammar.Grammar,
+module GF.Grammar.Values,
+module GF.Grammar.Macros,
+module GF.Infra.Ident,
+module GF.Grammar.MMacros,
+module GF.Grammar.PrGrammar,

 Grammar

 ) where

-import Grammar
-import Values
-import Macros
-import Ident
-import MMacros
-import PrGrammar
+import GF.Grammar.Grammar
+import GF.Grammar.Values
+import GF.Grammar.Macros
+import GF.Infra.Ident
+import GF.Grammar.MMacros
+import GF.Grammar.PrGrammar

 type Grammar = SourceGrammar ---

--- a/src/GF/Grammar/AppPredefined.hs
+++ b/src/GF/Grammar/AppPredefined.hs
@@ -5,21 +5,21 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/04/01 21:24:24 $ 
-- > CVS $Author: aarne $
-- > CVS $Revision: 1.10 $
+-- > CVS $Date: 2005/04/21 16:22:19 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.11 $
 --
 -- Predefined function type signatures and definitions.
 -----------------------------------------------------------------------------

-module AppPredefined (isInPredefined, typPredefined, appPredefined
+module GF.Grammar.AppPredefined (isInPredefined, typPredefined, appPredefined
 		     ) where

-import Operations
-import Grammar
-import Ident
-import Macros
-import PrGrammar (prt,prt_,prtBad)
+import GF.Data.Operations
+import GF.Grammar.Grammar
+import GF.Infra.Ident
+import GF.Grammar.Macros
+import GF.Grammar.PrGrammar (prt,prt_,prtBad)
 ---- import PGrammar (pTrm)

 -- predefined function type signatures and definitions. AR 12/3/2003.
--- a/src/GF/Grammar/Compute.hs
+++ b/src/GF/Grammar/Compute.hs
@@ -5,31 +5,31 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/04/01 21:24:24 $ 
-- > CVS $Author: aarne $
-- > CVS $Revision: 1.14 $
+-- > CVS $Date: 2005/04/21 16:22:19 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.15 $
 --
 -- Computation of source terms. Used in compilation and in @cc@ command.
 -----------------------------------------------------------------------------

-module Compute (computeConcrete, computeTerm) where
+module GF.Grammar.Compute (computeConcrete, computeTerm) where

-import Operations
-import Grammar
-import Ident
-import Str
-import PrGrammar
-import Modules
-import Macros
-import Lookup
-import Refresh
-import PatternMatch
-import Lockfield (isLockLabel) ----
+import GF.Data.Operations
+import GF.Grammar.Grammar
+import GF.Infra.Ident
+import GF.Data.Str
+import GF.Grammar.PrGrammar
+import GF.Infra.Modules
+import GF.Grammar.Macros
+import GF.Grammar.Lookup
+import GF.Grammar.Refresh
+import GF.Grammar.PatternMatch
+import GF.Grammar.Lockfield (isLockLabel) ----

-import AppPredefined
+import GF.Grammar.AppPredefined

-import List (nub,intersperse)
-import Monad (liftM2, liftM)
+import Data.List (nub,intersperse)
+import Control.Monad (liftM2, liftM)

 -- | computation of concrete syntax terms into normal form
 -- used mainly for partial evaluation
--- a/src/GF/Grammar/Grammar.hs
+++ b/src/GF/Grammar/Grammar.hs
@@ -5,16 +5,16 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/18 19:21:12 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.7 $
+-- > CVS $Date: 2005/04/21 16:22:20 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.8 $
 --
 -- GF source abstract syntax used internally in compilation.
 --
 -- AR 23\/1\/2000 -- 30\/5\/2001 -- 4\/5\/2003
 -----------------------------------------------------------------------------

-module Grammar (SourceGrammar,
+module GF.Grammar.Grammar (SourceGrammar,
 		SourceModInfo,
 		SourceModule,
 		SourceAbs,
@@ -50,12 +50,12 @@ module Grammar (SourceGrammar,
 		varLabel
 	       ) where

-import Str
-import Ident
-import Option ---
-import Modules
+import GF.Data.Str
+import GF.Infra.Ident
+import GF.Infra.Option ---
+import GF.Infra.Modules

-import Operations
+import GF.Data.Operations

 -- | grammar as presented to the compiler
 type SourceGrammar = MGrammar Ident Option Info
--- a/src/GF/Grammar/Lockfield.hs
+++ b/src/GF/Grammar/Lockfield.hs
@@ -5,23 +5,23 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/18 19:21:12 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:22:21 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- Creating and using lock fields in reused resource grammars.
 --
 -- AR 8\/2\/2005 detached from 'compile/MkResource'
 -----------------------------------------------------------------------------

-module Lockfield (lockRecType, unlockRecord, lockLabel, isLockLabel) where
+module GF.Grammar.Lockfield (lockRecType, unlockRecord, lockLabel, isLockLabel) where

-import Grammar
-import Ident
-import Macros
-import PrGrammar
+import GF.Grammar.Grammar
+import GF.Infra.Ident
+import GF.Grammar.Macros
+import GF.Grammar.PrGrammar

-import Operations
+import GF.Data.Operations

 lockRecType :: Ident -> Type -> Err Type
 lockRecType c t@(RecType rs) = 
@@ -43,4 +43,4 @@ lockLabel c = LIdent $ "lock_" ++ prt c ----
 isLockLabel :: Label -> Bool
 isLockLabel l = case l of
  LIdent c -> take 5 c == "lock_"
-  _ -> False
+  _ -> False
--- a/src/GF/Grammar/LookAbs.hs
+++ b/src/GF/Grammar/LookAbs.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/18 19:21:12 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.12 $
+-- > CVS $Date: 2005/04/21 16:22:22 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.13 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------

-module LookAbs (GFCGrammar,
+module GF.Grammar.LookAbs (GFCGrammar,
 		lookupAbsDef,
 		lookupFunType,
 		lookupCatContext,
@@ -31,15 +31,15 @@ module LookAbs (GFCGrammar,
 		lookupCatContextSrc
 	       ) where

-import Operations
-import qualified GFC as C
-import Abstract
-import Ident
+import GF.Data.Operations
+import qualified GF.Canon.GFC as C
+import GF.Grammar.Abstract
+import GF.Infra.Ident

-import Modules
+import GF.Infra.Modules

-import List (nub)
-import Monad
+import Data.List (nub)
+import Control.Monad

 type GFCGrammar = C.CanonGrammar

--- a/src/GF/Grammar/Lookup.hs
+++ b/src/GF/Grammar/Lookup.hs
@@ -5,16 +5,16 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/18 19:21:12 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.12 $
+-- > CVS $Date: 2005/04/21 16:22:23 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.13 $
 --
 -- Lookup in source (concrete and resource) when compiling.
 --
 -- lookup in resource and concrete in compiling; for abstract, use 'Look'
 -----------------------------------------------------------------------------

-module Lookup (lookupResDef, 
+module GF.Grammar.Lookup (lookupResDef,
 	       lookupResType, 
 	       lookupParams, 
 	       lookupParamValues, 
@@ -25,13 +25,13 @@ module Lookup (lookupResDef,
 	       opersForType
 	      ) where

-import Operations
-import Abstract
-import Modules
-import Lockfield
+import GF.Data.Operations
+import GF.Grammar.Abstract
+import GF.Infra.Modules
+import GF.Grammar.Lockfield

-import List (nub)
-import Monad
+import Data.List (nub)
+import Control.Monad

 lookupResDef :: SourceGrammar -> Ident -> Ident -> Err Term
 lookupResDef gr = look True where 
--- a/src/GF/Grammar/MMacros.hs
+++ b/src/GF/Grammar/MMacros.hs
@@ -5,27 +5,27 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/24 11:46:34 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.7 $
+-- > CVS $Date: 2005/04/21 16:22:24 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.8 $
 --
 -- some more abstractions on grammars, esp. for Edit
 -----------------------------------------------------------------------------

-module MMacros where
+module GF.Grammar.MMacros where

-import Operations
-import Zipper
+import GF.Data.Operations
+import GF.Data.Zipper

-import Grammar
-import PrGrammar
-import Ident
-import Refresh
-import Values
+import GF.Grammar.Grammar
+import GF.Grammar.PrGrammar
+import GF.Infra.Ident
+import GF.Grammar.Refresh
+import GF.Grammar.Values
 ----import GrammarST
-import Macros
+import GF.Grammar.Macros

-import Monad
+import Control.Monad

 nodeTree :: Tree -> TrNode
 argsTree :: Tree -> [Tree]
--- a/src/GF/Grammar/Macros.hs
+++ b/src/GF/Grammar/Macros.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/24 11:46:34 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.18 $
+-- > CVS $Date: 2005/04/21 16:22:25 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.19 $
 --
 -- Macros for constructing and analysing source code terms.
 --
@@ -16,16 +16,16 @@
 -- AR 7\/12\/1999 - 9\/5\/2000 -- 4\/6\/2001
 -----------------------------------------------------------------------------

-module Macros where
+module GF.Grammar.Macros where

-import Operations
-import Str
-import Grammar
-import Ident
-import PrGrammar
+import GF.Data.Operations
+import GF.Data.Str
+import GF.Grammar.Grammar
+import GF.Infra.Ident
+import GF.Grammar.PrGrammar

-import Monad (liftM)
-import Char (isDigit)
+import Control.Monad (liftM)
+import Data.Char (isDigit)

 firstTypeForm :: Type -> Err (Context, Type)
 firstTypeForm t = case t of
--- a/src/GF/Grammar/PatternMatch.hs
+++ b/src/GF/Grammar/PatternMatch.hs
@@ -5,26 +5,26 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/18 19:21:13 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:22:26 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- pattern matching for both concrete and abstract syntax. AR -- 16\/6\/2003
 -----------------------------------------------------------------------------

-module PatternMatch (matchPattern, 
+module GF.Grammar.PatternMatch (matchPattern,
 		     testOvershadow, 
 		     findMatch
 		    ) where

-import Operations
-import Grammar
-import Ident
-import Macros
-import PrGrammar
+import GF.Data.Operations
+import GF.Grammar.Grammar
+import GF.Infra.Ident
+import GF.Grammar.Macros
+import GF.Grammar.PrGrammar

-import List
-import Monad
+import Data.List
+import Control.Monad


 matchPattern :: [(Patt,Term)] -> Term -> Err (Term, Substitution)
--- a/src/GF/Grammar/PrGrammar.hs
+++ b/src/GF/Grammar/PrGrammar.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/04/20 20:09:19 $ 
-- > CVS $Author: aarne $
-- > CVS $Revision: 1.12 $
+-- > CVS $Date: 2005/04/21 16:22:27 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.13 $
 --
 -- AR 7\/12\/1999 - 1\/4\/2000 - 10\/5\/2003
 --
@@ -19,7 +19,7 @@
 -- only the former is ever needed.
 -----------------------------------------------------------------------------

-module PrGrammar (Print(..),
+module GF.Grammar.PrGrammar (Print(..),
 		  prtBad,
 		  prGrammar, prModule,
 		  prContext, prParam,
@@ -32,22 +32,22 @@ module PrGrammar (Print(..),
 		  prExp, prPatt, prOperSignature
 		 ) where

-import Operations
-import Zipper
-import Grammar
-import Modules
-import qualified PrintGF as P
-import qualified PrintGFC as C
-import qualified AbsGFC as A
-import Values
-import GrammarToSource
+import GF.Data.Operations
+import GF.Data.Zipper
+import GF.Grammar.Grammar
+import GF.Infra.Modules
+import qualified GF.Source.PrintGF as P
+import qualified GF.Canon.PrintGFC as C
+import qualified GF.Canon.AbsGFC as A
+import GF.Grammar.Values
+import GF.Source.GrammarToSource
 --- import GFC (CanonGrammar) --- cycle of modules

-import Option
-import Ident
-import Str
+import GF.Infra.Option
+import GF.Infra.Ident
+import GF.Data.Str

-import List (intersperse)
+import Data.List (intersperse)

 class Print a where
  prt  :: a -> String
--- a/src/GF/Grammar/Refresh.hs
+++ b/src/GF/Grammar/Refresh.hs
@@ -5,23 +5,23 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/18 19:21:13 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:22:27 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------

-module Refresh (refreshTerm, refreshTermN,
+module GF.Grammar.Refresh (refreshTerm, refreshTermN,
 		refreshModule
 	       ) where

-import Operations
-import Grammar
-import Ident
-import Modules
-import Macros
-import Monad
+import GF.Data.Operations
+import GF.Grammar.Grammar
+import GF.Infra.Ident
+import GF.Infra.Modules
+import GF.Grammar.Macros
+import Control.Monad

 refreshTerm :: Term -> Err Term
 refreshTerm = refreshTermN 0
--- a/src/GF/Grammar/ReservedWords.hs
+++ b/src/GF/Grammar/ReservedWords.hs
@@ -5,18 +5,18 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/18 19:21:13 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:22:28 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- reserved words of GF. (c) Aarne Ranta 19\/3\/2002 under Gnu GPL.
 -- modified by Markus Forsberg 9\/4. 
 -- modified by AR 12\/6\/2003 for GF2 and GFC
 -----------------------------------------------------------------------------

-module ReservedWords (isResWord, isResWordGFC) where
+module GF.Grammar.ReservedWords (isResWord, isResWordGFC) where

-import List
+import Data.List


 isResWord :: String -> Bool
--- a/src/GF/Grammar/TC.hs
+++ b/src/GF/Grammar/TC.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/03/17 09:58:18 $ 
-- > CVS $Author: aarne $
-- > CVS $Revision: 1.8 $
+-- > CVS $Date: 2005/04/21 16:22:29 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.9 $
 --
 -- Thierry Coquand's type checking algorithm that creates a trace
 -----------------------------------------------------------------------------

-module TC (AExp(..),
+module GF.Grammar.TC (AExp(..),
 	   Theory,
 	   checkExp,
 	   inferExp,
@@ -20,11 +20,11 @@ module TC (AExp(..),
 	   whnf
 	  ) where

-import Operations
-import Abstract
-import AbsCompute
+import GF.Data.Operations
+import GF.Grammar.Abstract
+import GF.Grammar.AbsCompute

-import Monad
+import Control.Monad

 data AExp =
     AVr   Ident Val 
--- a/src/GF/Grammar/TypeCheck.hs
+++ b/src/GF/Grammar/TypeCheck.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/18 19:21:13 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.13 $
+-- > CVS $Date: 2005/04/21 16:22:30 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.14 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------

-module TypeCheck (-- * top-level type checking functions; TC should not be called directly.
+module GF.Grammar.TypeCheck (-- * top-level type checking functions; TC should not be called directly.
 		  annotate, annotateIn,
 		  justTypeCheck, checkIfValidExp,
 		  reduceConstraints, 
@@ -33,21 +33,21 @@ module TypeCheck (-- * top-level type checking functions; TC should not be calle
 		  tree2termlistCommand
 		 ) where

-import Operations
-import Zipper
+import GF.Data.Operations
+import GF.Data.Zipper

-import Abstract
-import AbsCompute
-import Refresh
-import LookAbs
-import qualified Lookup ---
+import GF.Grammar.Abstract
+import GF.Grammar.AbsCompute
+import GF.Grammar.Refresh
+import GF.Grammar.LookAbs
+import qualified GF.Grammar.Lookup as Lookup ---

-import TC
+import GF.Grammar.TC

-import Unify ---
+import GF.Grammar.Unify ---

-import Monad (foldM, liftM, liftM2)
-import List (nub) ---
+import Control.Monad (foldM, liftM, liftM2)
+import Data.List (nub) ---

 -- top-level type checking functions; TC should not be called directly.

--- a/src/GF/Grammar/Unify.hs
+++ b/src/GF/Grammar/Unify.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/18 19:21:13 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.3 $
+-- > CVS $Date: 2005/04/21 16:22:31 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.4 $
 --
 -- (c) Petri Mäenpää & Aarne Ranta, 1998--2001
 --
@@ -15,13 +15,13 @@
 -- the only use is in 'TypeCheck.splitConstraints'
 -----------------------------------------------------------------------------

-module Unify (unifyVal) where
+module GF.Grammar.Unify (unifyVal) where

-import Abstract
+import GF.Grammar.Abstract

-import Operations
+import GF.Data.Operations

-import List (partition)
+import Data.List (partition)

 unifyVal :: Constraints -> Err (Constraints,MetaSubst)
 unifyVal cs0 = do
--- a/src/GF/Grammar/Values.hs
+++ b/src/GF/Grammar/Values.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
-- > CVS $Date: 2005/02/18 19:21:13 $ 
-- > CVS $Author: peb $
-- > CVS $Revision: 1.6 $
+-- > CVS $Date: 2005/04/21 16:22:32 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.7 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------

-module Values (-- * values used in TC type checking
+module GF.Grammar.Values (-- * values used in TC type checking
 	       Exp, Val(..), Env,
 	       -- * annotated tree used in editing
 	       Tree, TrNode(..), Atom(..), Binds, Constraints, MetaSubst,
@@ -23,11 +23,11 @@ module Values (-- * values used in TC type checking
 	       eType, tree2exp, loc2treeFocus
 	      ) where

-import Operations
-import Zipper
+import GF.Data.Operations
+import GF.Data.Zipper

-import Grammar
-import Ident
+import GF.Grammar.Grammar
+import GF.Infra.Ident

 -- values used in TC type checking