From d7bad708658f40cfb5a54dbd9836cc7c6035635a Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Thu, 22 May 2008 15:41:17 +0000 Subject: move GF.Devel.PrintGFCC to GF.GFCC.PrintGFCC --- src-3.0/GF/Command/Commands.hs | 2 +- src-3.0/GF/Compile/GrammarToGFCC.hs | 2 +- src-3.0/GF/Devel/PrintGFCC.hs | 21 --------------------- src-3.0/GF/GFCC/PrintGFCC.hs | 21 +++++++++++++++++++++ src-3.0/GFC.hs | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 src-3.0/GF/Devel/PrintGFCC.hs create mode 100644 src-3.0/GF/GFCC/PrintGFCC.hs diff --git a/src-3.0/GF/Command/Commands.hs b/src-3.0/GF/Command/Commands.hs index 7f84805f6..ef10220a8 100644 --- a/src-3.0/GF/Command/Commands.hs +++ b/src-3.0/GF/Command/Commands.hs @@ -16,7 +16,7 @@ import GF.GFCC.CId import GF.GFCC.ShowLinearize import GF.GFCC.API import GF.GFCC.Macros -import GF.Devel.PrintGFCC +import GF.GFCC.PrintGFCC import GF.GFCC.DataGFCC ---- import GF.Data.ErrM ---- diff --git a/src-3.0/GF/Compile/GrammarToGFCC.hs b/src-3.0/GF/Compile/GrammarToGFCC.hs index fc52e7d1c..4fd843770 100644 --- a/src-3.0/GF/Compile/GrammarToGFCC.hs +++ b/src-3.0/GF/Compile/GrammarToGFCC.hs @@ -7,6 +7,7 @@ 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.Grammar.Predef import GF.Grammar.PrGrammar import GF.Grammar.Grammar @@ -18,7 +19,6 @@ import qualified GF.Infra.Option as O import GF.Conversion.SimpleToFCFG (convertConcrete) import GF.Parsing.FCFG.PInfo (buildFCFPInfo) -import GF.Devel.PrintGFCC import GF.Infra.Ident import GF.Infra.Option import GF.Data.Operations diff --git a/src-3.0/GF/Devel/PrintGFCC.hs b/src-3.0/GF/Devel/PrintGFCC.hs deleted file mode 100644 index c7e668884..000000000 --- a/src-3.0/GF/Devel/PrintGFCC.hs +++ /dev/null @@ -1,21 +0,0 @@ -module GF.Devel.PrintGFCC where - -import GF.GFCC.DataGFCC (GFCC) -import GF.GFCC.Raw.ConvertGFCC (fromGFCC) -import GF.GFCC.Raw.PrintGFCCRaw (printTree) -import GF.Devel.GFCCtoHaskell -import GF.Devel.GFCCtoJS -import GF.Text.UTF8 - --- top-level access to code generation - -prGFCC :: String -> GFCC -> String -prGFCC printer gr = case printer of - "haskell" -> grammar2haskell gr - "haskell_gadt" -> grammar2haskellGADT gr - "js" -> gfcc2js gr - _ -> printGFCC gr - -printGFCC :: GFCC -> String -printGFCC = encodeUTF8 . printTree . fromGFCC - diff --git a/src-3.0/GF/GFCC/PrintGFCC.hs b/src-3.0/GF/GFCC/PrintGFCC.hs new file mode 100644 index 000000000..d0dde05f4 --- /dev/null +++ b/src-3.0/GF/GFCC/PrintGFCC.hs @@ -0,0 +1,21 @@ +module GF.GFCC.PrintGFCC where + +import GF.GFCC.DataGFCC (GFCC) +import GF.GFCC.Raw.ConvertGFCC (fromGFCC) +import GF.GFCC.Raw.PrintGFCCRaw (printTree) +import GF.Devel.GFCCtoHaskell +import GF.Devel.GFCCtoJS +import GF.Text.UTF8 + +-- top-level access to code generation + +prGFCC :: String -> GFCC -> String +prGFCC printer gr = case printer of + "haskell" -> grammar2haskell gr + "haskell_gadt" -> grammar2haskellGADT gr + "js" -> gfcc2js gr + _ -> printGFCC gr + +printGFCC :: GFCC -> String +printGFCC = encodeUTF8 . printTree . fromGFCC + diff --git a/src-3.0/GFC.hs b/src-3.0/GFC.hs index 0fe0169d2..12c6e8681 100644 --- a/src-3.0/GFC.hs +++ b/src-3.0/GFC.hs @@ -2,7 +2,7 @@ module GFC (mainGFC) where -- module Main where import GF.Compile -import GF.Devel.PrintGFCC +import GF.GFCC.PrintGFCC import GF.GFCC.CId import GF.GFCC.DataGFCC import GF.GFCC.Raw.ParGFCCRaw -- cgit v1.2.3