From 1f1a0d7ada8efb576e85552e7ba14b2ca0336c7b Mon Sep 17 00:00:00 2001 From: krasimir Date: Tue, 14 Dec 2010 21:25:43 +0000 Subject: [PATCH] PGFToCFG should use the full production set because the lexicon is now split out --- src/compiler/GF/Speech/PGFToCFG.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/GF/Speech/PGFToCFG.hs b/src/compiler/GF/Speech/PGFToCFG.hs index 4b1afa8d6..163f02537 100644 --- a/src/compiler/GF/Speech/PGFToCFG.hs +++ b/src/compiler/GF/Speech/PGFToCFG.hs @@ -37,7 +37,7 @@ pgfToCFG pgf lang = mkCFG (showCId (lookStartCat pgf)) extCats (startRules ++ co cnc = lookConcr pgf lang rules :: [(FId,Production)] - rules = [(fcat,prod) | (fcat,set) <- IntMap.toList (PGF.pproductions cnc) + rules = [(fcat,prod) | (fcat,set) <- IntMap.toList (PGF.productions cnc) , prod <- Set.toList set] fcatCats :: Map FId Cat @@ -58,7 +58,7 @@ pgfToCFG pgf lang = mkCFG (showCId (lookStartCat pgf)) extCats (startRules ++ co topdownRules cat = f cat [] where - f cat rules = maybe rules (Set.fold g rules) (IntMap.lookup cat (pproductions cnc)) + f cat rules = maybe rules (Set.fold g rules) (IntMap.lookup cat (productions cnc)) g (PApply funid args) rules = (cncfuns cnc ! funid,args) : rules g (PCoerce cat) rules = f cat rules