X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=IRC.dcl;h=d88205b379dc0e0963f6ff3d1fc0da88bac976fc;hp=337d6f9c9b2878dc1b4095db58ed421dbb014bf7;hb=6fb569170aca43bf17a5e223544c0a5ef0b42fb6;hpb=a8fbb81c3108a913c6496553346037805157b9c0

diff --git a/IRC.dcl b/IRC.dcl
index 337d6f9..d88205b 100644
--- a/IRC.dcl
+++ b/IRC.dcl
@@ -1,6 +1,5 @@
 definition module IRC
 
-from Data.Either import :: Either
 from Data.Maybe import :: Maybe
 from StdOverloaded import class fromInt, class toInt, class toString
 
@@ -13,7 +12,7 @@ from StdOverloaded import class fromInt, class toInt, class toString
 	| INFO (Maybe String)
 	| INVITE String String
 	| ISON [String]
-	| JOIN (Either () [(String, Maybe String)])
+	| JOIN [(String, Maybe String)]
 	| KICK String String (Maybe String)
 	| KILL String String
 	| LINKS (Maybe (Maybe String, String))
@@ -28,8 +27,8 @@ from StdOverloaded import class fromInt, class toInt, class toString
 	| OPER String String 
 	| PART [String]
 	| PASS String
-	| PING [String]
-	| PONG [String]
+	| PING String (Maybe String)
+	| PONG String (Maybe String)
 	| PRIVMSG String String
 	| QUIT (Maybe String)
 	| REHASH