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

Changing rec to rec_ in PGF

Browse Source 
To make glasgow extensions happy we had to rename 'rec' to 'rec_' in sources
from PGF folder.
This commit is contained in:
jordi.saludes
2010-06-05 11:02:51 +00:00
parent aa7a254f69
commit 4061674fae
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime/haskell/PGF/Forest.hs
View File

@@ -116,12 +116,12 @@ getAbsTrees (Forest abs cnc forest root) fid =
guard (Set.null fvs)
return e
where
go rec fcat' (d,fcat)
go rec_ fcat' (d,fcat)
| fcat < totalCats cnc = return (Set.empty,EMeta (fcat'*10+d)) -- FIXME: here we assume that every rule has at most 10 arguments
| Set.member fcat rec = mzero
| Set.member fcat rec_ = mzero
| otherwise = foldForest (\funid args trees ->
do let CncFun fn lins = cncfuns cnc ! funid
args <- mapM (go (Set.insert fcat rec) fcat) (zip [0..] args)
args <- mapM (go (Set.insert fcat rec_) fcat) (zip [0..] args)
check_ho_fun fn args
`mplus`
trees)

6
src/runtime/haskell/PGF/Parse.hs
View File

@@ -191,12 +191,12 @@ getParseResult (PState pgf cnc chart items) ty@(DTyp _ start _) =
return (AK fid lbl)
Nothing -> mzero
go rec fcat' (d,fcat)
go rec_ fcat' (d,fcat)
| fcat < totalCats cnc = return (Set.empty,EMeta (fcat'*10+d)) -- FIXME: here we assume that every rule has at most 10 arguments
| Set.member fcat rec = mzero
| Set.member fcat rec_ = mzero
| otherwise = foldForest (\funid args trees ->
do let CncFun fn lins = cncfuns cnc ! funid
args <- mapM (go (Set.insert fcat rec) fcat) (zip [0..] args)
args <- mapM (go (Set.insert fcat rec_) fcat) (zip [0..] args)
check_ho_fun fn args
`mplus`
trees)