diff options
| author | krasimir <krasimir@chalmers.se> | 2010-06-30 07:40:22 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2010-06-30 07:40:22 +0000 |
| commit | eb0bd54e68ac3c776750c88ce4eb3d03954777f2 (patch) | |
| tree | ea7a4c2077ecf364bff9cf8743b7977b30678a9a /src/runtime/haskell/PGF/Optimize.hs | |
| parent | 4c576ebbc9d0e4f470a6a84d6e59a95873f9d67a (diff) | |
rename isLiteralFCat -> isPredefFId, fcat(String|Int|Float) -> fid(String|Int|Float)
Diffstat (limited to 'src/runtime/haskell/PGF/Optimize.hs')
| -rw-r--r-- | src/runtime/haskell/PGF/Optimize.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime/haskell/PGF/Optimize.hs b/src/runtime/haskell/PGF/Optimize.hs index 6151c26a9..f8e089830 100644 --- a/src/runtime/haskell/PGF/Optimize.hs +++ b/src/runtime/haskell/PGF/Optimize.hs @@ -173,8 +173,8 @@ filterProductions prods0 prods where set1 = Set.filter (filterRule prods0) set - filterRule prods0 (PApply funid args) = all (\fcat -> isLiteralFCat fcat || IntMap.member fcat prods0) args - filterRule prods0 (PCoerce fcat) = isLiteralFCat fcat || IntMap.member fcat prods0 + filterRule prods0 (PApply funid args) = all (\fid -> isPredefFId fid || IntMap.member fid prods0) args + filterRule prods0 (PCoerce fid) = isPredefFId fid || IntMap.member fid prods0 filterRule prods0 _ = True updateConcrete abs cnc = @@ -191,8 +191,8 @@ updateConcrete abs cnc = then Nothing else Just prods' - is_ho_prod (PApply _ [fid]) | fid == fcatVar = True - is_ho_prod _ = False + is_ho_prod (PApply _ [fid]) | fid == fidVar = True + is_ho_prod _ = False ho_fids :: IntSet.IntSet ho_fids = IntSet.fromList [fid | cat <- ho_cats |