compiles, but doesn't work, probably strictness?

[cloogle-irc.git] / cloogleirc.icl

diff --git a/cloogleirc.icl b/cloogleirc.icl
index 3aa328e..46c20f1 100644 (file)
--- a/cloogleirc.icl
+++ b/cloogleirc.icl
@@ -33,9 +33,6 @@ import TCPIP
 import IRC
 import IRCBot
 
-TIMEOUT :== Just 10000
-SERVER :== "irc.freenode.net"
-
 shorten :: String *World -> (String, *World)
 shorten s w 
 # s = if (startsWith "http://" s) s (if (startsWith "https://" s) s ("http://" + s))
@@ -95,9 +92,7 @@ cloogle data w
                = join "\n" (map maxWidth lines)
                
                maxWidth :: String -> String
-               maxWidth s
-               | size s > 80 = subString 0 77 s + "..."
-               = s
+               maxWidth s = if (size s > 80) (subString 0 77 s + "...") s
 
 :: BotSettings =
                { bs_nick     :: String
@@ -108,15 +103,15 @@ cloogle data w
                , bs_strftime :: String
                }
 
-//Start :: *World -> (MaybeErrorString (), *World)
+Start :: *World -> (Maybe String, *World)
 Start w
 # ([arg0:args], w) = getCommandLine w
 # (io, w) = stdio w
 # bs = parseCLI args 
-| isError bs = (Error $ "\n" +++ fromError bs +++ "\n", snd $ fclose io w)
+//| isError bs = (Just $ "\n" +++ fromError bs +++ "\n", 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
-= (maybe (Ok ()) Error merr, snd $ fclose io w)
+= (Nothing, w)//= (merr, snd $ fclose io w)
        where
                parseCLI :: [String] -> MaybeErrorString BotSettings
                parseCLI [] = Ok
@@ -169,7 +164,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 +176,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 strf pref m (io, w)
-               # (t, w) = localTime w
-               = (io <<< strfTime strf t <<< pref <<< toString m, w)
+               log :: String String IRCMessage (*File, *World) -> (*File, *World)
+               log strf pref m (io, w) = (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 +195,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]"