suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidied up the type of handleDirective to make it easier to use

Browse Source
This commit is contained in:
Neil Brown 2008-03-05 16:05:21 +00:00
parent 03eab6c142
commit d02b771572
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontends/PreprocessOccam.hs
View File

@ -102,8 +102,7 @@ expandIncludes (t:ts) = expandIncludes ts >>* (t :)
preprocessOccam :: [Token] -> PassM [Token] preprocessOccam :: [Token] -> PassM [Token]
preprocessOccam [] = return [] preprocessOccam [] = return []
preprocessOccam ((m, TokPreprocessor s):ts) preprocessOccam ((m, TokPreprocessor s):ts)
= do beforeRest <- handleDirective m (stripPrefix s) = handleDirective m (stripPrefix s) ts >>= preprocessOccam
beforeRest ts >>= preprocessOccam
where where
stripPrefix :: String -> String stripPrefix :: String -> String
stripPrefix (' ':cs) = stripPrefix cs stripPrefix (' ':cs) = stripPrefix cs
@ -131,9 +130,12 @@ preprocessOccam (t:ts)
type DirectiveFunc = Meta -> [String] -> PassM ([Token] -> PassM [Token]) type DirectiveFunc = Meta -> [String] -> PassM ([Token] -> PassM [Token])
-- | Call the handler for a preprocessor directive. -- | Call the handler for a preprocessor directive.
handleDirective :: Meta -> String -> PassM ([Token] -> PassM [Token]) handleDirective :: Meta -> String -> [Token] -> PassM [Token]
handleDirective m s = lookup s directives handleDirective m s x
= do f <- lookup s directives
f x
where where
lookup :: String -> [(Regex, DirectiveFunc)] -> PassM ([Token] -> PassM [Token])
-- FIXME: This should really be an error rather than a warning, but -- FIXME: This should really be an error rather than a warning, but
-- currently we support so few preprocessor directives that this is more -- currently we support so few preprocessor directives that this is more
-- useful. -- useful.