X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=IRC.dcl;h=d476d725e16f97288fe5bbead7dfc28345aad898;hp=157b6d7ea415c3442150b7f875dc1d220bf34ff7;hb=87d709d61dae99cc468f52927e8246b3b6bc9022;hpb=d0094022a0169765678e500d2713db15433248bd

diff --git a/IRC.dcl b/IRC.dcl
index 157b6d7..d476d72 100644
--- a/IRC.dcl
+++ b/IRC.dcl
@@ -1,13 +1,57 @@
 definition module IRC
 
+from Data.Maybe import :: Maybe
 from StdOverloaded import class fromInt, class toInt, class toString
 
-:: IRCCommands = ADMIN | AWAY | CONNECT | DIE | ERROR | INFO | INVITE | ISON |
-	JOIN | KICK | KILL | LINKS | LIST | LUSERS | MODE | MOTD | NAMES | NICK |
-	NJOIN | NOTICE | OPER | PART | PASS | PING | PONG | PRIVMSG | QUIT |
-	REHASH | RESTART | SERVER | SERVICE | SERVLIST | SQUERY | SQUIRT | SQUIT |
-	STATS | SUMMON | TIME | TOPIC | TRACE | USER | USERHOST | USERS | VERSION |
-	WALLOPS | WHO | WHOIS | WHOWAS
+:: IRCCommands
+	= ADMIN (Maybe String)
+	| AWAY String
+	| CONNECT String Int (Maybe String)
+	| DIE 
+	| ERROR String
+	| INFO (Maybe String)
+	| INVITE String String
+	| ISON [String]
+	| JOIN [(String, Maybe String)]
+	| KICK String String (Maybe String)
+	| KILL String String
+	| LINKS (Maybe (Maybe String, String))
+	| LIST [String]
+	| LUSERS (Maybe (String, Maybe String))
+	| MODE String
+	| MOTD (Maybe String)
+	| NAMES [String]
+	| NICK String
+	| NJOIN 
+	| NOTICE 
+	| OPER String String 
+	| PART [String]
+	| PASS String
+	| PING [String]
+	| PONG [String]
+	| PRIVMSG String String
+	| QUIT String
+	| REHASH 
+	| RESTART 
+	| SERVER 
+	| SERVICE 
+	| 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 String String String
+	| USERHOST [String]
+	| USERS (Maybe String)
+	| VERSION (Maybe String)
+	| WALLOPS 
+	| WHO (Maybe String)
+	| WHOIS (Maybe String) [String]
+	| WHOWAS (Maybe String) [String]
 
 :: IRCReplies = RPL_WELCOME | RPL_YOURHOST | RPL_CREATED | RPL_MYINFO |
 	RPL_BOUNCE | RPL_TRACELINK | RPL_TRACECONNECTING | RPL_TRACEHANDSHAKE |