diff options
| author | jordi.saludes <jordi.saludes@upc.edu> | 2010-06-05 11:02:51 +0000 |
|---|---|---|
| committer | jordi.saludes <jordi.saludes@upc.edu> | 2010-06-05 11:02:51 +0000 |
| commit | 4061674fae8f3d0592acc864631eafda5b613c8a (patch) | |
| tree | 05a369f5d6aa772e0681585642cfc29faa30a604 | |
| parent | aa7a254f6984b5d105399c87543660b8247be3ba (diff) | |
Changing rec to rec_ in PGF
To make glasgow extensions happy we had to rename 'rec' to 'rec_' in sources
from PGF folder.
| -rw-r--r-- | src/runtime/haskell/PGF/Forest.hs | 6 | ||||
| -rw-r--r-- | src/runtime/haskell/PGF/Parse.hs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/runtime/haskell/PGF/Forest.hs b/src/runtime/haskell/PGF/Forest.hs index ece6a8000..c477955e1 100644 --- a/src/runtime/haskell/PGF/Forest.hs +++ b/src/runtime/haskell/PGF/Forest.hs @@ -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)
diff --git a/src/runtime/haskell/PGF/Parse.hs b/src/runtime/haskell/PGF/Parse.hs index f48fab097..1e4c2cdde 100644 --- a/src/runtime/haskell/PGF/Parse.hs +++ b/src/runtime/haskell/PGF/Parse.hs @@ -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)
|