change the library root namespace from GF.GFCC to PGF

2026-04-09 04:59:31 -06:00 · 2008-05-29 17:55:05 +00:00
parent cb374f5617
commit 3f2f0d1bea
41 changed files with 152 additions and 258 deletions
--- a/GF.cabal
+++ b/GF.cabal
@@ -25,20 +25,21 @@ library
  hs-source-dirs: src-3.0
  extensions: 
  exposed-modules: 
-    GF.GFCC.API
+    PGF
  other-modules:
-    GF.GFCC.Raw.AbsGFCCRaw
-    GF.GFCC.DataGFCC
-    GF.GFCC.CId
-    GF.GFCC.Raw.ParGFCCRaw
-    GF.GFCC.Macros
-    GF.GFCC.Generate
-    GF.GFCC.Linearize
-    GF.GFCC.BuildParser
-    GF.GFCC.Parsing.FCFG.Utilities
-    GF.GFCC.Parsing.FCFG.Active
-    GF.GFCC.Parsing.FCFG
-    GF.GFCC.Raw.ConvertGFCC
+    PGF.CId
+    PGF.Data
+    PGF.Macros
+    PGF.Generate
+    PGF.Linearize
+    PGF.BuildParser
+    PGF.Parsing.FCFG.Utilities
+    PGF.Parsing.FCFG.Active
+    PGF.Parsing.FCFG
+    PGF.Raw.Parse
+    PGF.Raw.Print
+    PGF.Raw.Convert
+    PGF.Raw.Abstract
    GF.Data.RedBlackSet
    GF.Data.GeneralDeduction
    GF.Data.Utilities
@@ -77,7 +78,6 @@ executable gf3
    GF.Source.PrintGF
    GF.JavaScript.AbsJS
    GF.JavaScript.PrintJS
-    GF.GFCC.Raw.AbsGFCCRaw
    GF.Command.LexGFShell
    GF.Command.AbsGFShell
    GF.Command.PrintGFShell
@@ -89,29 +89,12 @@ executable gf3
    GF.Data.SortedList
    GF.Data.Assoc
    GF.Infra.PrintClass
-    GF.GFCC.CId
-    GF.GFCC.Raw.ParGFCCRaw
-    GF.GFCC.Raw.PrintGFCCRaw    
-    GF.GFCC.BuildParser
-    GF.GFCC.DataGFCC
-    GF.GFCC.Parsing.FCFG.Utilities
-    GF.GFCC.Parsing.FCFG.Active
-    GF.GFCC.Parsing.FCFG
-    GF.GFCC.Raw.ConvertGFCC
-    GF.GFCC.Macros
-    GF.GFCC.Generate
-    GF.GFCC.Linearize
    GF.Compile.GenerateFCFG
    GF.Data.ErrM
    GF.Command.ParGFShell
    GF.Command.PPrTree
-    GF.GFCC.API
-    GF.GFCC.CheckGFCC
    GF.Source.ParGF
    GF.Data.Operations
-    GF.GFCC.GFCCtoHaskell
-    GF.GFCC.ShowLinearize
-    GF.GFCC.OptimizeGFCC
    GF.Infra.Ident
    GF.Grammar.Predef
    GF.Data.Str
@@ -119,8 +102,6 @@ executable gf3
    GF.Infra.GetOpt
    GF.Infra.Option
    GF.Infra.UseIO
-    GF.GFCC.GFCCtoJS
-    GF.GFCC.PrintGFCC
    GF.Command.Commands
    GF.Command.Interpreter
    GF.Infra.Modules
@@ -140,7 +121,6 @@ executable gf3
    GF.Grammar.Unify
    GF.Compile.TypeCheck
    GF.Compile.Update
-    GF.Compile.OptimizeGF
    GF.Infra.CheckM
    GF.Grammar.AppPredefined 
    GF.Grammar.PatternMatch
@@ -152,6 +132,8 @@ executable gf3
    GF.Compile.GrammarToGFCC
    GF.Compile.Compute
    GF.Compile.Optimize
+    GF.Compile.OptimizeGF
+    GF.Compile.OptimizeGFCC
    GF.Compile.ModDeps
    GF.Compile.Rebuild
    GF.Source.SourceToGrammar
@@ -159,6 +141,20 @@ executable gf3
    GF.Compile
    GF.Command.Importing
    GF.System.Readline
+    PGF
+    PGF.CId
+    PGF.Data
+    PGF.Macros
+    PGF.Generate
+    PGF.Linearize
+    PGF.BuildParser
+    PGF.Parsing.FCFG.Utilities
+    PGF.Parsing.FCFG.Active
+    PGF.Parsing.FCFG
+    PGF.Raw.Parse
+    PGF.Raw.Print
+    PGF.Raw.Convert
+    PGF.Raw.Abstract
    GFC
    GFI
  
--- a/src-3.0/GF/Command/Commands.hs
+++ b/src-3.0/GF/Command/Commands.hs
@@ -12,12 +12,12 @@ module GF.Command.Commands (
 import GF.Command.AbsGFShell hiding (Tree)
 import GF.Command.PPrTree
 import GF.Command.ParGFShell
-import GF.GFCC.CId
-import GF.GFCC.ShowLinearize
-import GF.GFCC.API
-import GF.GFCC.Macros
-import GF.GFCC.PrintGFCC
-import GF.GFCC.DataGFCC ----
+import PGF
+import PGF.CId
+import PGF.ShowLinearize
+import PGF.Macros
+import PGF.Data ----
+import GF.Compile.Export

 import GF.Data.ErrM ----

--- a/src-3.0/GF/Command/Importing.hs
+++ b/src-3.0/GF/Command/Importing.hs
@@ -1,11 +1,10 @@
 module GF.Command.Importing (importGrammar, importSource) where

+import PGF
+import PGF.Data
+
 import GF.Compile
-import GF.GFCC.DataGFCC
-import GF.GFCC.API
-
 import GF.Grammar.Grammar (SourceGrammar) -- for cc command
-
 import GF.Infra.UseIO
 import GF.Infra.Option
 import GF.Data.ErrM
--- a/src-3.0/GF/Command/Interpreter.hs
+++ b/src-3.0/GF/Command/Interpreter.hs
@@ -7,9 +7,9 @@ import GF.Command.Commands
 import GF.Command.AbsGFShell hiding (Tree)
 import GF.Command.PPrTree
 import GF.Command.ParGFShell
-import GF.GFCC.API
-import GF.GFCC.Macros
-import GF.GFCC.DataGFCC
+import PGF
+import PGF.Data
+import PGF.Macros
 import GF.System.Signal

 import GF.Data.ErrM ----
--- a/src-3.0/GF/Command/PPrTree.hs
+++ b/src-3.0/GF/Command/PPrTree.hs
@@ -1,8 +1,8 @@
 module GF.Command.PPrTree (pTree, prExp, tree2exp) where

-import GF.GFCC.DataGFCC
-import GF.GFCC.CId
-import GF.GFCC.Macros
+import PGF.CId
+import PGF.Data
+import PGF.Macros
 import qualified GF.Command.ParGFShell as P
 import GF.Command.PrintGFShell
 import GF.Command.AbsGFShell
--- a/src-3.0/GF/Compile.hs
+++ b/src-3.0/GF/Compile.hs
@@ -8,6 +8,7 @@ import GF.Compile.Rename
 import GF.Compile.CheckGrammar
 import GF.Compile.Optimize
 import GF.Compile.OptimizeGF
+import GF.Compile.OptimizeGFCC
 import GF.Compile.GrammarToGFCC
 import GF.Compile.ReadFiles
 import GF.Compile.Update
@@ -34,9 +35,8 @@ import System.FilePath
 import System.Time
 import qualified Data.Map as Map

-import GF.GFCC.OptimizeGFCC
-import GF.GFCC.CheckGFCC
-import GF.GFCC.DataGFCC
+import PGF.Check
+import PGF.Data


 -- | Compiles a number of source files and builds a 'GFCC' structure for them.
--- a/src-3.0/GF/Compile/Export.hs
+++ b/src-3.0/GF/Compile/Export.hs
@@ -1,10 +1,10 @@
-module GF.GFCC.PrintGFCC where
+module GF.Compile.Export where

-import GF.GFCC.DataGFCC (GFCC)
-import GF.GFCC.Raw.ConvertGFCC (fromGFCC)
-import GF.GFCC.Raw.PrintGFCCRaw (printTree)
-import GF.GFCC.GFCCtoHaskell
-import GF.GFCC.GFCCtoJS
+import PGF.Data (GFCC)
+import PGF.Raw.Print (printTree)
+import PGF.Raw.Convert (fromGFCC)
+import GF.Compile.GFCCtoHaskell
+import GF.Compile.GFCCtoJS
 import GF.Infra.Option
 import GF.Text.UTF8

--- a/src-3.0/GF/Compile/GFCCtoHaskell.hs
+++ b/src-3.0/GF/Compile/GFCCtoHaskell.hs
@@ -14,11 +14,11 @@
 -- AR 11/11/1999 -- 7/12/2000 -- 18/5/2004
 -----------------------------------------------------------------------------

-module GF.GFCC.GFCCtoHaskell (grammar2haskell, grammar2haskellGADT) where
+module GF.Compile.GFCCtoHaskell (grammar2haskell, grammar2haskellGADT) where

-import GF.GFCC.Macros
-import GF.GFCC.DataGFCC
-import GF.GFCC.CId
+import PGF.CId
+import PGF.Data
+import PGF.Macros

 import GF.Data.Operations
 import GF.Text.UTF8
@@ -46,8 +46,8 @@ haskPreamble =
 [
  "module GSyntax where",
  "",
-  "import GF.GFCC.DataGFCC",
-  "import GF.GFCC.CId",
+  "import PGF.CId",
+  "import PGF.Data",
  "----------------------------------------------------",
  "-- automatic translation from GF to Haskell",
  "----------------------------------------------------",
--- a/src-3.0/GF/Compile/GFCCtoJS.hs
+++ b/src-3.0/GF/Compile/GFCCtoJS.hs
@@ -1,8 +1,8 @@
-module GF.GFCC.GFCCtoJS (gfcc2js) where
+module GF.Compile.GFCCtoJS (gfcc2js) where

-import qualified GF.GFCC.Macros as M
-import GF.GFCC.CId
-import GF.GFCC.DataGFCC
+import PGF.CId
+import PGF.Data
+import qualified PGF.Macros as M
 import qualified GF.JavaScript.AbsJS as JS
 import qualified GF.JavaScript.PrintJS as JS

--- a/src-3.0/GF/Compile/GenerateFCFG.hs
+++ b/src-3.0/GF/Compile/GenerateFCFG.hs
@@ -15,13 +15,10 @@
 module GF.Compile.GenerateFCFG
    (convertConcrete) where

-import Control.Monad
-
-import GF.GFCC.Parsing.FCFG.Utilities
-
-import GF.GFCC.Macros --hiding (prt)
-import GF.GFCC.DataGFCC
-import GF.GFCC.CId
+import PGF.CId
+import PGF.Data
+import PGF.Macros --hiding (prt)
+import PGF.Parsing.FCFG.Utilities

 import GF.Data.BacktrackM
 import GF.Data.SortedList
@@ -33,6 +30,7 @@ import qualified Data.List as List
 import qualified Data.ByteString.Char8 as BS
 import Data.Array
 import Data.Maybe
+import Control.Monad

 ----------------------------------------------------------------------
 -- main conversion function
--- a/src-3.0/GF/Compile/GrammarToGFCC.hs
+++ b/src-3.0/GF/Compile/GrammarToGFCC.hs
@@ -1,14 +1,15 @@
 {-# LANGUAGE PatternGuards #-}
 module GF.Compile.GrammarToGFCC (prGrammar2gfcc,mkCanon2gfcc,addParsers) where

+import GF.Compile.Export
 import GF.Compile.OptimizeGF (unshareModule)
+import GF.Compile.GenerateFCFG (convertConcrete)

-import qualified GF.GFCC.Macros as CM
-import qualified GF.GFCC.DataGFCC as C
-import qualified GF.GFCC.DataGFCC as D
-import GF.GFCC.CId
-import GF.GFCC.PrintGFCC
-import GF.GFCC.BuildParser (buildParserInfo)
+import PGF.CId
+import PGF.BuildParser (buildParserInfo)
+import qualified PGF.Macros as CM
+import qualified PGF.Data as C
+import qualified PGF.Data as D
 import GF.Grammar.Predef
 import GF.Grammar.PrGrammar
 import GF.Grammar.Grammar
@@ -19,7 +20,6 @@ import qualified GF.Compile.Compute as Compute ----
 import qualified GF.Infra.Modules as M
 import qualified GF.Infra.Option as O

-import GF.Compile.GenerateFCFG (convertConcrete)
 import GF.Infra.Ident
 import GF.Infra.Option
 import GF.Data.Operations
--- a/src-3.0/GF/Compile/OptimizeGFCC.hs
+++ b/src-3.0/GF/Compile/OptimizeGFCC.hs
@@ -1,7 +1,7 @@
-module GF.GFCC.OptimizeGFCC where
+module GF.Compile.OptimizeGFCC where

-import GF.GFCC.CId
-import GF.GFCC.DataGFCC
+import PGF.CId
+import PGF.Data

 import GF.Data.Operations

--- a/src-3.0/GF/GFCC/GFCC.cf
+++ b/src-3.0/GF/GFCC/GFCC.cf
@@ -1,81 +0,0 @@
-Grm. Grammar  ::= 
-  "grammar" CId "(" [CId] ")" "(" [Flag] ")" ";" 
-  Abstract ";" 
-  [Concrete] ;
-
-Abs. Abstract ::= 
-  "abstract" "{" 
-     "flags" [Flag] 
-     "fun"   [FunDef] 
-     "cat"   [CatDef] 
-  "}" ;
-
-Cnc. Concrete ::= 
-  "concrete" CId "{" 
-     "flags"  [Flag] 
-     "lin"    [LinDef] 
-     "oper"   [LinDef] 
-     "lincat" [LinDef] 
-     "lindef" [LinDef] 
-     "printname" [LinDef]
-     "param"  [LinDef]     -- lincats with param value names
-  "}" ;
-
-Flg. Flag     ::= CId "=" String ;
-Cat. CatDef   ::= CId "[" [Hypo] "]" ;
-
-Fun. FunDef   ::= CId ":" Type "=" Exp ;
-Lin. LinDef   ::= CId "=" Term ;
-
-DTyp. Type    ::= "[" [Hypo] "]" CId [Exp] ;         -- dependent type
-DTr.  Exp     ::= "[" "(" [CId] ")" Atom [Exp] "]" ; -- term with bindings
-
-AC.   Atom     ::= CId ;
-AS.   Atom     ::= String ;
-AI.   Atom     ::= Integer ;
-AF.   Atom     ::= Double ;
-AM.   Atom     ::= "?" Integer ;
-
-R.   Term     ::= "[" [Term] "]" ;          -- record/table
-P.   Term     ::= "(" Term "!" Term ")" ;   -- projection/selection
-S.   Term     ::= "(" [Term] ")" ;          -- concatenated sequence
-K.   Term     ::= Tokn ;                    -- token
-V.   Term     ::= "$" Integer ;             -- argument
-C.   Term     ::= Integer ;                 -- parameter value/label
-F.   Term     ::= CId ;                     -- global constant
-FV.  Term     ::= "[|" [Term] "|]" ;        -- free variation
-W.   Term     ::= "(" String "+" Term ")" ; -- prefix + suffix table
-TM.  Term     ::= "?" ;                     -- lin of metavariable
-
-KS.  Tokn     ::= String ;
-KP.  Tokn     ::= "[" "pre" [String] "[" [Variant] "]" "]" ;
-Var. Variant  ::= [String] "/" [String] ;
-
-
-RP.  Term     ::= "(" Term "@" Term ")";    -- DEPRECATED: record parameter alias
-
-terminator Concrete ";" ;
-terminator Flag ";" ;
-terminator CatDef ";" ;
-terminator FunDef ";" ;
-terminator LinDef ";" ;
-separator  CId "," ;
-separator  Term "," ;
-terminator Exp "" ;
-terminator String "" ;
-separator  Variant "," ;
-
-token CId (('_' | letter) (letter | digit | '\'' | '_')*) ;
-
-
-- the following are needed if dependent types or HOAS or defs are present
-
-Hyp. Hypo     ::= CId ":" Type ;
-AV.  Atom     ::= "$" CId ;
-
-EEq. Exp      ::= "{" [Equation] "}" ;  -- list of pattern eqs; primitive: []
-Equ. Equation ::= [Exp] "->" Exp ;      -- patterns are encoded as exps
-
-separator  Hypo "," ;
-terminator Equation ";" ;
-
--- a/src-3.0/GF/GFCC/Raw/GFCCRaw.cf
+++ b/src-3.0/GF/GFCC/Raw/GFCCRaw.cf
@@ -1,12 +0,0 @@
-Grm. Grammar ::= [RExp] ;
-
-App.  RExp ::= "(" CId [RExp] ")" ;
-AId.  RExp ::= CId ;
-AInt. RExp ::= Integer ;
-AStr. RExp ::= String ;
-AFlt. RExp ::= Double ;
-AMet. RExp ::= "?" ;
-
-terminator RExp "" ;
-
-token CId (('_' | letter) (letter | digit | '\'' | '_')*) ;
--- a/src-3.0/GFC.hs
+++ b/src-3.0/GFC.hs
@@ -1,15 +1,15 @@
 module GFC (mainGFC) where
 -- module Main where

+import PGF
+import PGF.CId
+import PGF.Data
+import PGF.Raw.Parse
+import PGF.Raw.Convert
 import GF.Compile
-import GF.GFCC.PrintGFCC
-import GF.GFCC.CId
-import GF.GFCC.DataGFCC
-import GF.GFCC.Raw.ParGFCCRaw
-import GF.GFCC.Raw.ConvertGFCC
+import GF.Compile.Export
 import GF.Infra.UseIO
 import GF.Infra.Option
-import GF.GFCC.API
 import GF.Data.ErrM

 import Data.Maybe
--- a/src-3.0/GFI.hs
+++ b/src-3.0/GFI.hs
@@ -4,12 +4,11 @@ import GF.Command.Interpreter
 import GF.Command.Importing
 import GF.Command.Commands
 import GF.Data.ErrM
-import GF.GFCC.API
 import GF.Grammar.API  -- for cc command
-
 import GF.Infra.UseIO
 import GF.Infra.Option
 import GF.System.Readline (fetchCommand)
+import PGF

 import System.CPUTime

--- a/src-3.0/GF/GFCC/API.hs
+++ b/src-3.0/GF/GFCC/API.hs
@@ -13,20 +13,19 @@
 -- embedded GF systems. AR 19/9/2007
 -----------------------------------------------------------------------------

-module  GF.GFCC.API where
+module PGF where

-import GF.GFCC.Linearize
-import GF.GFCC.Generate
-import GF.GFCC.Macros
-import GF.GFCC.DataGFCC
-import GF.GFCC.CId
-import GF.GFCC.Raw.ConvertGFCC
-import GF.GFCC.Raw.ParGFCCRaw
+import PGF.CId
+import PGF.Linearize
+import PGF.Generate
+import PGF.Macros
+import PGF.Data
+import PGF.Raw.Convert
+import PGF.Raw.Parse
+import PGF.Parsing.FCFG

 import GF.Data.ErrM

-import GF.GFCC.Parsing.FCFG
-
 import Data.Char
 import qualified Data.Map as Map
 import Control.Monad
@@ -85,7 +84,7 @@ file2gfcc f = do
  g <- parseGrammar s
  return $ toGFCC g

-linearize mgr lang = GF.GFCC.Linearize.linearize (gfcc mgr) (mkCId lang)
+linearize mgr lang = PGF.Linearize.linearize (gfcc mgr) (mkCId lang)

 parse mgr lang cat s = 
  case lookParser (gfcc mgr) (mkCId lang) of
@@ -96,7 +95,7 @@ parse mgr lang cat s =

 linearizeAll mgr = map snd . linearizeAllLang mgr
 linearizeAllLang mgr t = 
-  [(lang,linearThis mgr lang t) | lang <- languages mgr]
+  [(lang,PGF.linearize mgr lang t) | lang <- languages mgr]

 parseAll mgr cat = map snd . parseAllLang mgr cat

@@ -172,8 +171,6 @@ emptyMultiGrammar = MultiGrammar emptyGFCC

 ------------ for internal use only

-linearThis = GF.GFCC.API.linearize
-
 err f g ex = case ex of
  Ok x -> g x
  Bad s -> f s
--- a/src-3.0/GF/GFCC/BuildParser.hs
+++ b/src-3.0/GF/GFCC/BuildParser.hs
@@ -7,13 +7,13 @@
 -- FCFG parsing, parser information
 -----------------------------------------------------------------------------

-module GF.GFCC.BuildParser where
+module PGF.BuildParser where

-import GF.GFCC.Parsing.FCFG.Utilities
 import GF.Data.SortedList
 import GF.Data.Assoc
-import GF.GFCC.CId
-import GF.GFCC.DataGFCC
+import PGF.CId
+import PGF.Data
+import PGF.Parsing.FCFG.Utilities

 import Data.Array
 import Data.Maybe
--- a/src-3.0/GF/GFCC/CId.hs
+++ b/src-3.0/GF/GFCC/CId.hs
@@ -1,4 +1,4 @@
-module GF.GFCC.CId (CId(..), wildCId, mkCId, prCId) where
+module PGF.CId (CId(..), wildCId, mkCId, prCId) where

 import Data.ByteString.Char8 as BS

--- a/src-3.0/GF/GFCC/CheckGFCC.hs
+++ b/src-3.0/GF/GFCC/CheckGFCC.hs
@@ -1,8 +1,8 @@
-module GF.GFCC.CheckGFCC (checkGFCC, checkGFCCio, checkGFCCmaybe) where
+module PGF.Check (checkGFCC, checkGFCCio, checkGFCCmaybe) where

-import GF.GFCC.CId
-import GF.GFCC.Macros
-import GF.GFCC.DataGFCC
+import PGF.CId
+import PGF.Data
+import PGF.Macros
 import GF.Data.ErrM

 import qualified Data.Map as Map
--- a/src-3.0/GF/GFCC/DataGFCC.hs
+++ b/src-3.0/GF/GFCC/DataGFCC.hs
@@ -1,6 +1,6 @@
-module GF.GFCC.DataGFCC where
+module PGF.Data where

-import GF.GFCC.CId
+import PGF.CId
 import GF.Text.UTF8
 import GF.Data.Assoc

--- a/src-3.0/GF/GFCC/Generate.hs
+++ b/src-3.0/GF/GFCC/Generate.hs
@@ -1,8 +1,8 @@
-module GF.GFCC.Generate where
+module PGF.Generate where

-import GF.GFCC.Macros
-import GF.GFCC.DataGFCC
-import GF.GFCC.CId
+import PGF.CId
+import PGF.Data
+import PGF.Macros

 import qualified Data.Map as M
 import System.Random
--- a/src-3.0/GF/GFCC/Linearize.hs
+++ b/src-3.0/GF/GFCC/Linearize.hs
@@ -1,8 +1,8 @@
-module GF.GFCC.Linearize where
+module PGF.Linearize where

-import GF.GFCC.Macros
-import GF.GFCC.DataGFCC
-import GF.GFCC.CId
+import PGF.CId
+import PGF.Data
+import PGF.Macros
 import qualified Data.Map as Map
 import Data.List

--- a/src-3.0/GF/GFCC/Macros.hs
+++ b/src-3.0/GF/GFCC/Macros.hs
@@ -1,7 +1,7 @@
-module GF.GFCC.Macros where
+module PGF.Macros where

-import GF.GFCC.CId
-import GF.GFCC.DataGFCC
+import PGF.CId
+import PGF.Data
 import Control.Monad
 import qualified Data.Map   as Map
 import qualified Data.Array as Array
--- a/src-3.0/GF/GFCC/Parsing/FCFG.hs
+++ b/src-3.0/GF/GFCC/Parsing/FCFG.hs
@@ -7,20 +7,19 @@
 -- FCFG parsing
 -----------------------------------------------------------------------------

-module GF.GFCC.Parsing.FCFG
+module PGF.Parsing.FCFG
    (parseFCF,buildParserInfo,ParserInfo(..),makeFinalEdge) where

-import GF.Data.SortedList 
-import GF.Data.Assoc
-
-import GF.GFCC.Parsing.FCFG.Utilities
-import GF.GFCC.Parsing.FCFG.Active
-
-import GF.GFCC.CId
-import GF.GFCC.DataGFCC
-import GF.GFCC.BuildParser
-import GF.GFCC.Macros
 import GF.Data.ErrM
+import GF.Data.Assoc
+import GF.Data.SortedList 
+
+import PGF.CId
+import PGF.Data
+import PGF.Macros
+import PGF.BuildParser
+import PGF.Parsing.FCFG.Utilities
+import PGF.Parsing.FCFG.Active

 import qualified Data.Map as Map

--- a/src-3.0/GF/GFCC/Parsing/FCFG/Active.hs
+++ b/src-3.0/GF/GFCC/Parsing/FCFG/Active.hs
@@ -7,16 +7,16 @@
 -- MCFG parsing, the active algorithm
 -----------------------------------------------------------------------------

-module GF.GFCC.Parsing.FCFG.Active (FCFParser, parse, makeFinalEdge) where
+module PGF.Parsing.FCFG.Active (FCFParser, parse, makeFinalEdge) where

 import GF.Data.GeneralDeduction
 import GF.Data.Assoc
 import GF.Data.SortedList
 import GF.Data.Utilities

-import GF.GFCC.CId
-import GF.GFCC.DataGFCC
-import GF.GFCC.Parsing.FCFG.Utilities
+import PGF.CId
+import PGF.Data
+import PGF.Parsing.FCFG.Utilities

 import Control.Monad (guard)

--- a/src-3.0/GF/GFCC/Parsing/FCFG/Utilities.hs
+++ b/src-3.0/GF/GFCC/Parsing/FCFG/Utilities.hs
@@ -12,7 +12,7 @@
 -----------------------------------------------------------------------------


-module GF.GFCC.Parsing.FCFG.Utilities where
+module PGF.Parsing.FCFG.Utilities where

 import Control.Monad
 import Data.Array
--- a/src-3.0/GF/GFCC/Raw/AbsGFCCRaw.hs
+++ b/src-3.0/GF/GFCC/Raw/AbsGFCCRaw.hs
@@ -1,4 +1,4 @@
-module GF.GFCC.Raw.AbsGFCCRaw where
+module PGF.Raw.Abstract where

 data Grammar =
   Grm [RExp]
--- a/src-3.0/GF/GFCC/Raw/ConvertGFCC.hs
+++ b/src-3.0/GF/GFCC/Raw/ConvertGFCC.hs
@@ -1,10 +1,10 @@
-module GF.GFCC.Raw.ConvertGFCC (toGFCC,fromGFCC) where
+module PGF.Raw.Convert (toGFCC,fromGFCC) where

-import GF.GFCC.CId
-import GF.GFCC.DataGFCC
-import GF.GFCC.Raw.AbsGFCCRaw
-import GF.GFCC.BuildParser (buildParserInfo)
-import GF.GFCC.Parsing.FCFG.Utilities
+import PGF.CId
+import PGF.Data
+import PGF.Raw.Abstract
+import PGF.BuildParser (buildParserInfo)
+import PGF.Parsing.FCFG.Utilities

 import qualified Data.Array as Array
 import qualified Data.Map   as Map
--- a/src-3.0/GF/GFCC/Raw/ParGFCCRaw.hs
+++ b/src-3.0/GF/GFCC/Raw/ParGFCCRaw.hs
@@ -1,7 +1,7 @@
-module GF.GFCC.Raw.ParGFCCRaw (parseGrammar) where
+module PGF.Raw.Parse (parseGrammar) where

-import GF.GFCC.CId
-import GF.GFCC.Raw.AbsGFCCRaw
+import PGF.CId
+import PGF.Raw.Abstract

 import Control.Monad
 import Data.Char
--- a/src-3.0/GF/GFCC/Raw/PrintGFCCRaw.hs
+++ b/src-3.0/GF/GFCC/Raw/PrintGFCCRaw.hs
@@ -1,7 +1,7 @@
-module GF.GFCC.Raw.PrintGFCCRaw (printTree) where
+module PGF.Raw.Print (printTree) where

-import GF.GFCC.CId
-import GF.GFCC.Raw.AbsGFCCRaw
+import PGF.CId
+import PGF.Raw.Abstract

 import Data.List (intersperse)
 import Numeric (showFFloat)
--- a/src-3.0/GF/GFCC/ShowLinearize.hs
+++ b/src-3.0/GF/GFCC/ShowLinearize.hs
@@ -1,15 +1,14 @@
-module GF.GFCC.ShowLinearize (
+module PGF.ShowLinearize (
  tableLinearize,
  recordLinearize,
  termLinearize,
  allLinearize
  ) where

-import GF.GFCC.Linearize
-import GF.GFCC.Macros
-import GF.GFCC.DataGFCC
-import GF.GFCC.CId
--import GF.GFCC.PrintGFCC ----
+import PGF.CId
+import PGF.Data
+import PGF.Macros
+import PGF.Linearize

 import GF.Data.Operations
 import Data.List
--- a/src-3.0/GF/GFCC/doc/Eng.gf
+++ b/src-3.0/GF/GFCC/doc/Eng.gf
--- a/src-3.0/GF/GFCC/doc/Ex.gf
+++ b/src-3.0/GF/GFCC/doc/Ex.gf
--- a/src-3.0/GF/GFCC/doc/Swe.gf
+++ b/src-3.0/GF/GFCC/doc/Swe.gf
--- a/src-3.0/GF/GFCC/doc/Test.gf
+++ b/src-3.0/GF/GFCC/doc/Test.gf
--- a/src-3.0/GF/GFCC/doc/gfcc.html
+++ b/src-3.0/GF/GFCC/doc/gfcc.html
--- a/src-3.0/GF/GFCC/doc/gfcc.txt
+++ b/src-3.0/GF/GFCC/doc/gfcc.txt
--- a/src-3.0/GF/GFCC/doc/old-GFCC.cf
+++ b/src-3.0/GF/GFCC/doc/old-GFCC.cf
--- a/src-3.0/GF/GFCC/doc/old-gfcc.txt
+++ b/src-3.0/GF/GFCC/doc/old-gfcc.txt
--- a/src-3.0/GF/GFCC/doc/syntax.txt
+++ b/src-3.0/GF/GFCC/doc/syntax.txt