diff options
| author | aarne <aarne@cs.chalmers.se> | 2007-12-14 07:31:53 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2007-12-14 07:31:53 +0000 |
| commit | 745f6ac83f207709127bbec22c3484ad06ec6907 (patch) | |
| tree | f5ae6b4df981f6c40289fca0a9cf0d10b7b77de0 /src/GF/UseGrammar/Custom.hs | |
| parent | 9e0dd0a41a9d386d4cc9ae6bab6fa2e1862e829f (diff) | |
restored CanonToGFCC as a wrapper of GFCC generation
Diffstat (limited to 'src/GF/UseGrammar/Custom.hs')
| -rw-r--r-- | src/GF/UseGrammar/Custom.hs | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/GF/UseGrammar/Custom.hs b/src/GF/UseGrammar/Custom.hs index 45421951f..983b7f683 100644 --- a/src/GF/UseGrammar/Custom.hs +++ b/src/GF/UseGrammar/Custom.hs @@ -35,17 +35,9 @@ import qualified GF.Grammar.Grammar as G import qualified GF.Canon.AbsGFC as A import qualified GF.Canon.GFC as C -import qualified GF.Devel.GrammarToGFCC as GFCC -import qualified GF.Devel.GFCCtoHaskell as CCH -import GF.Devel.PrintGFCC import qualified GF.Devel.GFCCtoJS as JS -import GF.GFCC.CheckGFCC (checkGFCCmaybe) -import GF.GFCC.OptimizeGFCC - ---import qualified GF.Canon.CanonToGFCC as GFCC ---import qualified GF.Devel.GFCCtoHaskell as CCH ---import qualified GF.GFCC.DataGFCC as DataGFCC ---import qualified GF.Canon.CanonToJS as JS (prCanon2js) +import GF.Canon.CanonToGFCC +import qualified GF.Devel.GFCCtoHaskell as CCH import qualified GF.Source.AbsGF as GF import qualified GF.Grammar.MMacros as MM @@ -351,21 +343,6 @@ customMultiGrammarPrinter = ,(strCI "cfg-prolog", CnvProlog.prtCMulti) ] ----Options -> CanonGrammar -> String -canon2gfccPr opts = printGFCC . canon2gfcc opts -canon2gfcc opts = source2gfcc opts . canon2source ---- -canon2source = err error id . canon2sourceGrammar . unSubelimCanon - -source2gfcc opts gf = - let - (abs,gfcc) = GFCC.mkCanon2gfcc opts (gfcabs gf) gf - gfcc1 = maybe undefined id $ checkGFCCmaybe gfcc - in if oElem (iOpt "noopt") opts then gfcc1 else optGFCC gfcc1 - -gfcabs gfc = - prt $ head $ M.allConcretes gfc $ maybe (error "no abstract") id $ - M.greatestAbstract gfc - customSyntaxPrinter = customData "Syntax printers, selected by option -printer=x" $ |