From 5c9917ff8d18ddaefd5a8bf4b223009747477fd8 Mon Sep 17 00:00:00 2001 From: bringert Date: Thu, 21 Apr 2005 15:21:02 +0000 Subject: Fixed module names and imports after giant file move. --- src/GF/API/BatchTranslate.hs | 12 ++++++------ src/GF/API/GrammarToHaskell.hs | 16 ++++++++-------- src/GF/API/IOGrammar.hs | 32 ++++++++++++++++---------------- src/GF/API/MyParser.hs | 16 ++++++++-------- 4 files changed, 38 insertions(+), 38 deletions(-) (limited to 'src/GF/API') diff --git a/src/GF/API/BatchTranslate.hs b/src/GF/API/BatchTranslate.hs index 60a098d2b..c1b124526 100644 --- a/src/GF/API/BatchTranslate.hs +++ b/src/GF/API/BatchTranslate.hs @@ -5,16 +5,16 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/02/18 19:21:06 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.5 $ +-- > CVS $Date: 2005/04/21 16:21:05 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.6 $ -- -- translate OCL, etc, files in batch mode ----------------------------------------------------------------------------- -module BatchTranslate (translate) where +module GF.API.BatchTranslate (translate) where -import API +import GF.API import GetMyTree (file2tree) translate :: FilePath -> FilePath -> IO () @@ -40,4 +40,4 @@ It seems we should add open ParadigmsX, ResourceExtX, PredicationX --} \ No newline at end of file +-} diff --git a/src/GF/API/GrammarToHaskell.hs b/src/GF/API/GrammarToHaskell.hs index 5be778662..602df64a1 100644 --- a/src/GF/API/GrammarToHaskell.hs +++ b/src/GF/API/GrammarToHaskell.hs @@ -5,22 +5,22 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/02/18 19:21:06 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.5 $ +-- > CVS $Date: 2005/04/21 16:21:06 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.6 $ -- -- to write a GF abstract grammar into a Haskell module with translations from -- data objects into GF trees. Example: GSyntax for Agda. -- AR 11/11/1999 -- 7/12/2000 -- 18/5/2004 ----------------------------------------------------------------------------- -module GrammarToHaskell (grammar2haskell) where +module GF.API.GrammarToHaskell (grammar2haskell) where -import qualified GFC -import Macros +import qualified GF.Canon.GFC as GFC +import GF.Grammar.Macros -import Modules -import Operations +import GF.Infra.Modules +import GF.Data.Operations -- | the main function grammar2haskell :: GFC.CanonGrammar -> String diff --git a/src/GF/API/IOGrammar.hs b/src/GF/API/IOGrammar.hs index 8a521cc67..c3f9e603b 100644 --- a/src/GF/API/IOGrammar.hs +++ b/src/GF/API/IOGrammar.hs @@ -5,31 +5,31 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/03/14 17:40:10 $ --- > CVS $Author: aarne $ --- > CVS $Revision: 1.16 $ +-- > CVS $Date: 2005/04/21 16:21:06 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.17 $ -- -- for reading grammars and terms from strings and files ----------------------------------------------------------------------------- -module IOGrammar (shellStateFromFiles, +module GF.API.IOGrammar (shellStateFromFiles, getShellStateFromFiles) where -import Abstract -import qualified GFC -import PGrammar -import TypeCheck -import Compile -import ShellState +import GF.Grammar.Abstract +import qualified GF.Canon.GFC as GFC +import GF.Compile.PGrammar +import GF.Grammar.TypeCheck +import GF.Compile.Compile +import GF.Compile.ShellState -import Modules -import ReadFiles (isOldFile) -import Option -import Operations -import UseIO +import GF.Infra.Modules +import GF.Infra.ReadFiles (isOldFile) +import GF.Infra.Option +import GF.Data.Operations +import GF.Infra.UseIO import Arch -import Monad (liftM) +import Control.Monad (liftM) -- | a heuristic way of renaming constants is used string2absTerm :: String -> String -> Term diff --git a/src/GF/API/MyParser.hs b/src/GF/API/MyParser.hs index 447f5eb5f..c926fe865 100644 --- a/src/GF/API/MyParser.hs +++ b/src/GF/API/MyParser.hs @@ -5,19 +5,19 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/02/18 19:21:06 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.5 $ +-- > CVS $Date: 2005/04/21 16:21:07 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.6 $ -- -- template to define your own parser (obsolete?) ----------------------------------------------------------------------------- -module MyParser (myParser) where +module GF.API.MyParser (myParser) where -import ShellState -import CFIdent -import CF -import Operations +import GF.Compile.ShellState +import GF.CF.CFIdent +import GF.CF.CF +import GF.Data.Operations -- type CFParser = [CFTok] -> ([(CFTree,[CFTok])],String) -- cgit v1.2.3