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

restored CanonToGFCC as a wrapper of GFCC generation

Browse Source
This commit is contained in:
aarne
2007-12-14 07:31:53 +00:00
parent 9e0dd0a41a
commit 745f6ac83f
4 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/GF/Speech/GrammarToVoiceXML.hs
View File

@@ -10,7 +10,7 @@
module GF.Speech.GrammarToVoiceXML (grammar2vxml) where
import GF.Canon.CanonToGFCC (mkCanon2gfcc)
import GF.Canon.CanonToGFCC (canon2gfcc)
import qualified GF.GFCC.Raw.AbsGFCCRaw as C
import GF.GFCC.DataGFCC (GFCC(..), Abstr(..))
import GF.GFCC.Macros
@@ -32,6 +32,7 @@ import GF.UseGrammar.GetTree (string2treeErr)
import GF.UseGrammar.Linear (linTree2strings)
import GF.Infra.Ident
import GF.Infra.Option (noOptions)
import GF.Infra.Modules
import GF.Data.Operations
@@ -65,7 +66,7 @@ prid :: VIdent -> String
prid (C.CId x) = x
vSkeleton :: GFC.CanonGrammar -> (VIdent,VSkeleton)
vSkeleton = gfccSkeleton . mkCanon2gfcc
vSkeleton = gfccSkeleton . canon2gfcc noOptions
gfccSkeleton :: GFCC -> (VIdent,VSkeleton)
gfccSkeleton gfcc = (absname gfcc, ts)

4
src/GF/Speech/TransformCFG.hs
View File

@@ -16,7 +16,7 @@
module GF.Speech.TransformCFG where
import GF.Canon.CanonToGFCC (mkCanon2gfcc)
import GF.Canon.CanonToGFCC (canon2gfcc)
import qualified GF.GFCC.Raw.AbsGFCCRaw as C
import GF.GFCC.Macros (lookType,catSkeleton)
import GF.GFCC.DataGFCC (GFCC)
@@ -85,7 +85,7 @@ getStartCatCF :: Options -> StateGrammar -> String
getStartCatCF opts sgr = getStartCat opts sgr ++ "{}.s"
stateGFCC :: StateGrammar -> GFCC
stateGFCC = mkCanon2gfcc . stateGrammarST
stateGFCC = canon2gfcc noOptions . stateGrammarST
-- * Grammar filtering