Fixed module names and imports after giant file move.

This commit is contained in:
bringert
2005-04-21 15:21:02 +00:00
parent 8e44d9a8c1
commit 93af0c8535
209 changed files with 2038 additions and 2036 deletions

View File

@@ -5,32 +5,32 @@
-- Stability : (stable)
-- Portability : (portable)
--
-- > CVS $Date: 2005/03/10 11:14:11 $
-- > CVS $Author: aarne $
-- > CVS $Revision: 1.15 $
-- > CVS $Date: 2005/04/21 16:23:19 $
-- > CVS $Author: bringert $
-- > CVS $Revision: 1.16 $
--
-- (Description of the module)
-----------------------------------------------------------------------------
module CommandL where
module GF.Shell.CommandL where
import Operations
import UseIO
import GF.Data.Operations
import GF.Infra.UseIO
import CMacros
import Values (Tree)
import GF.Canon.CMacros
import GF.Grammar.Values (Tree)
import GetTree
import ShellState
import Option
import Session
import Commands
import GF.UseGrammar.GetTree
import GF.Compile.ShellState
import GF.Infra.Option
import GF.UseGrammar.Session
import GF.Shell.Commands
import Char
import List (intersperse)
import Monad (foldM)
import Data.Char
import Data.List (intersperse)
import Control.Monad (foldM)
import UTF8
import GF.Text.UTF8
-- | a line-based shell
initEditLoop :: CEnv -> IO () -> IO ()

View File

@@ -5,9 +5,9 @@
-- Stability : (stable)
-- Portability : (portable)
--
-- > CVS $Date: 2005/03/10 11:14:11 $
-- > CVS $Author: aarne $
-- > CVS $Revision: 1.36 $
-- > CVS $Date: 2005/04/21 16:23:19 $
-- > CVS $Author: bringert $
-- > CVS $Revision: 1.37 $
--
-- temporary hacks for GF 2.0
--
@@ -16,49 +16,49 @@
-- See "CommandsL" for a parser of a command language.
-----------------------------------------------------------------------------
module Commands where
module GF.Shell.Commands where
import Operations
import Zipper
import GF.Data.Operations
import GF.Data.Zipper
import qualified Grammar as G ---- Cat, Fun, Q, QC
import GFC
import CMacros
import Macros (qq)----
import LookAbs
import Look
import Values (loc2treeFocus,tree2exp)----
import qualified GF.Grammar.Grammar as G ---- Cat, Fun, Q, QC
import GF.Canon.GFC
import GF.Canon.CMacros
import GF.Grammar.Macros (qq)----
import GF.Grammar.LookAbs
import GF.Canon.Look
import GF.Grammar.Values (loc2treeFocus,tree2exp)----
import GetTree
import API
import ShellState
import GF.UseGrammar.GetTree
import GF.API
import GF.Compile.ShellState
import qualified Shell
import qualified PShell
import qualified Macros as M
import PrGrammar
import PGrammar
import IOGrammar
import UseIO
import Unicode
import qualified GF.Shell as Shell
import qualified GF.Shell.PShell as PShell
import qualified GF.Grammar.Macros as M
import GF.Grammar.PrGrammar
import GF.Compile.PGrammar
import GF.API.IOGrammar
import GF.Infra.UseIO
import GF.Text.Unicode
import CF
import CFIdent (cat2CFCat, cfCat2Cat)
import PPrCF (prCFCat)
import Linear
import Randomized
import Editing
import Session
import Custom
import GF.CF.CF
import GF.CF.CFIdent (cat2CFCat, cfCat2Cat)
import GF.CF.PPrCF (prCFCat)
import GF.UseGrammar.Linear
import GF.UseGrammar.Randomized
import GF.UseGrammar.Editing
import GF.UseGrammar.Session
import GF.UseGrammar.Custom
import qualified Ident as I
import Option
import Str (sstr) ----
import UTF8 ----
import qualified GF.Infra.Ident as I
import GF.Infra.Option
import GF.Data.Str (sstr) ----
import GF.Text.UTF8 ----
import Random (StdGen, mkStdGen, newStdGen)
import Monad (liftM2, foldM)
import List (intersperse)
import System.Random (StdGen, mkStdGen, newStdGen)
import Control.Monad (liftM2, foldM)
import Data.List (intersperse)
--- temporary hacks for GF 2.0

View File

@@ -5,9 +5,9 @@
-- Stability : (stable)
-- Portability : (portable)
--
-- > CVS $Date: 2005/04/21 11:40:59 $
-- > CVS $Date: 2005/04/21 16:23:20 $
-- > CVS $Author: bringert $
-- > CVS $Revision: 1.1 $
-- > CVS $Revision: 1.2 $
--
-- Help on shell commands. Generated from HelpFile by 'make help'.
-- PLEASE DON'T EDIT THIS FILE.
@@ -16,7 +16,7 @@
module GF.Shell.HelpFile where
import Operations
import GF.Data.Operations
txtHelpFileSummary =
unlines $ map (concat . take 1 . lines) $ paragraphs txtHelpFile
@@ -516,4 +516,4 @@ txtHelpFile =
"\n -unlexer=bind like identity, but bind at \"&+\"" ++
"\n" ++
"\n-- *: Commands and options marked with * are not yet implemented." ++
[]
[]

View File

@@ -5,28 +5,28 @@
-- Stability : (stable)
-- Portability : (portable)
--
-- > CVS $Date: 2005/03/10 11:14:11 $
-- > CVS $Author: aarne $
-- > CVS $Revision: 1.11 $
-- > CVS $Date: 2005/04/21 16:23:21 $
-- > CVS $Author: bringert $
-- > CVS $Revision: 1.12 $
--
-- GF editing session controlled by e.g. a Java program. AR 16\/11\/2001
-----------------------------------------------------------------------------
module JGF where
module GF.Shell.JGF where
import Operations
import UseIO
import Unicode
import GF.Data.Operations
import GF.Infra.UseIO
import GF.Text.Unicode
import IOGrammar
import Option
import ShellState
import Session
import Commands
import CommandL
import GF.API.IOGrammar
import GF.Infra.Option
import GF.Compile.ShellState
import GF.UseGrammar.Session
import GF.Shell.Commands
import GF.Shell.CommandL
import System
import UTF8
import GF.Text.UTF8
-- GF editing session controlled by e.g. a Java program. AR 16/11/2001

View File

@@ -5,27 +5,27 @@
-- Stability : (stable)
-- Portability : (portable)
--
-- > CVS $Date: 2005/02/24 11:46:37 $
-- > CVS $Author: peb $
-- > CVS $Revision: 1.18 $
-- > CVS $Date: 2005/04/21 16:23:22 $
-- > CVS $Author: bringert $
-- > CVS $Revision: 1.19 $
--
-- parsing GF shell commands. AR 11\/11\/2001
-----------------------------------------------------------------------------
module PShell where
module GF.Shell.PShell where
import Operations
import UseIO
import ShellState
import ShellCommands
import Shell
import Option
import PGrammar (pzIdent, pTrm) --- (string2formsAndTerm)
import API
import GF.Data.Operations
import GF.Infra.UseIO
import GF.Compile.ShellState
import GF.Shell.ShellCommands
import GF.Shell
import GF.Infra.Option
import GF.Compile.PGrammar (pzIdent, pTrm) --- (string2formsAndTerm)
import GF.API
import Arch(fetchCommand)
import Char (isDigit)
import IO
import Data.Char (isDigit)
import System.IO.Error
-- parsing GF shell commands. AR 11/11/2001
@@ -37,7 +37,7 @@ getCommandLines = do
getCommandLinesBatch :: IO (String,[CommandLine])
getCommandLinesBatch = do
s <- catch getLine (\e -> if IO.isEOFError e then return "q" else ioError e)
s <- catch getLine (\e -> if isEOFError e then return "q" else ioError e)
return $ (s,pCommandLines s)
pCommandLines :: String -> [CommandLine]

View File

@@ -5,26 +5,26 @@
-- Stability : (stable)
-- Portability : (portable)
--
-- > CVS $Date: 2005/04/16 05:40:50 $
-- > CVS $Author: peb $
-- > CVS $Revision: 1.29 $
-- > CVS $Date: 2005/04/21 16:23:22 $
-- > CVS $Author: bringert $
-- > CVS $Revision: 1.30 $
--
-- The datatype of shell commands and the list of their options.
-----------------------------------------------------------------------------
module ShellCommands where
module GF.Shell.ShellCommands where
import qualified Ident as I
import ShellState
import Custom
import PrGrammar
import qualified GF.Infra.Ident as I
import GF.Compile.ShellState
import GF.UseGrammar.Custom
import GF.Grammar.PrGrammar
import Option
import Operations
import Modules
import GF.Infra.Option
import GF.Data.Operations
import GF.Infra.Modules
import Char (isDigit)
import Monad (mplus)
import Data.Char (isDigit)
import Control.Monad (mplus)
-- shell commands and their options
-- moved to separate module and added option check: AR 27/5/2004

View File

@@ -5,25 +5,25 @@
-- Stability : (stable)
-- Portability : (portable)
--
-- > CVS $Date: 2005/02/24 11:46:37 $
-- > CVS $Author: peb $
-- > CVS $Revision: 1.7 $
-- > CVS $Date: 2005/04/21 16:23:23 $
-- > CVS $Author: bringert $
-- > CVS $Revision: 1.8 $
--
-- (Description of the module)
-----------------------------------------------------------------------------
module SubShell where
module GF.Shell.SubShell where
import Operations
import UseIO
import ShellState
import Option
import API
import GF.Data.Operations
import GF.Infra.UseIO
import GF.Compile.ShellState
import GF.Infra.Option
import GF.API
import CommandL
import GF.Shell.CommandL
import ArchEdit
import List
import Data.List
-- AR 20/4/2000 -- 12/11/2001

View File

@@ -5,26 +5,26 @@
-- Stability : (stable)
-- Portability : (portable)
--
-- > CVS $Date: 2005/02/24 11:46:37 $
-- > CVS $Author: peb $
-- > CVS $Revision: 1.5 $
-- > CVS $Date: 2005/04/21 16:23:24 $
-- > CVS $Author: bringert $
-- > CVS $Revision: 1.6 $
--
-- translation and morphology quiz. AR 10\/5\/2000 -- 12\/4\/2002
-----------------------------------------------------------------------------
module TeachYourself where
module GF.Shell.TeachYourself where
import ShellState
import API
import Linear
import PrGrammar
import GF.Compile.ShellState
import GF.API
import GF.UseGrammar.Linear
import GF.Grammar.PrGrammar
import Option
import GF.Infra.Option
import Arch (myStdGen)
import Operations
import UseIO
import GF.Data.Operations
import GF.Infra.UseIO
import Random --- (randoms) --- bad import for hbc
import System.Random --- (randoms) --- bad import for hbc
import System
-- translation and morphology quiz. AR 10/5/2000 -- 12/4/2002