Permalink
Browse files

Merge pull request #4 from hesselink/master

Updated dependencies and small bugfix
  • Loading branch information...
2 parents e52cc5a + bd294da commit 4c57ed462c55d20c880e9b4125f935fd120a9602 @luqui committed Dec 23, 2011
Showing with 6 additions and 4 deletions.
  1. +4 −2 Main.hs
  2. +2 −2 hothasktags.cabal
View
@@ -163,8 +163,10 @@ haskellSource file = do
contents <- readFile file
let needsCpp = maybe False (L.CPP `elem`) (L.readExtensions contents)
if needsCpp
- then CPP.runCpphs CPP.defaultCpphsOptions file contents
+ then CPP.runCpphs cppOpts file contents
else return contents
+ where
+ cppOpts = CPP.defaultCpphsOptions { CPP.boolopts = CPP.defaultBoolOptions { CPP.hashline = False } }
makeDatabase :: [FilePath] -> IO Database
@@ -185,7 +187,7 @@ makeDatabase files = do
L.extensions = [L.MultiParamTypeClasses, L.ExistentialQuantification, L.FlexibleContexts],
L.ignoreLanguagePragmas = False,
L.ignoreLinePragmas = False,
- L.fixities = []
+ L.fixities = Nothing
}
moduleFile :: L.Module L.SrcSpanInfo -> FilePath
View
@@ -30,7 +30,7 @@ executable hothasktags
build-depends:
base == 4.*,
containers,
- haskell-src-exts >= 1.8 && < 1.11,
- cpphs == 1.11.*
+ haskell-src-exts == 1.11.*,
+ cpphs >= 1.11 && < 1.14
main-is: Main.hs
ghc-options: -W

0 comments on commit 4c57ed4

Please sign in to comment.