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/CF/CF.hs | 22 +++++++++++----------- src/GF/CF/CFIdent.hs | 26 +++++++++++++------------- src/GF/CF/CFtoGrammar.hs | 30 +++++++++++++++--------------- src/GF/CF/CFtoSRG.hs | 18 +++++++++--------- src/GF/CF/CanonToCF.hs | 40 ++++++++++++++++++++-------------------- src/GF/CF/ChartParser.hs | 22 +++++++++++----------- src/GF/CF/EBNF.hs | 28 ++++++++++++++-------------- src/GF/CF/PPrCF.hs | 20 ++++++++++---------- src/GF/CF/PrLBNF.hs | 32 ++++++++++++++++---------------- src/GF/CF/Profile.hs | 30 +++++++++++++++--------------- 10 files changed, 134 insertions(+), 134 deletions(-) (limited to 'src/GF/CF') diff --git a/src/GF/CF/CF.hs b/src/GF/CF/CF.hs index 5c126ef35..9233e905a 100644 --- a/src/GF/CF/CF.hs +++ b/src/GF/CF/CF.hs @@ -5,14 +5,14 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/02/18 19:21:07 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.5 $ +-- > CVS $Date: 2005/04/21 16:21:07 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.6 $ -- -- context-free grammars. AR 15\/12\/1999 -- 30\/3\/2000 -- 2\/6\/2001 -- 3\/12\/2001 ----------------------------------------------------------------------------- -module CF (-- * Types +module GF.CF.CF (-- * Types CF(..), CFRule, CFRuleGroup, CFItem(..), CFTree(..), CFPredef, CFParser, RegExp(..), CFWord, @@ -34,13 +34,13 @@ module CF (-- * Types isCircularCF, predefRules ) where -import Operations -import Str -import AbsGFC -import GFC -import CFIdent -import List (nub,nubBy) -import Char (isUpper, isLower, toUpper, toLower) +import GF.Data.Operations +import GF.Data.Str +import GF.Canon.AbsGFC +import GF.Canon.GFC +import GF.CF.CFIdent +import Data.List (nub,nubBy) +import Data.Char (isUpper, isLower, toUpper, toLower) -- CF grammar data types diff --git a/src/GF/CF/CFIdent.hs b/src/GF/CF/CFIdent.hs index 1d9fcd24a..30b9f857d 100644 --- a/src/GF/CF/CFIdent.hs +++ b/src/GF/CF/CFIdent.hs @@ -5,14 +5,14 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/20 12:49:45 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.11 $ +-- > CVS $Date: 2005/04/21 16:21:08 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.12 $ -- -- symbols (categories, functions) for context-free grammars. ----------------------------------------------------------------------------- -module CFIdent (-- * Tokens and categories +module GF.CF.CFIdent (-- * Tokens and categories CFTok(..), CFCat(..), tS, tC, tL, tI, tV, tM, tInt, prCFTok, @@ -31,15 +31,15 @@ module CFIdent (-- * Tokens and categories compatToks, compatTok, compatCFFun, compatCF ) where -import Operations -import GFC -import Ident -import Values (cPredefAbs) -import AbsGFC -import Macros (ident2label) -import PrGrammar -import Str -import Char (toLower, toUpper) +import GF.Data.Operations +import GF.Canon.GFC +import GF.Infra.Ident +import GF.Grammar.Values (cPredefAbs) +import GF.Canon.AbsGFC +import GF.Grammar.Macros (ident2label) +import GF.Grammar.PrGrammar +import GF.Data.Str +import Data.Char (toLower, toUpper) -- | this type should be abstract data CFTok = diff --git a/src/GF/CF/CFtoGrammar.hs b/src/GF/CF/CFtoGrammar.hs index 4670a6b80..5e73aec31 100644 --- a/src/GF/CF/CFtoGrammar.hs +++ b/src/GF/CF/CFtoGrammar.hs @@ -5,29 +5,29 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/17 19:48:34 $ --- > CVS $Author: aarne $ --- > CVS $Revision: 1.6 $ +-- > CVS $Date: 2005/04/21 16:21:09 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.7 $ -- -- 26\/1\/2000 -- 18\/4 -- 24\/3\/2004 ----------------------------------------------------------------------------- -module CFtoGrammar (cf2grammar) where +module GF.CF.CFtoGrammar (cf2grammar) where -import Ident -import Grammar -import qualified AbsGF as A -import qualified GrammarToSource as S -import Macros +import GF.Infra.Ident +import GF.Grammar.Grammar +import qualified GF.Source.AbsGF as A +import qualified GF.Source.GrammarToSource as S +import GF.Grammar.Macros -import CF -import CFIdent -import PPrCF +import GF.CF.CF +import GF.CF.CFIdent +import GF.CF.PPrCF -import Operations +import GF.Data.Operations -import List (nub) -import Char (isSpace) +import Data.List (nub) +import Data.Char (isSpace) cf2grammar :: CF -> [A.TopDef] cf2grammar cf = concatMap S.trAnyDef (abs ++ conc) where diff --git a/src/GF/CF/CFtoSRG.hs b/src/GF/CF/CFtoSRG.hs index 9fe35b3ab..290452ed1 100644 --- a/src/GF/CF/CFtoSRG.hs +++ b/src/GF/CF/CFtoSRG.hs @@ -5,23 +5,23 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/02/18 19:21:07 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.5 $ +-- > CVS $Date: 2005/04/21 16:21:10 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.6 $ -- -- This module prints a CF as a SRG (Speech Recognition Grammar). -- Created : 21 January, 2001. -- Modified : 16 April, 2004 by Aarne Ranta for GF 2. ----------------------------------------------------------------------------- -module CFtoSRG (prSRG) where +module GF.CF.CFtoSRG (prSRG) where -import Operations -import CF -import CFIdent +import GF.Data.Operations +import GF.CF.CF +import GF.CF.CFIdent ---import UseGrammar -import PPrCF -import List (intersperse,nub) +import GF.CF.PPrCF +import Data.List (intersperse,nub) header :: String header = unlines ["#ABNF 1.0 ISO-8859-1;\n", diff --git a/src/GF/CF/CanonToCF.hs b/src/GF/CF/CanonToCF.hs index 1c88e39b3..6c00da042 100644 --- a/src/GF/CF/CanonToCF.hs +++ b/src/GF/CF/CanonToCF.hs @@ -5,33 +5,33 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/03/29 11:17:56 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.12 $ +-- > CVS $Date: 2005/04/21 16:21:11 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.13 $ -- -- AR 27\/1\/2000 -- 3\/12\/2001 -- 8\/6\/2003 ----------------------------------------------------------------------------- -module CanonToCF (canon2cf) where +module GF.CF.CanonToCF (canon2cf) where import GF.System.Tracing -- peb 8/6-04 -import Operations -import Option -import Ident -import AbsGFC -import LookAbs (allBindCatsOf) -import GFC -import Values (isPredefCat,cPredefAbs) -import PrGrammar -import CMacros -import qualified Modules as M -import CF -import CFIdent -import Morphology -import Trie2 -import List (nub,partition) -import Monad +import GF.Data.Operations +import GF.Infra.Option +import GF.Infra.Ident +import GF.Canon.AbsGFC +import GF.Grammar.LookAbs (allBindCatsOf) +import GF.Canon.GFC +import GF.Grammar.Values (isPredefCat,cPredefAbs) +import GF.Grammar.PrGrammar +import GF.Canon.CMacros +import qualified GF.Infra.Modules as M +import GF.CF.CF +import GF.CF.CFIdent +import GF.UseGrammar.Morphology +import GF.Data.Trie2 +import Data.List (nub,partition) +import Control.Monad -- | The main function: for a given cnc module 'm', build the CF grammar with all the -- rules coming from modules that 'm' extends. The categories are qualified by diff --git a/src/GF/CF/ChartParser.hs b/src/GF/CF/ChartParser.hs index fb7f91ec0..740c4d787 100644 --- a/src/GF/CF/ChartParser.hs +++ b/src/GF/CF/ChartParser.hs @@ -5,29 +5,29 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/16 05:40:50 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.9 $ +-- > CVS $Date: 2005/04/21 16:21:12 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.10 $ -- -- Bottom-up Kilbury chart parser from "Pure Functional Parsing", chapter 5. -- OBSOLETE -- should use new MCFG parsers instead ----------------------------------------------------------------------------- -module ChartParser (chartParser) where +module GF.CF.ChartParser (chartParser) where -- import Tracing -- import PrintParser -- import PrintSimplifiedTerm -import Operations -import CF -import CFIdent -import PPrCF (prCFItem) +import GF.Data.Operations +import GF.CF.CF +import GF.CF.CFIdent +import GF.CF.PPrCF (prCFItem) -import OrdSet -import OrdMap2 +import GF.Data.OrdSet +import GF.Data.OrdMap2 -import List (groupBy) +import Data.List (groupBy) type Token = CFTok type Name = CFFun diff --git a/src/GF/CF/EBNF.hs b/src/GF/CF/EBNF.hs index 773a2117d..f091d19cb 100644 --- a/src/GF/CF/EBNF.hs +++ b/src/GF/CF/EBNF.hs @@ -5,26 +5,26 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/02/18 19:21:07 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.4 $ +-- > CVS $Date: 2005/04/21 16:21:13 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.5 $ -- -- (Description of the module) ----------------------------------------------------------------------------- -module EBNF (pEBNFasGrammar) where +module GF.CF.EBNF (pEBNFasGrammar) where -import Operations -import Parsers -import Comments -import CF -import CFIdent -import Grammar -import PrGrammar -import CFtoGrammar -import qualified AbsGF as A +import GF.Data.Operations +import GF.Data.Parsers +import GF.Infra.Comments +import GF.CF.CF +import GF.CF.CFIdent +import GF.Grammar.Grammar +import GF.Grammar.PrGrammar +import GF.CF.CFtoGrammar +import qualified GF.Source.AbsGF as A -import List (nub, partition) +import Data.List (nub, partition) -- AR 18/4/2000 - 31/3/2004 diff --git a/src/GF/CF/PPrCF.hs b/src/GF/CF/PPrCF.hs index fcfeeb61b..32c077c45 100644 --- a/src/GF/CF/PPrCF.hs +++ b/src/GF/CF/PPrCF.hs @@ -5,24 +5,24 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/17 19:48:34 $ --- > CVS $Author: aarne $ --- > CVS $Revision: 1.10 $ +-- > CVS $Date: 2005/04/21 16:21:13 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.11 $ -- -- printing and parsing CF grammars, rules, and trees AR 26/1/2000 -- 9/6/2003 -- -- use the Print class instead! ----------------------------------------------------------------------------- -module PPrCF (prCF, prCFTree, prCFRule, prCFFun, prCFCat, prCFItem, prRegExp, pCF) where +module GF.CF.PPrCF (prCF, prCFTree, prCFRule, prCFFun, prCFCat, prCFItem, prRegExp, pCF) where -import Operations -import CF -import CFIdent -import AbsGFC -import PrGrammar +import GF.Data.Operations +import GF.CF.CF +import GF.CF.CFIdent +import GF.Canon.AbsGFC +import GF.Grammar.PrGrammar -import Char +import Data.Char prCF :: CF -> String prCF = unlines . (map prCFRule) . rulesOfCF -- hiding the literal recogn function diff --git a/src/GF/CF/PrLBNF.hs b/src/GF/CF/PrLBNF.hs index 2079c4607..2b655a820 100644 --- a/src/GF/CF/PrLBNF.hs +++ b/src/GF/CF/PrLBNF.hs @@ -5,31 +5,31 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/03/12 13:01:48 $ --- > CVS $Author: aarne $ --- > CVS $Revision: 1.9 $ +-- > CVS $Date: 2005/04/21 16:21:14 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.10 $ -- -- Printing CF grammars generated from GF as LBNF grammar for BNFC. -- AR 26/1/2000 -- 9/6/2003 (PPrCF) -- 8/11/2003 -- 27/9/2004. -- With primitive error messaging, by rules and rule tails commented out ----------------------------------------------------------------------------- -module PrLBNF (prLBNF,prBNF) where +module GF.CF.PrLBNF (prLBNF,prBNF) where -import CF -import CFIdent -import AbsGFC -import Ident -import PrGrammar -import ShellState -import GFC -import Look +import GF.CF.CF +import GF.CF.CFIdent +import GF.Canon.AbsGFC +import GF.Infra.Ident +import GF.Grammar.PrGrammar +import GF.Compile.ShellState +import GF.Canon.GFC +import GF.Canon.Look -import Operations -import Modules +import GF.Data.Operations +import GF.Infra.Modules -import Char -import List (nub) +import Data.Char +import Data.List (nub) prLBNF :: Bool -> StateGrammar -> String prLBNF new gr = unlines $ pragmas ++ (map (prCFRule cs) rules') diff --git a/src/GF/CF/Profile.hs b/src/GF/CF/Profile.hs index 12aa5c385..e573bec78 100644 --- a/src/GF/CF/Profile.hs +++ b/src/GF/CF/Profile.hs @@ -5,30 +5,30 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/02/18 19:21:08 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.7 $ +-- > CVS $Date: 2005/04/21 16:21:14 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.8 $ -- -- restoring parse trees for discontinuous constituents, bindings, etc. AR 25/1/2001 -- revised 8/4/2002 for the new profile structure ----------------------------------------------------------------------------- -module Profile (postParse) where +module GF.CF.Profile (postParse) where -import AbsGFC -import GFC -import qualified Ident as I -import CMacros +import GF.Canon.AbsGFC +import GF.Canon.GFC +import qualified GF.Infra.Ident as I +import GF.Canon.CMacros ---import MMacros -import CF -import CFIdent -import PPrCF -- for error msg -import PrGrammar +import GF.CF.CF +import GF.CF.CFIdent +import GF.CF.PPrCF -- for error msg +import GF.Grammar.PrGrammar -import Operations +import GF.Data.Operations -import Monad -import List (nub) +import Control.Monad +import Data.List (nub) -- | the job is done in two passes: -- -- cgit v1.2.3