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

diff --git a/IRC.dcl b/IRC.dcl
index d476d72..4681254 100644
--- a/IRC.dcl
+++ b/IRC.dcl
@@ -1,40 +1,65 @@
 definition module IRC
 
 from Data.Maybe import :: Maybe
-from StdOverloaded import class fromInt, class toInt, class toString
+from Data.Either import :: Either
+from StdOverloaded import class fromInt, class toInt, class toString, class fromString
+from Text.Parsers.Simple.Core import :: Error
 
-:: IRCCommands
+:: IRCMessage =
+	{ irc_prefix    :: Maybe (Either IRCUser String)
+	, irc_command   :: Either IRCNumReply IRCCommand}
+
+:: IRCNumReply =
+	{ irc_reply     :: IRCReplies
+	, irc_recipient :: String
+	, irc_message   :: String
+	}
+
+:: IRCUser = 
+	{ irc_nick      :: String
+	, irc_user      :: Maybe String
+	, irc_host      :: Maybe String
+	}
+
+parseIRCMessage :: String -> Either [Error] IRCMessage
+
+instance toString IRCCommand, IRCReplies, IRCErrors, IRCMessage, IRCUser, IRCNumReply
+instance fromInt IRCReplies, IRCErrors
+instance toInt IRCReplies, IRCErrors
+
+:: CSepList = CSepList [String]
+:: IRCCommand
 	= ADMIN (Maybe String)
 	| AWAY String
-	| CONNECT String Int (Maybe String)
+	| CONNECT String (Maybe (Int, Maybe String))
 	| DIE 
 	| ERROR String
 	| INFO (Maybe String)
 	| INVITE String String
 	| ISON [String]
-	| JOIN [(String, Maybe String)]
+	| JOIN CSepList (Maybe String)
 	| KICK String String (Maybe String)
 	| KILL String String
 	| LINKS (Maybe (Maybe String, String))
-	| LIST [String]
+	| LIST (Maybe (CSepList, Maybe String))
 	| LUSERS (Maybe (String, Maybe String))
-	| MODE String
+	| MODE String String (Maybe String) (Maybe String) (Maybe String)
 	| MOTD (Maybe String)
-	| NAMES [String]
-	| NICK String
+	| NAMES CSepList
+	| NICK String (Maybe String)
 	| NJOIN 
-	| NOTICE 
+	| NOTICE String String
 	| OPER String String 
-	| PART [String]
+	| PART CSepList
 	| PASS String
-	| PING [String]
-	| PONG [String]
-	| PRIVMSG String String
-	| QUIT String
+	| PING String (Maybe String)
+	| PONG String (Maybe String)
+	| PRIVMSG CSepList String
+	| QUIT (Maybe String)
 	| REHASH 
 	| RESTART 
 	| SERVER 
-	| SERVICE 
+	| SERVICE String String String String
 	| SERVLIST (Maybe (String, Maybe String))
 	| SQUERY String String
 	| SQUIRT 
@@ -44,14 +69,14 @@ from StdOverloaded import class fromInt, class toInt, class toString
 	| TIME (Maybe String)
 	| TOPIC String (Maybe String)
 	| TRACE (Maybe String)
-	| USER String String String
-	| USERHOST [String]
+	| USER String String String String
+	| USERHOST CSepList
 	| USERS (Maybe String)
 	| VERSION (Maybe String)
-	| WALLOPS 
+	| WALLOPS String
 	| WHO (Maybe String)
-	| WHOIS (Maybe String) [String]
-	| WHOWAS (Maybe String) [String]
+	| WHOIS (Maybe String) String
+	| WHOWAS String (Maybe (String, Maybe String))
 
 :: IRCReplies = RPL_WELCOME | RPL_YOURHOST | RPL_CREATED | RPL_MYINFO |
 	RPL_BOUNCE | RPL_TRACELINK | RPL_TRACECONNECTING | RPL_TRACEHANDSHAKE |
@@ -84,13 +109,10 @@ from StdOverloaded import class fromInt, class toInt, class toString
 	ERR_NOTONCHANNEL | ERR_USERONCHANNEL | ERR_NOLOGIN | ERR_SUMMONDISABLED |
 	ERR_USERSDISABLED | ERR_NOTREGISTERED | ERR_NEEDMOREPARAMS |
 	ERR_ALREADYREGISTRED | ERR_NOPERMFORHOST | ERR_PASSWDMISMATCH |
-	ERR_YOUREBANNEDCREEP | ERR_YOUWILLBEBANNED | ERR_KEYSET | ERR_CHANNELISFULL |
-	ERR_UNKNOWNMODE | ERR_INVITEONLYCHAN | ERR_BANNEDFROMCHAN |
-	ERR_BADCHANNELKEY | ERR_BADCHANMASK | ERR_NOCHANMODES | ERR_BANLISTFULL |
-	ERR_NOPRIVILEGES | ERR_CHANOPRIVSNEEDED | ERR_CANTKILLSERVER |
-	ERR_RESTRICTED | ERR_UNIQOPPRIVSNEEDED | ERR_NOOPERHOST |
-	ERR_UMODEUNKNOWNFLAG | ERR_USERSDONTMATCH
-
-instance toString IRCCommands, IRCReplies, IRCErrors
-instance fromInt IRCReplies, IRCErrors
-instance toInt IRCReplies, IRCErrors
+	ERR_YOUREBANNEDCREEP | ERR_YOUWILLBEBANNED | ERR_KEYSET |
+	ERR_CHANNELISFULL | ERR_UNKNOWNMODE | ERR_INVITEONLYCHAN |
+	ERR_BANNEDFROMCHAN | ERR_BADCHANNELKEY | ERR_BADCHANMASK |
+	ERR_NOCHANMODES | ERR_BANLISTFULL | ERR_NOPRIVILEGES |
+	ERR_CHANOPRIVSNEEDED | ERR_CANTKILLSERVER | ERR_RESTRICTED |
+	ERR_UNIQOPPRIVSNEEDED | ERR_NOOPERHOST | ERR_UMODEUNKNOWNFLAG |
+	ERR_USERSDONTMATCH