From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 18 Dec 2017 09:43:20 +0000 (+0100)
Subject: Merge branch 'interface-improvements'
X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=commitdiff_plain;h=0ccf6e4772c240fb79d58f8b4d833a23e278e297;hp=6074fc23351ac06daad779b3ac6c09a36590de24

Merge branch 'interface-improvements'
---

diff --git a/cloogleirc.icl b/cloogleirc.icl
index 05aaa7d..3f0ac55 100644
--- a/cloogleirc.icl
+++ b/cloogleirc.icl
@@ -1,7 +1,7 @@
 module cloogleirc
 
 import Cloogle
-import GenPrint
+import Data.Generics.GenPrint
 import StdEnv
 
 import Data.Functor
@@ -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(bind), instance Monad Maybe, >>=
+from Control.Monad import class Monad(bind), >>=
 from Text.Encodings.UrlEncoding import urlEncode
 import System.CommandLine
 import Internet.HTTP
@@ -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
@@ -108,17 +111,18 @@ cloogle data w
 
 Start :: *World -> (Maybe String, *World)
 Start w
-# ([arg0:args], w) = getCommandLine w
+# ([cmd:args], w) = getCommandLine w
 # (io, w) = stdio w
-# io = io <<< "\n"
-# bs = parseCLI args 
-//| isError bs = (Just $ "\n" +++ fromError bs +++ "\n", snd $ fclose io w)
+# bs = parseCLI cmd args
+| isError bs
+	# 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)
 	where
-		parseCLI :: [String] -> MaybeErrorString BotSettings
-		parseCLI [] = Ok
+		parseCLI :: String [String] -> MaybeErrorString BotSettings
+		parseCLI _ [] = Ok
 			{ bs_nick     = "clooglebot"
 			, bs_nickserv = Nothing
 			, bs_autojoin = []
@@ -126,7 +130,7 @@ Start w
 			, bs_server   = "irc.freenode.net"
 			, bs_strftime = "%s"
 			}
-		parseCLI [a:as]
+		parseCLI cmd [a:as]
 		| a == "-f" || a == "--strftime"
 			= arg1 "--strftime" as \a c->{c & bs_strftime=a}
 		| a == "-n" || a == "--nick"
@@ -140,7 +144,7 @@ Start w
 		| a == "-s" || a == "--server"
 			= arg1 "--server" as \a c->{c & bs_server=a}
 		| a == "-h" || a == "--help" = Error $ join "\n" $
-			[ "Usage: cloogle [OPTS]"
+			[ "Usage: " + cmd + " [OPTS]"
 			, "Options:"
 			, "\t--strftime/-f FORMAT   strftime format used in the output. default: %s\n"
 			, "\t--nick/-n NICKNAME     Use the given nickname instead of clooglebot"
@@ -152,9 +156,9 @@ Start w
 			, "\t                       has to be escaped in most shells"
 			]
 		= Error $ "Unknown option: " +++ a
-
-		arg1 name [] _ = Error $ name +++ " requires an argument"
-		arg1 name [a:as] f = parseCLI as >>= Ok o f a
+		where
+			arg1 name [] _ = Error $ name +++ " requires an argument"
+			arg1 name [a:as] f = parseCLI cmd as >>= Ok o f a
 
 		nickserv pw = PRIVMSG (CSepList ["NickServ"]) $ "IDENTIFY " +++ pw
 
@@ -183,7 +187,7 @@ Start w
 		log :: String String IRCMessage (!*File, !*World) -> (!*File, !*World)
 		log strf pref m (io, w)
 		#! (t, w) = localTime w
-		= (io <<< strfTime strf t <<< pref <<< toString m, w)
+		= (io <<< strfTime strf t <<< pref <<< toString m <<< "\n", w)
 
 		process` :: (Maybe (Either IRCUser String)) IRCCommand *World -> (Maybe [IRCCommand], *World)
 		process` (Just (Left user)) (PRIVMSG t m) w
diff --git a/install_clean.sh b/install_clean.sh
index f5da1d9..f7fe903 100644
--- a/install_clean.sh
+++ b/install_clean.sh
@@ -18,10 +18,4 @@ echo "Downloading and installing clean nightly" >&2
 curl -sSL ftp://ftp.cs.ru.nl/pub/Clean/builds/linux-x64/clean-bundle-complete-linux-x64-latest.tgz \
 	| tar --gunzip --strip-components=1 --extract --directory="$TARGET"
 
-echo "Apply patches" >&2
-curl -sSL https://gitlab.science.ru.nl/mlubbers/iTasks-SDK/raw/95-addbackgroundtask/Libraries/iTasks/_Framework/TaskServer.dcl\
-	> "$TARGET"/lib/iTasks/iTasks/_Framework/TaskServer.dcl
-curl -sSL https://gitlab.science.ru.nl/mlubbers/iTasks-SDK/raw/95-addbackgroundtask/Libraries/iTasks/_Framework/TaskServer.icl\
-	> "$TARGET"/lib/iTasks/iTasks/_Framework/TaskServer.icl
-
 echo "export CLEAN_HOME=$TARGET; export PATH=$TARGET/bin:\$PATH;"
diff --git a/libcloogle b/libcloogle
index c4b1f32..065ca49 160000
--- a/libcloogle
+++ b/libcloogle
@@ -1 +1 @@
-Subproject commit c4b1f32588aa2c3227e8b369bbd823c1a8b549ca
+Subproject commit 065ca49b28e3c39bcbe4f69872302cec2a19850d