X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=IRC.icl;h=077334ad66511806e776b4c5e8aaf3b3aaef967e;hp=a7f72507138550e5b779ffb64aa9fe30b3cba992;hb=3134ab7e61bcbc84560b4a5d613a92b1a48362c2;hpb=000d2eb9df3a1521626dc996b8f9f0281c55a6f1

diff --git a/IRC.icl b/IRC.icl
index a7f7250..077334a 100644
--- a/IRC.icl
+++ b/IRC.icl
@@ -8,6 +8,7 @@ import Data.Either
 import StdFunc
 import StdString
 import StdChar
+import StdBool
 
 import Text.Parsers.Simple.Core
 import Text.Parsers.Simple.Chars
@@ -17,7 +18,7 @@ import Control.Applicative
 from Data.Functor import <$>
 
 from Data.Func import $
-from Text import class Text(concat), instance Text String
+from Text import class Text(indexOf,concat), instance Text String
 import qualified Text
 from StdMisc import undef
 
@@ -27,7 +28,9 @@ derive gPrint IRCCommand, IRCReplies, IRCErrors, (,), Maybe, (), Either
 
 //Start = runParser parseMessage $ fromString ":frobnicator!~frobnicat@92.110.128.124 QUIT\r\n"
 //Start = runParser parseMessage $ fromString ":frobnicator!~frobnicat@92.110.128.124 AWAY test\r\n"
-Start = runParser parseMessage $ fromString ":frobnicator!~frobnicat@92.110.128.124 AWAY test with spaces\r\n"
+//Start = runParser parseMessage $ fromString ":frobnicator!~frobnicat@92.110.128.124 AWAY :test with spaces\r\n"
+//Start = runParser parseMessage $ fromString ":cherryh.freenode.net NOTICE * :*** Found your hostname\r\n"
+Start = runParser parseMessage $ fromString ":cherryh.freenode.net QUIT\r\n"
 
 (<+) infixr 5 :: a b -> String | toString a & toString b
 (<+) a b = toString a +++ toString b
@@ -67,7 +70,7 @@ pSpecial :: Parser Char Char
 pSpecial = pOneOf ['-', '[', ']', '\\', '\`', '^', '{', '}']
 
 parseHost :: Parser Char String
-parseHost = parseName
+parseHost = pToken ':' >>| parseName
 	>>= \nm->pMany (pToken '.' >>| parseName)
 	>>= \nms->pure (concat [nm:nms])
 	where
@@ -86,11 +89,11 @@ cons a as = [a:as]
 
 pMiddle :: Parser Char String
 pMiddle = fmap toString $
-	spaceParser >>| pToken ':' >>| pMany (pNoneOf illegal)
+	spaceParser >>| liftM2 cons (pNotSatisfy ((==)':')) (pMany $ pNoneOf [' ':illegal])
 
 pTrailing :: Parser Char String
 pTrailing = fmap toString $ 
-	spaceParser >>| liftM2 cons (pNotSatisfy ((==)':')) (pMany $ pNoneOf [' ':illegal])
+	spaceParser >>| pToken ':' >>| pMany (pNoneOf illegal)
 
 pParam :: Parser Char String
 pParam = pMiddle <|> pTrailing
@@ -122,6 +125,15 @@ pCommand2 s p q c = pCommand s >>| liftM2 c p q
 pCommand3 :: String (Parser Char a) (Parser Char b) (Parser Char c) (a b c -> IRCCommand) -> Parser Char IRCCommand
 pCommand3 s p q r c = pCommand s >>| liftM3 c p q r
 
+pCommand4 :: String (Parser Char a) (Parser Char b) (Parser Char c) (Parser Char d) (a b c d -> IRCCommand) -> Parser Char IRCCommand
+pCommand4 s p q r t c = pCommand s >>| liftM4 c p q r t
+
+pCommand5 :: String (Parser Char a) (Parser Char b) (Parser Char c) (Parser Char d) (Parser Char e) (a b c d e -> IRCCommand) -> Parser Char IRCCommand
+pCommand5 s p q r t u c = pCommand s >>| liftM5 c p q r t u
+
+pMode :: Parser Char String
+pMode = toString <$> pSome (pOneOf ['+','-','o','p','i','t','n','b','v','w','s'])
+
 parseCommand :: Parser Char IRCCommand
 parseCommand = 
 	    pCommand1 "ADMIN" (optional pMiddle) ADMIN
@@ -135,12 +147,49 @@ parseCommand =
 	<|> pCommand1 "JOIN" (pSepBy (liftM2 tuple pMiddle $ optional pMiddle) pComma) JOIN
 	<|> pCommand3 "KICK" pMiddle pMiddle (optional pParam) KICK
 	<|> pCommand2 "KILL" pMiddle pParam KILL
-	<|> pCommand1 "LINKS" (optional (liftM2 tuple (optional pMiddle) pMiddle)) LINKS
-	//<|> pCommand "QUIT" (optional pParam))
+	<|> pCommand1 "LINKS" (optional $ liftM2 tuple (optional pMiddle) pMiddle) LINKS
+	<|> pCommand1 "LIST" (optional $ liftM2 tuple (pSepBy pMiddle pComma) $ optional pMiddle) LIST
+	<|> pCommand1 "LUSERS" (optional $ liftM2 tuple pMiddle $ optional pMiddle) LUSERS
+	<|> pCommand5 "MODE" pMiddle pMode (optional pMiddle) (optional pMiddle) (optional pMiddle) MODE
+	<|> pCommand1 "MOTD" (optional pMiddle) MOTD
+	<|> pCommand1 "NAMES" (pSepBy pMiddle pComma) NAMES
+	//NJOIN 
+	<|> pCommand2 "NOTICE" pParam pParam NOTICE
+	//OPER String String 
+	//PART [String]
+	//PASS String
+	<|> pCommand2 "PING" pMiddle (optional pMiddle) PING
+	<|> pCommand2 "PONG" pMiddle (optional pMiddle) PONG
+	<|> pCommand2 "PRIVMSG" (pSepBy pMiddle pComma) pParam PRIVMSG
+	<|> pCommand1 "QUIT" (optional pParam) QUIT
+	//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)
+	<|> pCommand3 "USER" pMiddle pMiddle (pMiddle >>| pParam) USER
+	//USERHOST [String]
+	//USERS (Maybe String)
+	//VERSION (Maybe String)
+	//WALLOPS String
+	//WHO (Maybe String)
+	//WHOIS (Maybe String) [String]
+	//WHOWAS (Maybe String) [String]
 
 instance toString IRCCommand where
-	toString r = flip (+++) "\r\n" case r of
-	//ADMIN (Maybe String)
+	toString r = jon " " (print r) +++ "\r\n"
+
+print :: IRCCommand -> [String]
+print r = case r of
+		ADMIN mm = ["ADMIN":maybeToList mm]
 	//AWAY String
 	//CONNECT String (Maybe (Int, Maybe String))
 	//DIE 
@@ -148,26 +197,26 @@ instance toString IRCCommand where
 	//INFO (Maybe String)
 	//INVITE String String
 	//ISON [String]
-		JOIN chs = "JOIN " +++ (if (isEmpty chs) "0"
-			(jon ", " [jon " " [ch:maybeToList mk]\\(ch, mk)<-chs]))
+		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 [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 n = jon " " ["NICK", n]
+		NICK n ms = ["NICK", n]
 	//NJOIN 
 	//NOTICE String String
 	//OPER String String 
 	//PART [String]
 	//PASS String
-		PING a mb = jon " " ["PING",a:maybeToList mb]
-		PONG a mb = jon " " ["PONG",a:maybeToList mb]
-		PRIVMSG dest msg = jon " " ["PRIVMSG", dest, ":"+++msg]
-		QUIT msg = jon " " ["QUIT":maybeToList msg]
+		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 
@@ -181,7 +230,7 @@ instance toString IRCCommand where
 	//TIME (Maybe String)
 	//TOPIC String (Maybe String)
 	//TRACE (Maybe String)
-		USER login mode rn = jon " " ["USER", login, toString mode, "*", ":"+++rn]
+		USER login mode rn = ["USER", login, mode, "*", ":"+++rn]
 	//USERHOST [String]
 	//USERS (Maybe String)
 	//VERSION (Maybe String)
@@ -189,7 +238,10 @@ instance toString IRCCommand where
 	//WHO (Maybe String)
 	//WHOIS (Maybe String) [String]
 	//WHOWAS (Maybe String) [String]
-		_ = printToString r
+		_ = [printToString r]
+
+formatMSG :: String -> String
+formatMSG s = if (indexOf " " s > 0 || indexOf " " s > 0) (":" +++ s) s
 
 
 instance toString IRCReplies where toString r = printToString r