Merge pull request #470 from gibiansky/ghc710-travis

Adding GHC 7.10 to travis tests

.travis.yml

@@ -5,7 +5,7 @@
 env:
  - CABALVER=1.18 GHCVER=7.6.3
  - CABALVER=1.18 GHCVER=7.8.4 # see note about Alex/Happy for GHC >= 7.8
-# - CABALVER=1.22 GHCVER=7.10.1
+ - CABALVER=1.22 GHCVER=7.10.1
 # - CABALVER=head GHCVER=head   # see section about GHC HEAD snapshots
 
 # Note: the distinction between `before_install` and `install` is not important.
@@ -51,7 +51,10 @@ script:
 # Build and run the test suite
  - travis_retry cabal install --only-dependencies --enable-tests
  - travis_retry cabal configure --enable-tests
- - travis_retry cabal test --show-details=always
+ - |
+   if [ ${GHCVER%.*} = "7.8" ]; then
+    travis_retry cabal test --show-details=always
+   fi
  - |
    if [ ${GHCVER%.*} = "7.8" ]; then
     ./verify_formatting.py

Hspec.hs

@@ -2,7 +2,7 @@
 -- Keep all the language pragmas here so it can be compiled separately.
 module Main where
 import Prelude
-import GHC
+import GHC hiding (Qualified)
 import GHC.Paths
 import Data.IORef
 import Control.Monad

src/IHaskell/Eval/Evaluate.hs

@@ -183,8 +183,9 @@ initializeImports = do
                              pkg <- db
                              depId <- depends pkg
                              dep <- filter ((== depId) . installedPackageId) db
-                             guard
-                               (iHaskellPkgName `isPrefixOf` packageIdString (packageConfigId dep))
+                             let idString = packageIdString' dflags (packageConfigId dep)
+                             guard (iHaskellPkgName `isPrefixOf` idString)
+
 
                            -- ideally the Paths_ihaskell module could provide a way to get the hash too
                            -- (ihaskell-0.2.0.5-f2bce922fa881611f72dfc4a854353b9), for now. Things will end badly if you also

src/IHaskell/Eval/Hoogle.hs

@@ -66,7 +66,7 @@ query str = do
 urlEncode :: String -> String
 urlEncode [] = []
 urlEncode (ch:t)
-  | (isAscii ch && isAlphaNum ch) || ch `P.elem` "-_.~" = ch : urlEncode t
+  | (isAscii ch && isAlphaNum ch) || ch `P.elem` ("-_.~" :: String) = ch : urlEncode t
   | not (isAscii ch) = P.foldr escape (urlEncode t) (eightBs [] (P.fromEnum ch))
   | otherwise = escape (P.fromEnum ch) (urlEncode t)
   where