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

Made the preprocessor correct the path a #USEd file when it finds it on the search path while including it

Browse Source
This commit is contained in:
Neil Brown 2009-04-01 18:59:57 +00:00
parent 91092c17ff
commit 5bf1ffa785
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontends/PreprocessOccam.hs
View File

@ -65,11 +65,19 @@ preprocessFile m filename
= do (handle, realFilename) <- searchFile m filename = do (handle, realFilename) <- searchFile m filename
progress $ "Loading source file " ++ realFilename progress $ "Loading source file " ++ realFilename
origCS <- get origCS <- get
modify (\cs -> cs { csCurrentFile = realFilename }) let modFunc = if drop4 filename `Set.member` csUsedFiles origCS
then Set.insert (drop4 realFilename)
. Set.delete (drop4 filename)
else id
modify (\cs -> cs { csCurrentFile = realFilename
, csUsedFiles = modFunc $ csUsedFiles cs })
s <- liftIO $ hGetContents handle s <- liftIO $ hGetContents handle
toks <- preprocessSource m realFilename s toks <- preprocessSource m realFilename s
modify (\cs -> cs { csCurrentFile = csCurrentFile origCS }) modify (\cs -> cs { csCurrentFile = csCurrentFile origCS })
return toks return toks
where
-- drops 4 from the end:
drop4 = reverse . drop 4 . reverse
-- | Preprocesses source directly and returns its tokenised form ready for parsing. -- | Preprocesses source directly and returns its tokenised form ready for parsing.
preprocessSource :: Meta -> String -> String -> PassM [Token] preprocessSource :: Meta -> String -> String -> PassM [Token]