GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-23 09:52:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

GF.Grammar.Macros: add function collectPattOp

Browse Source 
collectPattOp :: (Patt -> [a]) -> Patt -> [a]
This commit is contained in:
hallgren
2012-10-25 16:12:21 +00:00
parent d185938952
commit b2965730f1
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/GF/Grammar/Macros.hs
View File

@@ -496,7 +496,7 @@ composPattOp op patt =
PAlt p1 p2 -> liftM2 PAlt (op p1) (op p2) PAlt p1 p2 -> liftM2 PAlt (op p1) (op p2)
PSeq p1 p2 -> liftM2 PSeq (op p1) (op p2) PSeq p1 p2 -> liftM2 PSeq (op p1) (op p2)
PRep p -> liftM PRep (op p) PRep p -> liftM PRep (op p)
_ -> return patt -- converts cases without subpatterns _ -> return patt -- covers cases without subpatterns
getTableType :: TInfo -> Err Type getTableType :: TInfo -> Err Type
getTableType i = case i of getTableType i = case i of
@@ -533,6 +533,21 @@ collectOp co trm = case trm of
Strs tt -> concatMap co tt Strs tt -> concatMap co tt
_ -> [] -- covers K, Vr, Cn, Sort _ -> [] -- covers K, Vr, Cn, Sort
collectPattOp :: (Patt -> [a]) -> Patt -> [a]
collectPattOp op patt =
case patt of
PC c ps -> concatMap op ps
PP qc ps -> concatMap op ps
PR as -> concatMap (op.snd) as
PT ty p -> op p
PAs x p -> op p
PImplArg p -> op p
PNeg p -> op p
PAlt p1 p2 -> op p1++op p2
PSeq p1 p2 -> op p1++op p2
PRep p -> op p
_ -> [] -- covers cases without subpatterns
-- | to find the word items in a term -- | to find the word items in a term
wordsInTerm :: Term -> [String] wordsInTerm :: Term -> [String]
wordsInTerm trm = filter (not . null) $ case trm of wordsInTerm trm = filter (not . null) $ case trm of