diff options
| author | aarne <aarne@cs.chalmers.se> | 2006-09-05 12:14:13 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2006-09-05 12:14:13 +0000 |
| commit | 8484cfab1b1d27ba7046798c2821c138e4f5fabf (patch) | |
| tree | b1b6e5660b736b190cd5b9bcf7aa59e1cb798a5f /src/GF/UseGrammar | |
| parent | 1807dc437960afd13adc17cce52c54992daa9570 (diff) | |
starting GFCC format
Diffstat (limited to 'src/GF/UseGrammar')
| -rw-r--r-- | src/GF/UseGrammar/Custom.hs | 2 | ||||
| -rw-r--r-- | src/GF/UseGrammar/Linear.hs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/GF/UseGrammar/Custom.hs b/src/GF/UseGrammar/Custom.hs index 07eda0a37..b18dd6357 100644 --- a/src/GF/UseGrammar/Custom.hs +++ b/src/GF/UseGrammar/Custom.hs @@ -34,6 +34,7 @@ import GF.Grammar.Values import qualified GF.Grammar.Grammar as G import qualified GF.Canon.AbsGFC as A import qualified GF.Canon.GFC as C +import qualified GF.Canon.CanonToGFCC as GFCC import qualified GF.Source.AbsGF as GF import qualified GF.Grammar.MMacros as MM import GF.Grammar.AbsCompute @@ -341,6 +342,7 @@ customMultiGrammarPrinter = customData "Printers for multiple grammars, selected by option -printer=x" $ [ (strCI "gfcm", const MC.prCanon) + ,(strCI "gfcc", const GFCC.prCanon2gfcc) ,(strCI "header", const (MC.prCanonMGr . unoptimizeCanon)) ,(strCI "cfgm", prCanonAsCFGM) ,(strCI "graph", visualizeCanonGrammar) diff --git a/src/GF/UseGrammar/Linear.hs b/src/GF/UseGrammar/Linear.hs index f18091810..260bfb9a2 100644 --- a/src/GF/UseGrammar/Linear.hs +++ b/src/GF/UseGrammar/Linear.hs @@ -153,6 +153,7 @@ unoptimizeCanonMod g = convMod where ps <- mapM term2patt vs return $ T ty [Cas [p] t | (p,t) <- zip ps ts] FV ts -> liftM FV $ mapM exp ts + I _ -> comp t _ -> composOp exp t where alls = allParamValues g |