Merge branch 'interface-improvements' of github.com:clean-cloogle/clean-irc into...

diff --git a/IRC.icl b/IRC.icl
index 266531a..d0a0098 100644 (file)
--- a/IRC.icl
+++ b/IRC.icl
@@ -132,7 +132,7 @@ instance toString IRCUser where
        toString m = m.irc_nick <+ maybe "" ((<+) "!") m.irc_user
                <+ maybe "" ((<+) "@") m.irc_host
 instance toString IRCCommand where
-       toString m = jon " " (gIRCPrint{|*|} m)
+       toString m = jon " " (gIRCPrint{|*|} m) +++ "\r\n"
 instance toString IRCReplies where toString r = printToString r
 instance toString IRCErrors where toString r = printToString r
 

diff --git a/IRCBot.icl b/IRCBot.icl
index 3ea2f76..3b62090 100644 (file)
--- a/IRCBot.icl
+++ b/IRCBot.icl
@@ -27,7 +27,7 @@ bot (host, port) start end state bot w
 | rpt == TR_NoSuccess
        = (Just $ "Could not connect to " +++ host, state, w)
 // Send startup commands
-# (merr, chan, w) = send [toString s +++ "\r\n" \\ s <- start] (fromJust chan) w
+# (merr, chan, w) = send (map toString start) (fromJust chan) w
 | isError merr = (Just $ fromError merr, state, w)
 //Start processing function
 # (mer, chan, state, w) = process chan "" state bot w
@@ -59,7 +59,7 @@ process chan acc state bot w
                        # (mircc, state, w) = bot msg state w
                        | isNothing mircc = (Ok (), chan, state, w) // Bot asks to quit
                        //Possible send the commands
-                       # (merr, chan, w) = send [toString c +++ "\r\n" \\ c <- fromJust mircc] chan w
+                       # (merr, chan, w) = send (map toString $ fromJust mircc) chan w
                        | isError merr = (Error $ fromError merr, chan, state, w)
                        //Recurse
                        = process chan acc state bot w

diff --git a/cloogleirc.icl b/cloogleirc.icl
index 09ad2f3..a504883 100644 (file)
--- a/cloogleirc.icl
+++ b/cloogleirc.icl
@@ -87,6 +87,9 @@ 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)
 
                limitResults :: String -> String
                limitResults s

diff --git a/libcloogle b/libcloogle
index d85bd3c..065ca49 160000 (submodule)
--- a/libcloogle
+++ b/libcloogle
@@ -1 +1 @@
-Subproject commit d85bd3c5ccf6fdb82c8f62a08228cc8b6a0ac84f
+Subproject commit 065ca49b28e3c39bcbe4f69872302cec2a19850d