Add ABCInstructionResult and ProblemResult formats

[cloogle-irc.git] / cloogleirc.icl

diff --git a/cloogleirc.icl b/cloogleirc.icl
index 1241b7b..717cfd8 100644 (file)
--- a/cloogleirc.icl
+++ b/cloogleirc.icl
@@ -1,7 +1,7 @@
 module cloogleirc
 
 import Cloogle
-import GenPrint
+import Text.GenPrint
 import StdEnv
 
 import Data.Functor
@@ -12,7 +12,7 @@ from Text import class Text(..), instance Text String, instance + String
 
 import Internet.HTTP
 
-import Text.JSON
+import Text.GenJSON
 
 import Text.URI
 import System.Time
@@ -20,7 +20,7 @@ import System.Time
 import Control.Applicative
 import qualified Control.Monad as CM
 import qualified Data.Map as DM
-from Control.Monad import class Monad, instance Monad Maybe, >>=
+from Control.Monad import class Monad(bind), >>=
 from Text.Encodings.UrlEncoding import urlEncode
 import System.CommandLine
 import Internet.HTTP
@@ -67,6 +67,7 @@ cloogle data w
 # resp = fromOk mer
 = case fromJSON $ fromString resp.HTTPResponse.rsp_data of
        Nothing = ("couldn't parse json", w)
+       Just {return=127} = ("No results for " + data, w)
        Just clr = ("Results for " + data + " -- https://cloogle.org/#" +
                replaceSubString "+" "%20" (urlEncode data) + "\n" +
                processResults clr, w)
@@ -86,6 +87,14 @@ cloogle data w
                                +++ toString (length class_funs) +++ " class functions"
                processResult (ModuleResult (br, _))
                        = "Module in " +++ br.library +++ ": " +++ br.modul
+               processResult (SyntaxResult (br, re))
+                       = "Clean syntax: " +++ re.syntax_title +++ "\n"
+                               +++ concat (intersperse "; " re.syntax_code)
+               processResult (ABCInstructionResult (br, re))
+                       = "ABC instruction: " +++ re.abc_instruction
+               processResult (ProblemResult pr)
+                       = "Common problem: " +++ pr.problem_title
+                               +++ "; see https://github.com/clean-cloogle/common-problems/blob/master/" +++ pr.problem_key +++ ".md"
 
                limitResults :: String -> String
                limitResults s
@@ -114,8 +123,9 @@ Start w
        # io = io <<< fromError bs <<< "\n"
        = (Nothing, snd $ fclose io w)
 # (Ok bs) = bs
-# (merr, io, w) = bot (bs.bs_server, bs.bs_port) (startup bs) shutdown io (process bs.bs_strftime) w
-= (merr, snd $ fclose io w)
+# (_, w) = fclose io w
+# (merr, _, w) = bot (bs.bs_server, bs.bs_port) (startup bs) shutdown () (process bs.bs_strftime) w
+= (merr, w)
        where
                parseCLI :: String [String] -> MaybeErrorString BotSettings
                parseCLI _ [] = Ok
@@ -168,17 +178,18 @@ Start w
                                [JOIN (CSepList bs.bs_autojoin) Nothing]
                shutdown = map toPrefix [QUIT $ Just "Bye"]
 
-               process :: String !IRCMessage *File !*World -> (Maybe [IRCMessage], *File, !*World)
-               process strf im io w
-               #! (io, w) = log strf " (r): " im (io, w)
+               process :: String !IRCMessage () !*World -> (Maybe [IRCMessage], (), !*World)
+               process strf im _ w
+               # (io ,w) = stdio w
+               # (io, w) = log strf " (r): " im (io, w)
+               # (_, w) = fclose io w
                = case im.irc_command of
-                       Left numr = (Just [], io, w)
+                       Left numr = (Just [], (), w)
                        Right cmd = case process` im.irc_prefix cmd w of
-                               (Nothing, w) = (Nothing, io, w)
+                               (Nothing, w) = (Nothing, (), w)
                                (Just cs, w)
                                # msgs = map toPrefix cs
-                               #! (io, w) = foldr (log strf " (s): ") (io, w) msgs
-                               = (Just msgs, io, w)
+                               = (Just msgs, (), w)
 
                log :: String String IRCMessage (!*File, !*World) -> (!*File, !*World)
                log strf pref m (io, w)