From b447cf1a047a6f6e1c4945e809bffa57c88a08af Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 13 Dec 2007 20:19:47 +0000 Subject: new GFCC concrete syntax in place everywhere --- src/GF/Speech/GrammarToVoiceXML.hs | 6 +++--- src/GF/Speech/TransformCFG.hs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/GF/Speech') diff --git a/src/GF/Speech/GrammarToVoiceXML.hs b/src/GF/Speech/GrammarToVoiceXML.hs index f84033e9c..b120c5538 100644 --- a/src/GF/Speech/GrammarToVoiceXML.hs +++ b/src/GF/Speech/GrammarToVoiceXML.hs @@ -11,8 +11,8 @@ module GF.Speech.GrammarToVoiceXML (grammar2vxml) where import GF.Canon.CanonToGFCC (mkCanon2gfcc) -import qualified GF.GFCC.AbsGFCC as C -import GF.GFCC.DataGFCC (GFCC(..), Abstr(..), mkGFCC) +import qualified GF.GFCC.Raw.AbsGFCCRaw as C +import GF.GFCC.DataGFCC (GFCC(..), Abstr(..)) import GF.GFCC.Macros import qualified GF.Canon.GFC as GFC import GF.Canon.AbsGFC (Term) @@ -281,4 +281,4 @@ isConsFun f = "Cons" `isPrefixOf` prIdent f baseSize :: (VIdent, [(VIdent, [VIdent])]) -> Int baseSize (_,rules) = length bs where Just (_,bs) = find (isBaseFun . fst) rules --} \ No newline at end of file +-} diff --git a/src/GF/Speech/TransformCFG.hs b/src/GF/Speech/TransformCFG.hs index bcd61f428..076477d90 100644 --- a/src/GF/Speech/TransformCFG.hs +++ b/src/GF/Speech/TransformCFG.hs @@ -17,7 +17,7 @@ module GF.Speech.TransformCFG where import GF.Canon.CanonToGFCC (mkCanon2gfcc) -import qualified GF.GFCC.AbsGFCC as C +import qualified GF.GFCC.Raw.AbsGFCCRaw as C import GF.GFCC.Macros (lookType,catSkeleton) import GF.GFCC.DataGFCC (GFCC) import GF.Conversion.Types -- cgit v1.2.3