X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=IRC.dcl;h=ae14b8f625c5effa46a563a2c7e55a95c90c788a;hp=afb7a747682257173be7cdacc06560f6b5f7238d;hb=3134ab7e61bcbc84560b4a5d613a92b1a48362c2;hpb=f828f3a79cfcfb21c6c7a7773905cc210a739f75

diff --git a/IRC.dcl b/IRC.dcl
index afb7a74..ae14b8f 100644
--- a/IRC.dcl
+++ b/IRC.dcl
@@ -1,12 +1,14 @@
 definition module IRC
 
+import IRCBot
 from Data.Maybe import :: Maybe
 from Data.Either import :: Either
 from StdOverloaded import class fromInt, class toInt, class toString, class fromString
+from Text.Parsers.Simple.Core import :: Error
 
 :: IRCMessage =
 	{ irc_prefix :: Maybe (Either String IRCUser)
-	, irc_command :: IRCCommands}
+	, irc_command :: IRCCommand}
 
 :: IRCUser = 
 	{ irc_nick :: String
@@ -14,14 +16,16 @@ from StdOverloaded import class fromInt, class toInt, class toString, class from
 	, irc_host :: Maybe String
 	}
 
-instance toString IRCCommands, IRCReplies, IRCErrors, IRCMessage, IRCUser
+parseIRCMessage :: (String -> Either [Error] IRCMessage)
+
+instance toString IRCCommand, IRCReplies, IRCErrors, IRCMessage, IRCUser
 instance fromInt IRCReplies, IRCErrors
 instance toInt IRCReplies, IRCErrors
 
-:: IRCCommands
+:: IRCCommand
 	= ADMIN (Maybe String)
 	| AWAY String
-	| CONNECT String Int (Maybe String)
+	| CONNECT String (Maybe (Int, Maybe String))
 	| DIE 
 	| ERROR String
 	| INFO (Maybe String)
@@ -31,12 +35,12 @@ instance toInt IRCReplies, IRCErrors
 	| KICK String String (Maybe String)
 	| KILL String String
 	| LINKS (Maybe (Maybe String, String))
-	| LIST [String]
+	| LIST (Maybe ([String], 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
+	| NICK String (Maybe String)
 	| NJOIN 
 	| NOTICE String String
 	| OPER String String 
@@ -44,7 +48,7 @@ instance toInt IRCReplies, IRCErrors
 	| PASS String
 	| PING String (Maybe String)
 	| PONG String (Maybe String)
-	| PRIVMSG String String
+	| PRIVMSG [String] String
 	| QUIT (Maybe String)
 	| REHASH 
 	| RESTART 
@@ -59,7 +63,7 @@ instance toInt IRCReplies, IRCErrors
 	| TIME (Maybe String)
 	| TOPIC String (Maybe String)
 	| TRACE (Maybe String)
-	| USER String Int String
+	| USER String String String
 	| USERHOST [String]
 	| USERS (Maybe String)
 	| VERSION (Maybe String)