From: Mart Lubbers Date: Tue, 18 Jul 2017 13:23:54 +0000 (+0200) Subject: another try X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=d6d828d0a8d0308a70d8a64168ed8ef09a8d40e9;p=cloogle-irc.git another try --- diff --git a/IRCBot.icl b/IRCBot.icl index 6820e70..e736db9 100644 --- a/IRCBot.icl +++ b/IRCBot.icl @@ -38,7 +38,7 @@ bot (host, port) start end state bot w //Close channels = (Nothing, state, closeChannel sChannel (closeRChannel rChannel w)) -process :: TCP_DuplexChannel String .a (IRCMessage .a *World -> *(Maybe [IRCMessage], .a, *World)) *World -> *(MaybeErrorString (), TCP_DuplexChannel, .a, *World) +process :: TCP_DuplexChannel String .a (IRCMessage .a *World -> (Maybe [IRCMessage], .a, *World)) *World -> (MaybeErrorString (), TCP_DuplexChannel, .a, *World) process chan acc state bot w //See if we have a message = case split "\r\n" acc of diff --git a/Makefile b/Makefile index bd1f7b7..3e08ebb 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ CLEAN_HOME?=/opt/clean CLM:=clm -override CLMFLAGS+=-nt -dynamics +override CLMFLAGS+=-nt -dynamics -lat GCCVERSIONGTEQ6:=$(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 6) ifeq "$(GCCVERSIONGTEQ6)" "1" override CLMFLAGS+=-l -no-pie diff --git a/cloogleirc.icl b/cloogleirc.icl index 3aa328e..1801ef8 100644 --- a/cloogleirc.icl +++ b/cloogleirc.icl @@ -169,7 +169,7 @@ Start w [JOIN (CSepList bs.bs_autojoin) Nothing] shutdown = map toPrefix [QUIT $ Just "Bye"] - //process :: String IRCMessage *File *World -> (Maybe [IRCMessage], *File, *World) + process :: String IRCMessage *File *World -> *(Maybe [IRCMessage], *File, *World) process strf im io w # (io, w) = log strf " (r): " im (io, w) = case im.irc_command of @@ -181,12 +181,12 @@ Start w # (io, w) = foldr (log strf " (s): ") (io, w) msgs = (Just msgs, io, w) - //log :: String String IRCMessage (*File, *World) -> (*File, *World) + 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) - //process` :: (Maybe (Either IRCUser String)) IRCCommand *World -> (Maybe [IRCCommand], *World) + process` :: (Maybe (Either IRCUser String)) IRCCommand *World -> (Maybe [IRCCommand], *World) process` (Just (Left user)) (PRIVMSG t m) w | m == "!restart" = (Nothing, w) | m.[0] == '!' @@ -200,7 +200,7 @@ Start w process` _ (PING t mt) w = (Just [PONG t mt], w) process` _ _ w = (Just [], w) - //realProcess :: [String] *World -> ([String], *World) + realProcess :: [String] *World -> ([String], *World) realProcess ["help",x:xs] w = ((case x of "help" = [ "Usage: !help [ARG]"