Cleanup
authorMart Lubbers <mart@martlubbers.net>
Tue, 11 Jul 2017 17:27:35 +0000 (19:27 +0200)
committerMart Lubbers <mart@martlubbers.net>
Tue, 11 Jul 2017 17:27:35 +0000 (19:27 +0200)
IRC.icl

diff --git a/IRC.icl b/IRC.icl
index f9d4583..54bf2db 100644 (file)
--- a/IRC.icl
+++ b/IRC.icl
@@ -1,17 +1,9 @@
 implementation module IRC
 
-import StdGeneric
-import StdList
-import StdTuple
+import StdList, StdTuple, StdOverloaded, StdFunc, StdString, StdChar, StdBool
 import GenPrint
-import GenBimap
-import StdOverloaded
 import Data.Maybe
 import Data.Either
-import StdFunc
-import StdString
-import StdChar
-import StdBool
 import _SystemArray
 
 import Text.Parsers.Simple.Core
@@ -19,13 +11,12 @@ import Text.Parsers.Simple.Chars
 import Data.Tuple
 import Control.Monad
 import Control.Applicative
-from Data.Functor import <$>
 
+from Data.Functor import <$>
 from Data.Func import $
-from Text import class Text(ltrim,indexOf,concat), instance Text String
+from Text import class Text(trim,rtrim,split,indexOf,concat), instance Text String
 import qualified Text
 from StdMisc import undef
-import StdDebug
 
 jon :== 'Text'.join
 
@@ -39,6 +30,7 @@ Start = jon "\n" $ map printToString
        , parseIRCMessage ":frobnicator!~frobnicat@92.110.128.124 AWAY :test with spaces\r\n"
        , parseIRCMessage ":cherryh.freenode.net NOTICE * :*** Found your hostname\r\n"
        , parseIRCMessage ":cherryh.freenode.net QUIT :hoi hoi\r\n"
+       , parseIRCMessage ":cherryh.freenode.net ISON a b c d e f :g h\r\n"
        ]
 
 (<+) infixr 5 :: a b -> String | toString a & toString b
@@ -57,116 +49,50 @@ parseIRCMessage s = case runParser parsePrefix (fromString s) of
 parsePrefix :: Parser Char (Maybe (Either IRCUser String))
 parsePrefix = optional (pToken ':' >>| parseEither parseUser parseHost) <* pToken ' '
 
+pOne [] = (Left ["Expected an argument"], [])
+pOne [a:as] = (Right a, as)
+
 generic gIRCParse a :: [String] -> (Either [Error] a, [String])
 gIRCParse{|UNIT|} a = (Right UNIT, a)
-gIRCParse{|String|} [a:as] = (Right a, as)
-gIRCParse{|String|} [] = (Left ["Expected a string"], [])
-gIRCParse{|Int|} [a:as] = (Right $ toInt a, as)
-gIRCParse{|Int|} [] = (Left ["Expected an integer"], [])
+gIRCParse{|String|} as = pOne as
+gIRCParse{|Int|} as = appFst (fmap toInt) $ pOne as
 gIRCParse{|EITHER|} lp rp as = case lp as of
        (Right a, rest) = (Right $ LEFT a, rest)
-       (Left e1, rest) = case rp as of
+       (Left e1, _) = case rp as of
                (Right a, rest) = (Right $ RIGHT a, rest)
-               (Left e2, rest) = (Left $ e1 ++ e2, [])
-gIRCParse{|OBJECT|} p as = case p as of
-       (Right e, rest) = (Right $ OBJECT e, rest)
-       (Left e, rest) = (Left e, [])
+               (Left e2, _) = (Left $ e1 ++ e2, [])
+gIRCParse{|OBJECT|} p as = appFst (fmap OBJECT) $ p as
 gIRCParse{|CONS of d|} p [] = (Left ["Expected a cmd constructor: " +++ d.gcd_name], [])
 gIRCParse{|CONS of d|} p [a:as]
 | a <> d.gcd_name = (Left ["Wrong constructor. expected: " +++ d.gcd_name +++ ", got: " +++ a], [])
 = case p as of
        (Right a, rest) = (Right $ CONS a, rest)
-       (Left e, rest) = (Left e, [])
+       (Left e, _) = (Left e, [])
 gIRCParse{|PAIR|} pl pr as = case pl as of
        (Right a1, rest) = case pr rest of
                (Right a2, rest) = (Right $ PAIR a1 a2, rest)
-               (Left e, rest) = (Left e, [])
-       (Left e, rest) = (Left e, [])
-gIRCParse{|[]|} pl as = plist pl as
-where
-       plist pl as = case pl as of
-               (Right e, rest) = case plist pl rest of
+               (Left e, _) = (Left e, [])
+       (Left e, _) = (Left e, [])
+gIRCParse{|[]|} pl as = case pl as of
+               (Right e, rest) = case gIRCParse{|*->*|} pl rest of
                        (Right es, rest) = (Right [e:es], rest)
-                       (Left e, rest) = (Left e, [])
-               (Left e, rest) = (Right [], as)
-gIRCParse{|Maybe|} pm as = case pm as of
-       (Right a, rest) = (Right $ Just a, rest)
-       (Left e, rest) = (Right Nothing, as)
+                       (Left e, _) = (Left e, [])
+               (Left e, _) = (Right [], as)
+gIRCParse{|Maybe|} pm as
+       = appFst (either (const $ Right Nothing) $ Right o Just) $ pm as
 
 derive gIRCParse (,), (,,), IRCCommand
 
 parseCmd :: [Char] -> Either [Error] IRCCommand
-parseCmd cs = fst $ gIRCParse{|*|} $ argfun $ 'Text'.split " " $ toString cs
-//= parse cmdParser $ argfun $ 'Text'.split " " $ toString cs
+parseCmd cs = fst $ gIRCParse{|*|} $ argfun $ split " " $ toString cs
        where
                argfun :: [String] -> [String]
                argfun [] = []
                argfun [x:xs]
-               # x = 'Text'.trim x
-               | x.[0] == ':' = [jon " " $ [x:map 'Text'.rtrim xs]]
+               # x = trim x
+               | x.[0] == ':' = [jon " " $ [x:map rtrim xs]]
                | otherwise = [x:argfun xs]
 
-               p = pSatisfy (const True)
-               lst = fmap $ 'Text'.split ","
-               opt = optional p
-               pInt = toInt <$> p
-
-               nn p f = pToken p >>| f
-
-               cmdParser :: Parser String IRCCommand
-               cmdParser =
-                           (nn "ADMIN"   $ fmap ADMIN       opt)
-                       <|> (nn "AWAY"    $ fmap AWAY        p)
-                       <|> (nn "CONNECT" $ liftM2 CONNECT   p (optional $ liftM2 tuple pInt opt))
-                       <|> (nn "DIE"     $ pure DIE)
-                       <|> (nn "ERROR"   $ fmap ERROR       p)
-                       <|> (nn "INFO"    $ fmap INFO        opt)
-                       <|> (nn "INVITE"  $ liftM2 INVITE    p p)
-                       <|> (nn "ISON"    $ fmap ISON      $ pMany p)
-//                     <|> (nn "JOIN"    $ fmap JOIN      $ lst p >>= \ch->lst p >>= \ks->pure (zip2 ch (ks ++ repeat Nothing)))
-                       <|> (nn "KICK"    $ liftM3 KICK      p p opt)
-                       <|> (nn "KILL"    $ liftM2 KILL      p p)
-                       <|> (nn "LINKS"   $ fmap LINKS     $ optional $ liftM2 tuple opt p)
-                       <|> (nn "LIST"    $ fmap LIST      $ optional $ liftM2 tuple ('Text'.split "," <$> p) opt)
-                       <|> (nn "LUSERS"  $ fmap LUSERS    $ optional $ liftM2 tuple p opt)
-                       <|> (nn "MODE"    $ liftM5 MODE      p p opt opt opt)
-                       <|> (nn "MOTD"    $ fmap MOTD      $ opt)
-                       <|> (nn "NAMES"   $ fmap NAMES     $ lst p)
-                       <|> (nn "NICK"    $ fmap NAMES     $ lst p)
-                       //"NICK" = String (Maybe String)
-                       //"NJOIN" = command0 NJOIN args
-                       //"NOTICE" = String String
-                       //"OPER" = String String 
-                       //"PART" = [String]
-                       //"PASS" = String
-                       //"PING" = String (Maybe String)
-                       //"PONG" = String (Maybe String)
-                       //"PRIVMSG" = [String] String
-//                     "QUIT" = case args of
-//                             [_,_:_] = Left $ "QUIT has too many arguments"
-//                             x = Right $ QUIT $ listToMaybe x
-//                     "REHASH" = command0 REHASH args
-//                     "RESTART" = command0 REHASH args
-//                     "SERVER" = command0 REHASH args
-                       //"SERVICE" = String String String String
-                       //"SERVLIST" = (Maybe (String, Maybe String))
-                       //"SQUERY" = String String
-//                     "SQUIRT" = command0 REHASH args
-                       //"SQUIT" = String String
-                       //"STATS" = (Maybe (String, Maybe String))
-                       //"SUMMON" = String (Maybe (String, Maybe String))
-                       //"TIME" = (Maybe String)
-                       //"TOPIC" = String (Maybe String)
-                       //"TRACE" = (Maybe String)
-                       //"USER" = String String String
-                       //"USERHOST" = [String]
-                       //"USERS" = (Maybe String)
-                       //"VERSION" = (Maybe String)
-                       //"WALLOPS" = String
-                       //"WHO" = (Maybe String)
-                       //"WHOIS" = (Maybe String) [String]
-                       //"WHOWAS" = (Maybe String) [String]
-
 parseReply :: Parser Char IRCNumReply
 parseReply = (toString <$> pSome pDigit)
        >>= \rep->pMiddle
@@ -175,13 +101,13 @@ parseReply = (toString <$> pSome pDigit)
        where
                fs :: String -> IRCReplies
                fs s = fromInt $ toInt s
-
+//
 spaceParser :: Parser Char [Char]
 spaceParser = pMany $ pToken ' '
-
-parseServer :: Parser Char String
-parseServer = pFail
-
+//
+//parseServer :: Parser Char String
+//parseServer = pFail
+//
 parseEither :: (Parser a b) (Parser a c) -> Parser a (Either b c)
 parseEither p q = Left <$> p <|> Right <$> q
 
@@ -217,378 +143,172 @@ instance toString IRCUser where
        toString m = m.irc_nick <+ maybe "" ((<+) "!") m.irc_user
                <+ maybe "" ((<+) "@") m.irc_host
 
-cons :: a [a] -> [a]
-cons a as = [a:as]
-
 pMiddle :: Parser Char String
 pMiddle = fmap toString $
-       spaceParser >>| liftM2 cons (pNotSatisfy ((==)':')) (pMany $ pNoneOf [' ':illegal])
-
-pTrailing :: Parser Char String
-pTrailing = fmap toString $ 
-       spaceParser >>| pToken ':' >>| pMany (pNoneOf illegal)
-
-pParam :: Parser Char String
-pParam = pMiddle <|> pTrailing
+       spaceParser >>| liftM2 (\x xs->[x:xs]) (pSatisfy (not o ((==)':')) (pMany $ pNoneOf [' ':illegal]))
 
 pNoneOf :: [a] -> Parser a a | Eq a
 pNoneOf l = pSatisfy (not o flip isMember l)
 
-pNotSatisfy :: (a -> Bool) -> Parser a a | Eq a
-pNotSatisfy f = pSatisfy (not o f)
-
-pInt :: Parser Char Int
-pInt = toInt o toString <$> (spaceParser >>| pSome pDigit)
-
 illegal :: [Char]
 illegal = ['\x00','\r','\n']
 
 instance toString IRCCommand where
-       toString r = jon " " (print r) +++ "\r\n"
-
-print :: IRCCommand -> [String]
-print r = case r of
-               ADMIN mm = ["ADMIN":maybeToList mm]
-               AWAY m = ["AWAY",m]
-       //CONNECT String (Maybe (Int, Maybe String))
-       //DIE 
-       //ERROR String
-       //INFO (Maybe String)
-       //INVITE String String
-       //ISON [String]
-               JOIN chs = ["JOIN",if (isEmpty chs) "0"
-                       (jon ", " [jon " " [ch:maybeToList mk]\\(ch, mk)<-chs])]
-       //KICK String String (Maybe String)
-       //KILL String String
-       //LINKS (Maybe (Maybe String, String))
-       //LIST (Maybe ([String], Maybe String))
-       //LUSERS (Maybe (String, Maybe String))
-       //MODE String String (Maybe String) (Maybe String) (Maybe String)
-       //MOTD (Maybe String)
-       //NAMES [String]
-               NICK n ms = ["NICK", n]
-       //NJOIN 
-       //NOTICE String String
-       //OPER String String 
-       //PART [String]
-       //PASS String
-               PING a mb = ["PING",a:maybeToList mb]
-               PONG a mb = ["PONG",a:maybeToList mb]
-               PRIVMSG dest msg = ["PRIVMSG",jon "," dest,formatMSG msg]
-               QUIT msg = ["QUIT":maybeToList msg]
-       //REHASH 
-       //RESTART 
-       //SERVER 
-       //SERVICE String String String String
-       //SERVLIST (Maybe (String, Maybe String))
-       //SQUERY String String
-       //SQUIRT 
-       //SQUIT String String
-       //STATS (Maybe (String, Maybe String))
-       //SUMMON String (Maybe (String, Maybe String))
-       //TIME (Maybe String)
-       //TOPIC String (Maybe String)
-       //TRACE (Maybe String)
-               USER login mode rn = ["USER", login, mode, "*", ":"+++rn]
-       //USERHOST [String]
-       //USERS (Maybe String)
-       //VERSION (Maybe String)
-       //WALLOPS String
-       //WHO (Maybe String)
-       //WHOIS (Maybe String) [String]
-       //WHOWAS (Maybe String) [String]
-               _ = [printToString r]
+       toString r = jon " " (gIRCPrint{|*|} r) +++ "\r\n"
 
 formatMSG :: String -> String
 formatMSG s = if (indexOf " " s > 0 || indexOf " " s > 0) (":" +++ s) s
 
-
 instance toString IRCReplies where toString r = printToString r
 instance toString IRCErrors where toString r = printToString r
 
 instance fromInt IRCReplies where
        fromInt r = case r of 
-               1 = RPL_WELCOME
-               2 = RPL_YOURHOST
-               3 = RPL_CREATED
-               4 = RPL_MYINFO
-               5 = RPL_BOUNCE
-               200 = RPL_TRACELINK
-               201 = RPL_TRACECONNECTING
-               202 = RPL_TRACEHANDSHAKE
-               203 = RPL_TRACEUNKNOWN
-               204 = RPL_TRACEOPERATOR
-               205 = RPL_TRACEUSER
-               206 = RPL_TRACESERVER
-               207 = RPL_TRACESERVICE
-               208 = RPL_TRACENEWTYPE
-               209 = RPL_TRACECLASS
-               210 = RPL_TRACERECONNECT
-               211 = RPL_STATSLINKINFO
-               212 = RPL_STATSCOMMANDS
-               219 = RPL_ENDOFSTATS
-               221 = RPL_UMODEIS
-               234 = RPL_SERVLIST
-               235 = RPL_SERVLISTEND
-               242 = RPL_STATSUPTIME
-               243 = RPL_STATSOLINE
-               251 = RPL_LUSERCLIENT
-               252 = RPL_LUSEROP
-               253 = RPL_LUSERUNKNOWN
-               254 = RPL_LUSERCHANNELS
-               255 = RPL_LUSERME
-               256 = RPL_ADMINME
-               257 = RPL_ADMINLOC1
-               258 = RPL_ADMINLOC2
-               259 = RPL_ADMINEMAIL
-               261 = RPL_TRACELOG
-               262 = RPL_TRACEEND
-               263 = RPL_TRYAGAIN
-               301 = RPL_AWAY
-               302 = RPL_USERHOST
-               303 = RPL_ISON
-               304 = RPL_UNAWAY
-               305 = RPL_NOWAWAY
-               311 = RPL_WHOISUSER
-               312 = RPL_WHOISSERVER
-               313 = RPL_WHOISOPERATOR
-               314 = RPL_WHOWASUSER
-               315 = RPL_ENDOFWHO
-               317 = RPL_WHOISIDLE
-               318 = RPL_ENDOFWHOIS
-               319 = RPL_WHOISCHANNELS
-               321 = RPL_LISTSTART
-               322 = RPL_LIST
-               323 = RPL_LISTEND
-               324 = RPL_CHANNELMODEIS
-               325 = RPL_UNIQOPIS
-               331 = RPL_NOTOPIC
-               332 = RPL_TOPIC
-               341 = RPL_INVITING
-               342 = RPL_SUMMONING
-               346 = RPL_INVITELIST
-               347 = RPL_ENDOFINVITELIST
-               348 = RPL_EXCEPTLIST
-               349 = RPL_ENDOFEXCEPTLIST
-               351 = RPL_VERSION
-               352 = RPL_WHOREPLY
-               353 = RPL_NAMREPLY
-               364 = RPL_LINKS
-               365 = RPL_ENDOFLINKS
-               366 = RPL_ENDOFNAMES
-               367 = RPL_BANLIST
-               368 = RPL_ENDOFBANLIST
-               369 = RPL_ENDOFWHOWAS
-               371 = RPL_INFO
-               372 = RPL_MOTD
-               374 = RPL_ENDOFINFO
-               375 = RPL_MOTDSTART
-               376 = RPL_ENDOFMOTD
-               381 = RPL_YOUREOPER
-               382 = RPL_REHASHING
-               383 = RPL_YOURESERVICE
-               391 = RPL_TIME
-               392 = RPL_USERSSTART
-               393 = RPL_USERS
-               394 = RPL_ENDOFUSERS
-               395 = RPL_NOUSERS
+               1 = RPL_WELCOME; 2 = RPL_YOURHOST;
+               3 = RPL_CREATED; 4 = RPL_MYINFO;
+               5 = RPL_BOUNCE; 200 = RPL_TRACELINK;
+               201 = RPL_TRACECONNECTING; 202 = RPL_TRACEHANDSHAKE;
+               203 = RPL_TRACEUNKNOWN; 204 = RPL_TRACEOPERATOR;
+               205 = RPL_TRACEUSER; 206 = RPL_TRACESERVER;
+               207 = RPL_TRACESERVICE; 208 = RPL_TRACENEWTYPE;
+               209 = RPL_TRACECLASS; 210 = RPL_TRACERECONNECT;
+               211 = RPL_STATSLINKINFO; 212 = RPL_STATSCOMMANDS;
+               219 = RPL_ENDOFSTATS; 221 = RPL_UMODEIS;
+               234 = RPL_SERVLIST; 235 = RPL_SERVLISTEND;
+               242 = RPL_STATSUPTIME; 243 = RPL_STATSOLINE;
+               251 = RPL_LUSERCLIENT; 252 = RPL_LUSEROP;
+               253 = RPL_LUSERUNKNOWN; 254 = RPL_LUSERCHANNELS;
+               255 = RPL_LUSERME; 256 = RPL_ADMINME;
+               257 = RPL_ADMINLOC1; 258 = RPL_ADMINLOC2;
+               259 = RPL_ADMINEMAIL; 261 = RPL_TRACELOG;
+               262 = RPL_TRACEEND; 263 = RPL_TRYAGAIN;
+               301 = RPL_AWAY; 302 = RPL_USERHOST;
+               303 = RPL_ISON; 304 = RPL_UNAWAY;
+               305 = RPL_NOWAWAY; 311 = RPL_WHOISUSER;
+               312 = RPL_WHOISSERVER; 313 = RPL_WHOISOPERATOR;
+               314 = RPL_WHOWASUSER; 315 = RPL_ENDOFWHO;
+               317 = RPL_WHOISIDLE; 318 = RPL_ENDOFWHOIS;
+               319 = RPL_WHOISCHANNELS; 321 = RPL_LISTSTART;
+               322 = RPL_LIST; 323 = RPL_LISTEND;
+               324 = RPL_CHANNELMODEIS; 325 = RPL_UNIQOPIS;
+               331 = RPL_NOTOPIC; 332 = RPL_TOPIC;
+               341 = RPL_INVITING; 342 = RPL_SUMMONING;
+               346 = RPL_INVITELIST; 347 = RPL_ENDOFINVITELIST;
+               348 = RPL_EXCEPTLIST; 349 = RPL_ENDOFEXCEPTLIST;
+               351 = RPL_VERSION; 352 = RPL_WHOREPLY;
+               353 = RPL_NAMREPLY; 364 = RPL_LINKS;
+               365 = RPL_ENDOFLINKS; 366 = RPL_ENDOFNAMES;
+               367 = RPL_BANLIST; 368 = RPL_ENDOFBANLIST;
+               369 = RPL_ENDOFWHOWAS; 371 = RPL_INFO;
+               372 = RPL_MOTD; 374 = RPL_ENDOFINFO;
+               375 = RPL_MOTDSTART; 376 = RPL_ENDOFMOTD;
+               381 = RPL_YOUREOPER; 382 = RPL_REHASHING;
+               383 = RPL_YOURESERVICE; 391 = RPL_TIME;
+               392 = RPL_USERSSTART; 393 = RPL_USERS;
+               394 = RPL_ENDOFUSERS; 395 = RPL_NOUSERS;
                _ = undef
 
 instance toInt IRCReplies where
        toInt r = case r of 
-               RPL_WELCOME = 1
-               RPL_YOURHOST = 2
-               RPL_CREATED = 3
-               RPL_MYINFO = 4
-               RPL_BOUNCE = 5
-               RPL_TRACELINK = 200
-               RPL_TRACECONNECTING = 201
-               RPL_TRACEHANDSHAKE = 202
-               RPL_TRACEUNKNOWN = 203
-               RPL_TRACEOPERATOR = 204
-               RPL_TRACEUSER = 205
-               RPL_TRACESERVER = 206
-               RPL_TRACESERVICE = 207
-               RPL_TRACENEWTYPE = 208
-               RPL_TRACECLASS = 209
-               RPL_TRACERECONNECT = 210
-               RPL_STATSLINKINFO = 211
-               RPL_STATSCOMMANDS = 212
-               RPL_ENDOFSTATS = 219
-               RPL_UMODEIS = 221
-               RPL_SERVLIST = 234
-               RPL_SERVLISTEND = 234
-               RPL_STATSUPTIME = 242
-               RPL_STATSOLINE = 243
-               RPL_LUSERCLIENT = 251
-               RPL_LUSEROP = 252
-               RPL_LUSERUNKNOWN = 253
-               RPL_LUSERCHANNELS = 254
-               RPL_LUSERME = 255
-               RPL_ADMINME = 256
-               RPL_ADMINLOC1 = 257
-               RPL_ADMINLOC2 = 258
-               RPL_ADMINEMAIL = 259
-               RPL_TRACELOG = 261
-               RPL_TRACEEND = 262
-               RPL_TRYAGAIN = 263
-               RPL_AWAY = 301
-               RPL_USERHOST = 302
-               RPL_ISON = 303
-               RPL_UNAWAY = 304
-               RPL_NOWAWAY = 305
-               RPL_WHOISUSER = 311
-               RPL_WHOISSERVER = 312
-               RPL_WHOISOPERATOR = 313
-               RPL_WHOWASUSER = 314
-               RPL_ENDOFWHO = 315
-               RPL_WHOISIDLE = 317
-               RPL_ENDOFWHOIS = 318
-               RPL_WHOISCHANNELS = 319
-               RPL_LISTSTART = 321
-               RPL_LIST = 322
-               RPL_LISTEND = 323
-               RPL_CHANNELMODEIS = 324
-               RPL_UNIQOPIS = 325
-               RPL_NOTOPIC = 331
-               RPL_TOPIC = 332
-               RPL_INVITING = 341
-               RPL_SUMMONING = 342
-               RPL_INVITELIST = 346
-               RPL_ENDOFINVITELIST = 347
-               RPL_EXCEPTLIST = 348
-               RPL_ENDOFEXCEPTLIST = 349
-               RPL_VERSION = 351
-               RPL_WHOREPLY = 352
-               RPL_NAMREPLY = 353
-               RPL_LINKS = 364
-               RPL_ENDOFLINKS = 365
-               RPL_ENDOFNAMES = 366
-               RPL_BANLIST = 367
-               RPL_ENDOFBANLIST = 367
-               RPL_ENDOFWHOWAS = 369
-               RPL_INFO = 371
-               RPL_MOTD = 372
-               RPL_ENDOFINFO = 374
-               RPL_MOTDSTART = 375
-               RPL_ENDOFMOTD = 376
-               RPL_YOUREOPER = 381
-               RPL_REHASHING = 382
-               RPL_YOURESERVICE = 383
-               RPL_TIME = 391
-               RPL_USERSSTART = 392
-               RPL_USERS = 393
-               RPL_ENDOFUSERS = 394
-               RPL_NOUSERS = 395
+               RPL_WELCOME = 1; RPL_YOURHOST = 2;
+               RPL_CREATED = 3; RPL_MYINFO = 4;
+               RPL_BOUNCE = 5; RPL_TRACELINK = 200;
+               RPL_TRACECONNECTING = 201; RPL_TRACEHANDSHAKE = 202;
+               RPL_TRACEUNKNOWN = 203; RPL_TRACEOPERATOR = 204;
+               RPL_TRACEUSER = 205; RPL_TRACESERVER = 206;
+               RPL_TRACESERVICE = 207; RPL_TRACENEWTYPE = 208;
+               RPL_TRACECLASS = 209; RPL_TRACERECONNECT = 210;
+               RPL_STATSLINKINFO = 211; RPL_STATSCOMMANDS = 212;
+               RPL_ENDOFSTATS = 219; RPL_UMODEIS = 221;
+               RPL_SERVLIST = 234; RPL_SERVLISTEND = 234;
+               RPL_STATSUPTIME = 242; RPL_STATSOLINE = 243;
+               RPL_LUSERCLIENT = 251; RPL_LUSEROP = 252;
+               RPL_LUSERUNKNOWN = 253; RPL_LUSERCHANNELS = 254;
+               RPL_LUSERME = 255; RPL_ADMINME = 256;
+               RPL_ADMINLOC1 = 257; RPL_ADMINLOC2 = 258;
+               RPL_ADMINEMAIL = 259; RPL_TRACELOG = 261;
+               RPL_TRACEEND = 262; RPL_TRYAGAIN = 263;
+               RPL_AWAY = 301; RPL_USERHOST = 302;
+               RPL_ISON = 303; RPL_UNAWAY = 304;
+               RPL_NOWAWAY = 305; RPL_WHOISUSER = 311;
+               RPL_WHOISSERVER = 312; RPL_WHOISOPERATOR = 313;
+               RPL_WHOWASUSER = 314; RPL_ENDOFWHO = 315;
+               RPL_WHOISIDLE = 317; RPL_ENDOFWHOIS = 318;
+               RPL_WHOISCHANNELS = 319; RPL_LISTSTART = 321;
+               RPL_LIST = 322; RPL_LISTEND = 323;
+               RPL_CHANNELMODEIS = 324; RPL_UNIQOPIS = 325;
+               RPL_NOTOPIC = 331; RPL_TOPIC = 332;
+               RPL_INVITING = 341; RPL_SUMMONING = 342;
+               RPL_INVITELIST = 346; RPL_ENDOFINVITELIST = 347;
+               RPL_EXCEPTLIST = 348; RPL_ENDOFEXCEPTLIST = 349;
+               RPL_VERSION = 351; RPL_WHOREPLY = 352;
+               RPL_NAMREPLY = 353; RPL_LINKS = 364;
+               RPL_ENDOFLINKS = 365; RPL_ENDOFNAMES = 366;
+               RPL_BANLIST = 367; RPL_ENDOFBANLIST = 367;
+               RPL_ENDOFWHOWAS = 369; RPL_INFO = 371;
+               RPL_MOTD = 372; RPL_ENDOFINFO = 374;
+               RPL_MOTDSTART = 375; RPL_ENDOFMOTD = 376;
+               RPL_YOUREOPER = 381; RPL_REHASHING = 382;
+               RPL_YOURESERVICE = 383; RPL_TIME = 391;
+               RPL_USERSSTART = 392; RPL_USERS = 393;
+               RPL_ENDOFUSERS = 394; RPL_NOUSERS = 395;
 
 instance fromInt IRCErrors where
        fromInt r = case r of
-               401 = ERR_NOSUCHNICK
-               402 = ERR_NOSUCHSERVER
-               403 = ERR_NOSUCHCHANNEL
-               404 = ERR_CANNOTSENDTOCHAN
-               405 = ERR_TOOMANYCHANNELS
-               406 = ERR_WASNOSUCHNICK
-               407 = ERR_TOOMANYTARGETS
-               408 = ERR_NOSUCHSERVICE
-               409 = ERR_NOORIGIN
-               411 = ERR_NORECIPIENT
-               412 = ERR_NOTEXTTOSEND
-               413 = ERR_NOTOPLEVEL
-               414 = ERR_WILDTOPLEVEL
-               415 = ERR_BADMASK
-               421 = ERR_UNKNOWNCOMMAND
-               422 = ERR_NOMOTD
-               423 = ERR_NOADMININFO
-               424 = ERR_FILEERROR
-               431 = ERR_NONICKNAMEGIVEN
-               432 = ERR_ERRONEUSNICKNAME
-               433 = ERR_NICKNAMEINUSE
-               436 = ERR_NICKCOLLISION
-               437 = ERR_UNAVAILRESOURCE
-               441 = ERR_USERNOTINCHANNEL
-               442 = ERR_NOTONCHANNEL
-               443 = ERR_USERONCHANNEL
-               444 = ERR_NOLOGIN
-               445 = ERR_SUMMONDISABLED
-               446 = ERR_USERSDISABLED
-               451 = ERR_NOTREGISTERED
-               461 = ERR_NEEDMOREPARAMS
-               462 = ERR_ALREADYREGISTRED
-               463 = ERR_NOPERMFORHOST
-               464 = ERR_PASSWDMISMATCH
-               465 = ERR_YOUREBANNEDCREEP
-               466 = ERR_YOUWILLBEBANNED
-               467 = ERR_KEYSET
-               471 = ERR_CHANNELISFULL
-               472 = ERR_UNKNOWNMODE
-               473 = ERR_INVITEONLYCHAN
-               474 = ERR_BANNEDFROMCHAN
-               475 = ERR_BADCHANNELKEY
-               476 = ERR_BADCHANMASK
-               477 = ERR_NOCHANMODES
-               478 = ERR_BANLISTFULL
-               481 = ERR_NOPRIVILEGES
-               482 = ERR_CHANOPRIVSNEEDED
-               483 = ERR_CANTKILLSERVER
-               484 = ERR_RESTRICTED
-               485 = ERR_UNIQOPPRIVSNEEDED
-               491 = ERR_NOOPERHOST
-               501 = ERR_UMODEUNKNOWNFLAG
-               502 = ERR_USERSDONTMATCH
+               401 = ERR_NOSUCHNICK; 402 = ERR_NOSUCHSERVER;
+               403 = ERR_NOSUCHCHANNEL; 404 = ERR_CANNOTSENDTOCHAN;
+               405 = ERR_TOOMANYCHANNELS; 406 = ERR_WASNOSUCHNICK;
+               407 = ERR_TOOMANYTARGETS; 408 = ERR_NOSUCHSERVICE;
+               409 = ERR_NOORIGIN; 411 = ERR_NORECIPIENT;
+               412 = ERR_NOTEXTTOSEND; 413 = ERR_NOTOPLEVEL;
+               414 = ERR_WILDTOPLEVEL; 415 = ERR_BADMASK;
+               421 = ERR_UNKNOWNCOMMAND; 422 = ERR_NOMOTD;
+               423 = ERR_NOADMININFO; 424 = ERR_FILEERROR;
+               431 = ERR_NONICKNAMEGIVEN; 432 = ERR_ERRONEUSNICKNAME;
+               433 = ERR_NICKNAMEINUSE; 436 = ERR_NICKCOLLISION;
+               437 = ERR_UNAVAILRESOURCE; 441 = ERR_USERNOTINCHANNEL;
+               442 = ERR_NOTONCHANNEL; 443 = ERR_USERONCHANNEL;
+               444 = ERR_NOLOGIN; 445 = ERR_SUMMONDISABLED;
+               446 = ERR_USERSDISABLED; 451 = ERR_NOTREGISTERED;
+               461 = ERR_NEEDMOREPARAMS; 462 = ERR_ALREADYREGISTRED;
+               463 = ERR_NOPERMFORHOST; 464 = ERR_PASSWDMISMATCH;
+               465 = ERR_YOUREBANNEDCREEP; 466 = ERR_YOUWILLBEBANNED;
+               467 = ERR_KEYSET; 471 = ERR_CHANNELISFULL;
+               472 = ERR_UNKNOWNMODE; 473 = ERR_INVITEONLYCHAN;
+               474 = ERR_BANNEDFROMCHAN; 475 = ERR_BADCHANNELKEY;
+               476 = ERR_BADCHANMASK; 477 = ERR_NOCHANMODES;
+               478 = ERR_BANLISTFULL; 481 = ERR_NOPRIVILEGES;
+               482 = ERR_CHANOPRIVSNEEDED; 483 = ERR_CANTKILLSERVER;
+               484 = ERR_RESTRICTED; 485 = ERR_UNIQOPPRIVSNEEDED;
+               491 = ERR_NOOPERHOST; 501 = ERR_UMODEUNKNOWNFLAG;
+               502 = ERR_USERSDONTMATCH;
 
 instance toInt IRCErrors where
        toInt r = case r of
-               ERR_NOSUCHNICK = 401
-               ERR_NOSUCHSERVER = 402
-               ERR_NOSUCHCHANNEL = 403
-               ERR_CANNOTSENDTOCHAN = 404
-               ERR_TOOMANYCHANNELS = 405
-               ERR_WASNOSUCHNICK = 406
-               ERR_TOOMANYTARGETS = 407
-               ERR_NOSUCHSERVICE = 408
-               ERR_NOORIGIN = 409
-               ERR_NORECIPIENT = 411
-               ERR_NOTEXTTOSEND = 412
-               ERR_NOTOPLEVEL = 413
-               ERR_WILDTOPLEVEL = 414
-               ERR_BADMASK = 415
-               ERR_UNKNOWNCOMMAND = 421
-               ERR_NOMOTD = 422
-               ERR_NOADMININFO = 423
-               ERR_FILEERROR = 424
-               ERR_NONICKNAMEGIVEN = 431
-               ERR_ERRONEUSNICKNAME = 432
-               ERR_NICKNAMEINUSE = 433
-               ERR_NICKCOLLISION = 436
-               ERR_UNAVAILRESOURCE = 437
-               ERR_USERNOTINCHANNEL = 441
-               ERR_NOTONCHANNEL = 442
-               ERR_USERONCHANNEL = 443
-               ERR_NOLOGIN = 444
-               ERR_SUMMONDISABLED = 445
-               ERR_USERSDISABLED = 446
-               ERR_NOTREGISTERED = 451
-               ERR_NEEDMOREPARAMS = 461
-               ERR_ALREADYREGISTRED = 462
-               ERR_NOPERMFORHOST = 463
-               ERR_PASSWDMISMATCH = 464
-               ERR_YOUREBANNEDCREEP = 465
-               ERR_YOUWILLBEBANNED = 466
-               ERR_KEYSET = 467
-               ERR_CHANNELISFULL = 471
-               ERR_UNKNOWNMODE = 472
-               ERR_INVITEONLYCHAN = 473
-               ERR_BANNEDFROMCHAN = 474
-               ERR_BADCHANNELKEY = 475
-               ERR_BADCHANMASK = 476
-               ERR_NOCHANMODES = 477
-               ERR_BANLISTFULL = 478
-               ERR_NOPRIVILEGES = 481
-               ERR_CHANOPRIVSNEEDED = 482
-               ERR_CANTKILLSERVER = 483
-               ERR_RESTRICTED = 484
-               ERR_UNIQOPPRIVSNEEDED = 485
-               ERR_NOOPERHOST = 491
-               ERR_UMODEUNKNOWNFLAG = 501
-               ERR_USERSDONTMATCH = 502
+               ERR_NOSUCHNICK = 401; ERR_NOSUCHSERVER = 402;
+               ERR_NOSUCHCHANNEL = 403; ERR_CANNOTSENDTOCHAN = 404;
+               ERR_TOOMANYCHANNELS = 405; ERR_WASNOSUCHNICK = 406;
+               ERR_TOOMANYTARGETS = 407; ERR_NOSUCHSERVICE = 408;
+               ERR_NOORIGIN = 409; ERR_NORECIPIENT = 411;
+               ERR_NOTEXTTOSEND = 412; ERR_NOTOPLEVEL = 413;
+               ERR_WILDTOPLEVEL = 414; ERR_BADMASK = 415;
+               ERR_UNKNOWNCOMMAND = 421; ERR_NOMOTD = 422;
+               ERR_NOADMININFO = 423; ERR_FILEERROR = 424;
+               ERR_NONICKNAMEGIVEN = 431; ERR_ERRONEUSNICKNAME = 432;
+               ERR_NICKNAMEINUSE = 433; ERR_NICKCOLLISION = 436;
+               ERR_UNAVAILRESOURCE = 437; ERR_USERNOTINCHANNEL = 441;
+               ERR_NOTONCHANNEL = 442; ERR_USERONCHANNEL = 443;
+               ERR_NOLOGIN = 444; ERR_SUMMONDISABLED = 445;
+               ERR_USERSDISABLED = 446; ERR_NOTREGISTERED = 451;
+               ERR_NEEDMOREPARAMS = 461; ERR_ALREADYREGISTRED = 462;
+               ERR_NOPERMFORHOST = 463; ERR_PASSWDMISMATCH = 464;
+               ERR_YOUREBANNEDCREEP = 465; ERR_YOUWILLBEBANNED = 466;
+               ERR_KEYSET = 467; ERR_CHANNELISFULL = 471;
+               ERR_UNKNOWNMODE = 472; ERR_INVITEONLYCHAN = 473;
+               ERR_BANNEDFROMCHAN = 474; ERR_BADCHANNELKEY = 475;
+               ERR_BADCHANMASK = 476; ERR_NOCHANMODES = 477;
+               ERR_BANLISTFULL = 478; ERR_NOPRIVILEGES = 481;
+               ERR_CHANOPRIVSNEEDED = 482; ERR_CANTKILLSERVER = 483;
+               ERR_RESTRICTED = 484; ERR_UNIQOPPRIVSNEEDED = 485;
+               ERR_NOOPERHOST = 491; ERR_UMODEUNKNOWNFLAG = 501;
+               ERR_USERSDONTMATCH = 502;