Permalink
Browse files

Update cabal file, fix mueval error output.

  • Loading branch information...
1 parent 2ba4309 commit 3fba341c05736772513bddcb60607b7ccc318173 Jonas Westerlund committed Dec 28, 2011
Showing with 14 additions and 13 deletions.
  1. +11 −10 norby.cabal
  2. +1 −1 src/Commands.hs
  3. +2 −2 src/Eval.hs
View
@@ -22,16 +22,17 @@ executable norby
main-is: Main.hs
-- Packages needed in order to build this package.
- build-depends: base >= 4 && < 5
- build-depends: bson >= 0.1 && < 1.0
- build-depends: hint >= 0.3 && < 1.0
- build-depends: monads-fd >= 0.1 && < 1.0
- build-depends: mongoDB >= 0.8 && < 1.0
- -- build-depends: mueval >= 0.8 && <= 1.0
- build-depends: network >= 2.3 && < 3.0
- build-depends: parsec >= 3.0 && < 4.0
- build-depends: process >= 1.0 && < 2.0
- build-depends: time >= 1.1.4 && <= 1.2
+ build-depends: base >= 4 && < 5
+ build-depends: bson >= 0.1 && < 1.0
+ build-depends: hint >= 0.3 && < 1.0
+ build-depends: monads-fd >= 0.1 && < 1.0
+ build-depends: mongoDB >= 0.8 && < 1.0
+ -- build-depends: mueval >= 0.8 && < 1.0
+ build-depends: network >= 2.3 && < 3.0
+ build-depends: parsec >= 3.0 && < 4.0
+ -- build-depends: attoparsec >= 0.9 && < 1.0
+ build-depends: process >= 1.0 && < 2.0
+ build-depends: time >= 1.1.4 && < 1.3
-- Modules not exported by this package.
-- Other-modules:
View
@@ -49,7 +49,7 @@ inviteHandler msg = case msg of
joinHandler msg = case msg of
(Message (Just (NickName nn _ _)) _ ps)
-> when (".join " `isPrefixOf` last ps && nn `elem` admins)
- (join . sndWord $ last ps)
+ (join . drop 1 . words $ last ps)
_ -> return ()
logHandler msg = S.store msg
View
@@ -18,8 +18,8 @@ hsFile = "L" -- A bit dumb, relies on the current working directory
-- Call out to the mueval binary
evalHsExt :: Message -> IO String
evalHsExt (Message _ _ params) = do
- (_, out, _) <- liftIO $ readProcessWithExitCode "mueval" args ""
- return $ " " ++ (unwords $ words out)
+ (_, out, err) <- liftIO $ readProcessWithExitCode "mueval" args ""
+ return $ " " ++ (unwords $ words out ++ words err)
where args = [ "-XExtendedDefaultRules"
, "--no-imports"
, "-l", hsFile ++ ".hs"

0 comments on commit 3fba341

Please sign in to comment.