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/Speech | |
| parent | 9e0dd0a41a9d386d4cc9ae6bab6fa2e1862e829f (diff) | |
restored CanonToGFCC as a wrapper of GFCC generation
Diffstat (limited to 'src/GF/Speech')
| -rw-r--r-- | src/GF/Speech/GrammarToVoiceXML.hs | 5 | ||||
| -rw-r--r-- | src/GF/Speech/TransformCFG.hs | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/GF/Speech/GrammarToVoiceXML.hs b/src/GF/Speech/GrammarToVoiceXML.hs index b120c5538..7d05d4a46 100644 --- a/src/GF/Speech/GrammarToVoiceXML.hs +++ b/src/GF/Speech/GrammarToVoiceXML.hs @@ -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) diff --git a/src/GF/Speech/TransformCFG.hs b/src/GF/Speech/TransformCFG.hs index 076477d90..545bc021c 100644 --- a/src/GF/Speech/TransformCFG.hs +++ b/src/GF/Speech/TransformCFG.hs @@ -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 |