gf works with the new gfcc format

1 files changed, 6 insertions, 6 deletions

diff --git a/src/GF/Speech/GrammarToVoiceXML.hs b/src/GF/Speech/GrammarToVoiceXML.hs
index 5415c8184..f84033e9c 100644
--- a/src/GF/Speech/GrammarToVoiceXML.hs
+++ b/src/GF/Speech/GrammarToVoiceXML.hs
@@ -11,9 +11,9 @@
 module GF.Speech.GrammarToVoiceXML (grammar2vxml) where
 
 import GF.Canon.CanonToGFCC (mkCanon2gfcc)
-import qualified GF.Canon.GFCC.AbsGFCC as C
-import GF.Canon.GFCC.DataGFCC (GFCC(..), Abstr(..), mkGFCC, lookMap)
-
+import qualified GF.GFCC.AbsGFCC as C
+import GF.GFCC.DataGFCC (GFCC(..), Abstr(..), mkGFCC)
+import GF.GFCC.Macros
 import qualified GF.Canon.GFC as GFC
 import GF.Canon.AbsGFC (Term)
 import GF.Canon.PrintGFC (printTree)
@@ -65,14 +65,14 @@ prid :: VIdent -> String
 prid (C.CId x) = x
 
 vSkeleton :: GFC.CanonGrammar -> (VIdent,VSkeleton)
-vSkeleton = gfccSkeleton . mkGFCC . mkCanon2gfcc
+vSkeleton = gfccSkeleton . mkCanon2gfcc
 
 gfccSkeleton :: GFCC -> (VIdent,VSkeleton)
 gfccSkeleton gfcc = (absname gfcc, ts)
   where a = abstract gfcc
-        ts = [(c,[(f,ft f) | f <- fs]) | (c,fs) <- Map.toList (cats a)]
+        ts = [(c,[(f,ft f) | f <- fs]) | (c,fs) <- Map.toList (catfuns a)]
         ft f = case lookMap (error $ prid f) f (funs a) of
-                 C.Typ args _ -> args
+                 (ty,_) -> fst $ GF.GFCC.Macros.catSkeleton ty
 
 --
 -- * Questions to ask