msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

fix the tree extractor in the incremental parser to check for cyclic charts and coercion rules.

Browse Source
This commit is contained in:
krasimir
2008-06-12 13:34:47 +00:00
parent 8f8709b9fa
commit 43f8ec9228
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src-3.0/PGF/Parsing/FCFG/Incremental.hs
View File

@@ -93,13 +93,16 @@ extractExps (State pinfo chart items) start = exps
let (FRule fn _ args cat lins) = allRules pinfo ! ruleid let (FRule fn _ args cat lins) = allRules pinfo ! ruleid
lbl <- indices lins lbl <- indices lins
fid <- Map.lookup (PK c lbl 0) (passive st) fid <- Map.lookup (PK c lbl 0) (passive st)
go fid go Set.empty fid
go fid = do go rec fid
set <- IntMap.lookup fid (forest st) | Set.member fid rec = mzero
| otherwise = do set <- IntMap.lookup fid (forest st)
Passive ruleid args <- Set.toList set Passive ruleid args <- Set.toList set
let (FRule fn _ _ cat lins) = allRules pinfo ! ruleid let (FRule fn _ _ cat lins) = allRules pinfo ! ruleid
args <- mapM go args if fn == wildCId
then go (Set.insert fid rec) (head args)
else do args <- mapM (go (Set.insert fid rec)) args
return (EApp fn args) return (EApp fn args)
process fn !rules [] acc_chart = acc_chart process fn !rules [] acc_chart = acc_chart