From 15ddc283d40643950fb17a9dd7c2e93f230694a9 Mon Sep 17 00:00:00 2001 From: krasimir Date: Mon, 14 Dec 2009 10:10:58 +0000 Subject: [PATCH] rename some modules that had GFCC in the name to PGF+something --- GF.cabal | 7 +++++-- src/compiler/GF/Compile.hs | 4 ++-- src/compiler/GF/Compile/Export.hs | 6 +++--- .../GF/Compile/{GrammarToGFCC.hs => GrammarToPGF.hs} | 2 +- .../GF/Compile/{OptimizeGFCC.hs => OptimizePGF.hs} | 2 +- .../GF/Compile/{GFCCtoHaskell.hs => PGFtoHaskell.hs} | 4 ++-- src/compiler/GF/Compile/{GFCCtoJS.hs => PGFtoJS.hs} | 2 +- .../GF/Compile/{GFCCtoProlog.hs => PGFtoProlog.hs} | 4 ++-- 8 files changed, 17 insertions(+), 14 deletions(-) rename src/compiler/GF/Compile/{GrammarToGFCC.hs => GrammarToPGF.hs} (99%) rename src/compiler/GF/Compile/{OptimizeGFCC.hs => OptimizePGF.hs} (98%) rename src/compiler/GF/Compile/{GFCCtoHaskell.hs => PGFtoHaskell.hs} (99%) rename src/compiler/GF/Compile/{GFCCtoJS.hs => PGFtoJS.hs} (99%) rename src/compiler/GF/Compile/{GFCCtoProlog.hs => PGFtoProlog.hs} (99%) diff --git a/GF.cabal b/GF.cabal index 7d77f2b6b..871f38b89 100644 --- a/GF.cabal +++ b/GF.cabal @@ -141,7 +141,7 @@ executable gf GF.Compile.Refresh GF.Compile.Rename GF.Compile.ReadFiles - GF.Compile.GrammarToGFCC + GF.Compile.GrammarToPGF GF.Compile.Concrete.TypeCheck GF.Compile.Concrete.Compute GF.Compile.Concrete.AppPredefined @@ -150,9 +150,12 @@ executable gf GF.Compile.Abstract.Compute GF.Compile.Optimize GF.Compile.SubExOpt - GF.Compile.OptimizeGFCC + GF.Compile.OptimizePGF GF.Compile.ModDeps GF.Compile.GetGrammar + GF.Compile.PGFtoHaskell + GF.Compile.PGFtoProlog + GF.Compile.PGFtoJS GF.Compile GF.System.Readline GF.Quiz diff --git a/src/compiler/GF/Compile.hs b/src/compiler/GF/Compile.hs index e0c60178e..cef7b235a 100644 --- a/src/compiler/GF/Compile.hs +++ b/src/compiler/GF/Compile.hs @@ -6,8 +6,8 @@ import GF.Compile.Rename import GF.Compile.CheckGrammar import GF.Compile.Optimize import GF.Compile.SubExOpt -import GF.Compile.OptimizeGFCC -import GF.Compile.GrammarToGFCC +import GF.Compile.OptimizePGF +import GF.Compile.GrammarToPGF import GF.Compile.ReadFiles import GF.Compile.Update import GF.Compile.Refresh diff --git a/src/compiler/GF/Compile/Export.hs b/src/compiler/GF/Compile/Export.hs index d03eb947e..29f35e32a 100644 --- a/src/compiler/GF/Compile/Export.hs +++ b/src/compiler/GF/Compile/Export.hs @@ -2,9 +2,9 @@ module GF.Compile.Export where import PGF.CId import PGF.Data (PGF(..)) -import GF.Compile.GFCCtoHaskell -import GF.Compile.GFCCtoProlog -import GF.Compile.GFCCtoJS +import GF.Compile.PGFtoHaskell +import GF.Compile.PGFtoProlog +import GF.Compile.PGFtoJS import GF.Compile.PGFPretty import GF.Infra.Option import GF.Speech.CFG diff --git a/src/compiler/GF/Compile/GrammarToGFCC.hs b/src/compiler/GF/Compile/GrammarToPGF.hs similarity index 99% rename from src/compiler/GF/Compile/GrammarToGFCC.hs rename to src/compiler/GF/Compile/GrammarToPGF.hs index fb92ef74c..ce7e5be73 100644 --- a/src/compiler/GF/Compile/GrammarToGFCC.hs +++ b/src/compiler/GF/Compile/GrammarToPGF.hs @@ -1,5 +1,5 @@ {-# LANGUAGE PatternGuards #-} -module GF.Compile.GrammarToGFCC (mkCanon2gfcc,addParsers) where +module GF.Compile.GrammarToPGF (mkCanon2gfcc,addParsers) where import GF.Compile.Export import qualified GF.Compile.GenerateFCFG as FCFG diff --git a/src/compiler/GF/Compile/OptimizeGFCC.hs b/src/compiler/GF/Compile/OptimizePGF.hs similarity index 98% rename from src/compiler/GF/Compile/OptimizeGFCC.hs rename to src/compiler/GF/Compile/OptimizePGF.hs index 2a218e1bb..b23560437 100644 --- a/src/compiler/GF/Compile/OptimizeGFCC.hs +++ b/src/compiler/GF/Compile/OptimizePGF.hs @@ -1,4 +1,4 @@ -module GF.Compile.OptimizeGFCC where +module GF.Compile.OptimizePGF where import PGF.CId import PGF.Data diff --git a/src/compiler/GF/Compile/GFCCtoHaskell.hs b/src/compiler/GF/Compile/PGFtoHaskell.hs similarity index 99% rename from src/compiler/GF/Compile/GFCCtoHaskell.hs rename to src/compiler/GF/Compile/PGFtoHaskell.hs index d44d6705c..787433963 100644 --- a/src/compiler/GF/Compile/GFCCtoHaskell.hs +++ b/src/compiler/GF/Compile/PGFtoHaskell.hs @@ -1,6 +1,6 @@ ---------------------------------------------------------------------- -- | --- Module : GFCCtoHaskell +-- Module : PGFtoHaskell -- Maintainer : Aarne Ranta -- Stability : (stable) -- Portability : (portable) @@ -14,7 +14,7 @@ -- AR 11/11/1999 -- 7/12/2000 -- 18/5/2004 ----------------------------------------------------------------------------- -module GF.Compile.GFCCtoHaskell (grammar2haskell) where +module GF.Compile.PGFtoHaskell (grammar2haskell) where import PGF.CId import PGF.Data diff --git a/src/compiler/GF/Compile/GFCCtoJS.hs b/src/compiler/GF/Compile/PGFtoJS.hs similarity index 99% rename from src/compiler/GF/Compile/GFCCtoJS.hs rename to src/compiler/GF/Compile/PGFtoJS.hs index 4ec12e701..ff75d8fe6 100644 --- a/src/compiler/GF/Compile/GFCCtoJS.hs +++ b/src/compiler/GF/Compile/PGFtoJS.hs @@ -1,4 +1,4 @@ -module GF.Compile.GFCCtoJS (pgf2js) where +module GF.Compile.PGFtoJS (pgf2js) where import PGF.CId import PGF.Data hiding (mkStr) diff --git a/src/compiler/GF/Compile/GFCCtoProlog.hs b/src/compiler/GF/Compile/PGFtoProlog.hs similarity index 99% rename from src/compiler/GF/Compile/GFCCtoProlog.hs rename to src/compiler/GF/Compile/PGFtoProlog.hs index 702d4afe5..538430747 100644 --- a/src/compiler/GF/Compile/GFCCtoProlog.hs +++ b/src/compiler/GF/Compile/PGFtoProlog.hs @@ -1,6 +1,6 @@ ---------------------------------------------------------------------- -- | --- Module : GFCCtoProlog +-- Module : PGFtoProlog -- Maintainer : Peter Ljunglöf -- Stability : (stable) -- Portability : (portable) @@ -8,7 +8,7 @@ -- to write a GF grammar into a Prolog module ----------------------------------------------------------------------------- -module GF.Compile.GFCCtoProlog (grammar2prolog, grammar2prolog_abs) where +module GF.Compile.PGFtoProlog (grammar2prolog, grammar2prolog_abs) where import PGF.CId import PGF.Data