GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-22 19:22:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

new conversion MCFG -> FCFG, new grammar printers for FCFG

Browse Source
This commit is contained in:
peb
2006-06-07 16:06:49 +00:00
parent d56e630046
commit 643507e4f3
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/GF/Conversion/GFC.hs
View File

@@ -32,6 +32,7 @@ import qualified GF.Conversion.RemoveErasing as RemEra
import qualified GF.Conversion.RemoveEpsilon as RemEps import qualified GF.Conversion.RemoveEpsilon as RemEps
import qualified GF.Conversion.SimpleToMCFG as S2M import qualified GF.Conversion.SimpleToMCFG as S2M
import qualified GF.Conversion.SimpleToFCFG as S2FM import qualified GF.Conversion.SimpleToFCFG as S2FM
import qualified GF.Conversion.MCFGtoFCFG as M2FM
import qualified GF.Conversion.MCFGtoCFG as M2C import qualified GF.Conversion.MCFGtoCFG as M2C
import GF.Infra.Print import GF.Infra.Print
@@ -41,10 +42,12 @@ import GF.System.Tracing
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- * GFC -> MCFG & CFG, using options to decide which conversion is used -- * GFC -> MCFG & CFG, using options to decide which conversion is used
convertGFC :: Options -> (CanonGrammar, Ident) -> (SGrammar, (EGrammar, (MGrammar, FGrammar, CGrammar))) convertGFC :: Options -> (CanonGrammar, Ident)
-> (SGrammar, (EGrammar, (MGrammar, FGrammar, CGrammar)))
convertGFC opts = \g -> let s = g2s g convertGFC opts = \g -> let s = g2s g
e = s2e s e = s2e s
in trace2 "Options" (show opts) (s, (e, (e2m e, s2fm s, e2c e))) m = e2m e
in trace2 "Options" (show opts) (s, (e, (m, s2fm s, e2c e)))
where e2c = M2C.convertGrammar where e2c = M2C.convertGrammar
e2m = case getOptVal opts firstCat of e2m = case getOptVal opts firstCat of
Just cat -> flip erasing [identC cat] Just cat -> flip erasing [identC cat]
@@ -55,6 +58,7 @@ convertGFC opts = \g -> let s = g2s g
Just "epsilon" -> epsilon . nondet Just "epsilon" -> epsilon . nondet
_ -> nondet _ -> nondet
s2fm= S2FM.convertGrammar s2fm= S2FM.convertGrammar
m2fm= M2FM.convertGrammar
g2s = case getOptVal opts gfcConversion of g2s = case getOptVal opts gfcConversion of
Just "finite" -> finite . simple Just "finite" -> finite . simple
Just "finite2" -> finite . finite . simple Just "finite2" -> finite . finite . simple
@@ -90,6 +94,10 @@ gfc2fcfg opts g = fcfg
where where
(_, fcfg, _) = snd (snd (convertGFC opts g)) (_, fcfg, _) = snd (snd (convertGFC opts g))
mcfg2fcfg :: MGrammar -> FGrammar
mcfg2fcfg = M2FM.convertGrammar
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- * single step conversions -- * single step conversions

1
src/GF/UseGrammar/Custom.hs
View File

@@ -309,6 +309,7 @@ customGrammarPrinter =
-- grammar conversions: -- grammar conversions:
,(strCI "mcfg", \_ -> Prt.prt . stateMCFG) ,(strCI "mcfg", \_ -> Prt.prt . stateMCFG)
,(strCI "fcfg", \_ -> Prt.prt . stateFCFG) ,(strCI "fcfg", \_ -> Prt.prt . stateFCFG)
,(strCI "mcfg2fcfg",\_ -> Prt.prt . Cnv.mcfg2fcfg . stateMCFG)
,(strCI "cfg", \_ -> Prt.prt . stateCFG) ,(strCI "cfg", \_ -> Prt.prt . stateCFG)
,(strCI "pinfo", \_ -> Prt.prt . statePInfo) ,(strCI "pinfo", \_ -> Prt.prt . statePInfo)
,(strCI "abstract", \_ -> Prt.prtAfter "\n" . Cnv.gfc2abstract . stateGrammarLang) ,(strCI "abstract", \_ -> Prt.prtAfter "\n" . Cnv.gfc2abstract . stateGrammarLang)