diff --git a/src/plugins/Plugins/Parser.hs b/src/plugins/Plugins/Parser.hs index 9638e99..6ba0830 100644 --- a/src/plugins/Plugins/Parser.hs +++ b/src/plugins/Plugins/Parser.hs @@ -28,9 +28,7 @@ import Data.List import Data.Char import Data.Either -import Language.Haskell.Parser -import Language.Haskell.Syntax -import Language.Haskell.Pretty +import Language.Haskell.Hsx -- -- | parse a file (as a string) as Haskell src @@ -40,7 +38,7 @@ parse :: FilePath -- ^ module name -> Either String HsModule -- ^ abstract syntax parse f fsrc = - case parseModuleWithMode (ParseMode f) fsrc of + case parseFileContentsWithMode (ParseMode f) fsrc of ParseOk src -> Right src ParseFailed loc _ -> Left $ srcmsg loc where diff --git a/src/plugins/plugins.conf.in.cpp b/src/plugins/plugins.conf.in.cpp index b57e59d..d35891a 100644 --- a/src/plugins/plugins.conf.in.cpp +++ b/src/plugins/plugins.conf.in.cpp @@ -14,7 +14,7 @@ Package { include_dirs = [], source_dirs = [], extra_libraries = [], - package_deps = [ "altdata", "hi", "unix", "haskell-src", "posix" ], + package_deps = [ "altdata", "hi", "unix", "haskell-src-exts", "posix" ], extra_ghc_opts = [], extra_cc_opts = [], extra_ld_opts = [] @@ -51,7 +51,7 @@ hs-libraries: HSplugins extra-libraries: include-dirs: includes: Linker.h -depends: altdata, hi, haskell-src, Cabal +depends: altdata, hi, haskell-src-exts, Cabal hugs-options: cc-options: ld-options: