GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 03:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: the optimizer should not filter out rules that refer to lexical categories

Browse Source
This commit is contained in:
krasimir
2009-06-18 17:31:49 +00:00
parent e3b38dc245
commit aaeecb9b5d
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,3 @@ pgfToCFG pgf lang = mkCFG (prCId (lookStartCat pgf)) extCats (startRules ++ conc
fruleToCFRule (c,FCoerce c') = fruleToCFRule (c,FCoerce c') =
[CFRule (fcatToCat c l) [NonTerminal (fcatToCat c' l)] (CFRes 0) [CFRule (fcatToCat c l) [NonTerminal (fcatToCat c' l)] (CFRes 0)
| l <- [0..catLinArity c-1]] | l <- [0..catLinArity c-1]]
isLiteralFCat :: FCat -> Bool
isLiteralFCat = (`elem` [fcatString, fcatInt, fcatFloat, fcatVar])

4
src/PGF/PMCFG.hs
View File

@@ -50,6 +50,8 @@ fcatInt = (-2)
fcatFloat = (-3) fcatFloat = (-3)
fcatVar = (-4) fcatVar = (-4)
isLiteralFCat :: FCat -> Bool
isLiteralFCat = (`elem` [fcatString, fcatInt, fcatFloat, fcatVar])
ppPMCFG :: ParserInfo -> Doc ppPMCFG :: ParserInfo -> Doc
ppPMCFG pinfo = ppPMCFG pinfo =
@@ -101,6 +103,6 @@ ppSeqId seqid = char 'S' <> int seqid
filterProductions prods = filterProductions prods =
fmap (Set.filter filterRule) prods fmap (Set.filter filterRule) prods
where where
filterRule (FApply funid args) = all (\fcat -> IntMap.member fcat prods) args filterRule (FApply funid args) = all (\fcat -> isLiteralFCat fcat || IntMap.member fcat prods) args
filterRule (FCoerce _) = True filterRule (FCoerce _) = True
filterRule _ = True filterRule _ = True