Re: [jhc] darcs patch: Fixer/VMap: avoid clashing with Data.Typ... (and 1 more)
Thanks! Patches have been applied and pushed.
John
On Mon, May 12, 2014 at 12:22 AM, Sergei Trofimovich
2 patches for repository http://repetae.net/repos/jhc:
Mon May 12 10:15:45 FET 2014 Sergei Trofimovich
* Fixer/VMap: avoid clashing with Data.Typeable.Proxy Fails on ghc-7.8 thusly: [ 83 of 182] Compiling Fixer.VMap ( src/Fixer/VMap.hs, src/Fixer/VMap.o )
src/Fixer/VMap.hs:29:28: Ambiguous occurrence Proxy It could refer to either Fixer.VMap.Proxy , defined at src/Fixer/VMap.hs:33:1 or Data.Typeable.Proxy , imported from Data.Typeable at src/Fixer/VMap.hs:16:1-20 (and originally defined in Data.Proxy )
Mon May 12 10:21:14 FET 2014 Sergei Trofimovich
* Util.Interact: fix build failure against readline On ghc with both readline and editline enabled fails thusly: [ 84 of 182] Compiling Util.Interact ( src/Util/Interact.hs, src/Util/Interact.o )
src/Util/Interact.hs:41:5: Not in scope: setCompletionEntryFunction
src/Util/Interact.hs:42:10: Not in scope: readline Perhaps you meant one of these: readLine (line 40), readFile (imported from IO)
src/Util/Interact.hs:46:19: Not in scope: addHistory src/Util/Interact.hs:154:29: Not in scope: addHistory src/Util/Interact.hs:188:19: Not in scope: addHistory
[Fixer/VMap: avoid clashing with Data.Typeable.Proxy Sergei Trofimovich
**20140512071545 Ignore-this: 10d60bdf29789790a666b6231575f1b1 Fails on ghc-7.8 thusly: [ 83 of 182] Compiling Fixer.VMap ( src/Fixer/VMap.hs, src/Fixer/VMap.o )
src/Fixer/VMap.hs:29:28: Ambiguous occurrence 'Proxy' It could refer to either 'Fixer.VMap.Proxy', defined at src/Fixer/VMap.hs:33:1 or 'Data.Typeable.Proxy', imported from 'Data.Typeable' at src/Fixer/VMap.hs:16:1-20 (and originally defined in 'Data.Proxy') ] hunk ./src/Fixer/VMap.hs 16 )where
import Data.Monoid(Monoid(..)) -import Data.Typeable +import qualified Data.Typeable as T -- qualified to avoid clashing with T.Proxy import List(intersperse) import qualified Data.Map as Map import qualified Data.Set as Set hunk ./src/Fixer/VMap.hs 31 vmapArgs :: Map.Map (n,Int) (VMap p n), vmapNodes :: Either (Proxy p) (Set.Set n) } - deriving(Typeable) + deriving(T.Typeable)
data Proxy p = Proxy p | DepthExceeded hunk ./src/Fixer/VMap.hs 34 - deriving(Eq,Ord,Typeable) + deriving(Eq,Ord,T.Typeable)
instance Show p => Show (Proxy p) where showsPrec n (Proxy p) = showsPrec n p [Util.Interact: fix build failure against readline Sergei Trofimovich
**20140512072114 Ignore-this: b064847e105d135da3358607654de267 On ghc with both readline and editline enabled fails thusly: [ 84 of 182] Compiling Util.Interact ( src/Util/Interact.hs, src/Util/Interact.o )
src/Util/Interact.hs:41:5: Not in scope: 'setCompletionEntryFunction'
src/Util/Interact.hs:42:10: Not in scope: 'readline' Perhaps you meant one of these: 'readLine' (line 40), 'readFile' (imported from IO)
src/Util/Interact.hs:46:19: Not in scope: 'addHistory' src/Util/Interact.hs:154:29: Not in scope: 'addHistory' src/Util/Interact.hs:188:19: Not in scope: 'addHistory' ] hunk ./src/Util/Interact.hs 26 import IO #if USE_EDITLINE ;import System.Console.Editline.Readline -#elif USE_NOLINE +#elif USE_READLINE ;import System.Console.Readline #endif
-- John Meacham - http://notanumber.net/
participants (1)
-
John Meacham