X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=cloogleirc.icl;h=44330a41e501c20df926add72ca8828a43316cea;hp=09ad2f3d1a8ee6546035fc8448f10b3e2162af6a;hb=HEAD;hpb=7d7475a1a10b1371d2bc7b2276914e9d3fdfee6a

diff --git a/cloogleirc.icl b/cloogleirc.icl
index 09ad2f3..44330a4 100644
--- a/cloogleirc.icl
+++ b/cloogleirc.icl
@@ -1,40 +1,29 @@
 module cloogleirc
 
-import Cloogle
-import GenPrint
 import StdEnv
 
+import Control.Applicative
+import Control.Monad => qualified join
+import Data.Either
+import Data.Error
+import Data.Func
 import Data.Functor
+import Data.List
+import qualified Data.Map as DM
 import Data.Maybe
-import Data.Either
-from Data.Func import $, mapSt
-from Text import class Text(..), instance Text String, instance + String
-
+import Data.Tuple
 import Internet.HTTP
-
-import Text.JSON
-
-import Text.URI
+import System.CommandLine
 import System.Time
+import Text
+import Text.Encodings.UrlEncoding
+import Text.GenJSON
 
-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 Text.Encodings.UrlEncoding import urlEncode
-import System.CommandLine
-import Internet.HTTP
-import Data.Error
-import Data.List
-import Data.Functor
-import Data.Tuple
+import Cloogle.API
 
-import TCPIP
-import IRC
+import Internet.IRC
 import IRCBot
 
-import StdMisc, StdDebug
-
 shorten :: String *World -> (String, *World)
 shorten s w 
 # s = if (startsWith "http://" s) s (if (startsWith "https://" s) s ("http://" + s))
@@ -87,6 +76,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://gitlab.science.ru.nl/cloogle/common-problems/blob/master/" +++ pr.problem_key +++ ".md"
 
 		limitResults :: String -> String
 		limitResults s
@@ -115,8 +112,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
@@ -169,17 +167,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)