diff options
Diffstat (limited to 'src-3.0/GF/GFCC')
| -rw-r--r-- | src-3.0/GF/GFCC/OptimizeGFCC.hs | 10 | ||||
| -rw-r--r-- | src-3.0/GF/GFCC/PrintGFCC.hs | 13 |
2 files changed, 16 insertions, 7 deletions
diff --git a/src-3.0/GF/GFCC/OptimizeGFCC.hs b/src-3.0/GF/GFCC/OptimizeGFCC.hs index 59fb93ffd..7fc227c66 100644 --- a/src-3.0/GF/GFCC/OptimizeGFCC.hs +++ b/src-3.0/GF/GFCC/OptimizeGFCC.hs @@ -13,7 +13,10 @@ import qualified Data.Map as Map -- suffix analysis followed by common subexpression elimination optGFCC :: GFCC -> GFCC -optGFCC gfcc = gfcc { +optGFCC = cseOptimize . suffixOptimize + +suffixOptimize :: GFCC -> GFCC +suffixOptimize gfcc = gfcc { concretes = Map.map opt (concretes gfcc) } where @@ -23,6 +26,11 @@ optGFCC gfcc = gfcc { printnames = Map.map optTerm (printnames cnc) } +cseOptimize :: GFCC -> GFCC +cseOptimize gfcc = gfcc { + concretes = Map.map subex (concretes gfcc) + } + -- analyse word form lists into prefix + suffixes -- suffix sets can later be shared by subex elim diff --git a/src-3.0/GF/GFCC/PrintGFCC.hs b/src-3.0/GF/GFCC/PrintGFCC.hs index aea34fb68..6eee6f112 100644 --- a/src-3.0/GF/GFCC/PrintGFCC.hs +++ b/src-3.0/GF/GFCC/PrintGFCC.hs @@ -5,16 +5,17 @@ import GF.GFCC.Raw.ConvertGFCC (fromGFCC) import GF.GFCC.Raw.PrintGFCCRaw (printTree) import GF.GFCC.GFCCtoHaskell import GF.GFCC.GFCCtoJS +import GF.Infra.Option 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 +prGFCC :: OutputFormat -> GFCC -> String +prGFCC fmt gr = case fmt of + FmtGFCC -> printGFCC gr + FmtJavaScript -> gfcc2js gr + FmtHaskell -> grammar2haskell gr + FmtHaskellGADT -> grammar2haskellGADT gr printGFCC :: GFCC -> String printGFCC = encodeUTF8 . printTree . fromGFCC |