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

diff --git a/IRC.icl b/IRC.icl
index 5601e9a..077334a 100644
--- a/IRC.icl
+++ b/IRC.icl
@@ -8,35 +8,29 @@ import Data.Either
 import StdFunc
 import StdString
 import StdChar
+import StdBool
 
 import Text.Parsers.Simple.Core
 import Text.Parsers.Simple.Chars
+import Data.Tuple
 import Control.Monad
 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
 
 jon :== 'Text'.join
 
-derive gPrint IRCCommands, IRCReplies, IRCErrors, (,), Maybe, (), Either
+derive gPrint IRCCommand, IRCReplies, IRCErrors, (,), Maybe, (), Either
 
-:: IRCMessage =
-	{ irc_prefix :: Maybe (Either String IRCUser)
-	, irc_command :: IRCCommands
-	}
-
-:: IRCUser = 
-	{ irc_nick :: String
-	, irc_user :: Maybe String
-	, irc_host :: Maybe String
-	}
-
-//Start = runParser parseMessage $ fromString ":frobnicator!~frobnicat@92.110.128.124 PRIVMSG #cloogle :!query ^_^\r\n"
-Start = runParser parseMessage $ fromString ":frobnicator!~frobnicat@92.110.128.124 QUIT\r\n"
+//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 ":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
@@ -50,13 +44,6 @@ parseMessage = optional (parseEither parseHost parseUser) <* spaceParser
 	<* pToken '\r' <* pToken '\n' 
 	>>= \cmd->pure {IRCMessage | irc_prefix=mprefix, irc_command=cmd}
 
-pCommand :: String -> Parser Char [Char]
-pCommand s = pList (map pToken $ fromString s) <* spaceParser
-
-parseCommand :: Parser Char IRCCommands
-parseCommand = pFail//pCommand "QUIT" >>| QUIT <$> optional (pure "")
-
-
 spaceParser :: Parser Char [Char]
 spaceParser = pMany $ pToken ' '
 
@@ -73,7 +60,7 @@ parseUser = pToken ':' >>| parseNick
 		>>= \mhost->pure {IRCUser | irc_nick=nick, irc_user=muser, irc_host=mhost}
 
 parseUsr :: Parser Char String
-parseUsr = toString <$> pSome (pSatisfy (not o flip isMember [' ', '\x00', '\x0d', '\x0a', '@']))
+parseUsr = toString <$> pSome (pNoneOf [' ', '@':illegal])
 
 parseNick :: Parser Char String
 parseNick = pAlpha >>= \c->pMany (pAlpha <|> pDigit <|> pSpecial)
@@ -83,16 +70,13 @@ 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
 		parseName :: Parser Char String
 		parseName = toString <$> pSome (pAlpha <|> pDigit <|> pToken '.')
 
-IRCCommandParser :: Parser Char IRCCommands
-IRCCommandParser = pFail
-
 instance toString IRCMessage where
 	toString m = maybe "" (\s->either id ((<+) ":") s <+ " ") m.irc_prefix <+ m.irc_command
 
@@ -100,36 +84,139 @@ instance toString IRCUser where
 	toString m = m.irc_nick <+ maybe "" ((<+) "!") m.irc_user
 		<+ maybe "" ((<+) "@") m.irc_host
 
-instance toString IRCCommands where
-	toString r = flip (+++) "\r\n" case r of
-	//ADMIN (Maybe String)
+cons :: a [a] -> [a]
+cons a as = [a:as]
+
+pMiddle :: Parser Char String
+pMiddle = fmap toString $
+	spaceParser >>| liftM2 cons (pNotSatisfy ((==)':')) (pMany $ pNoneOf [' ':illegal])
+
+pTrailing :: Parser Char String
+pTrailing = fmap toString $ 
+	spaceParser >>| pToken ':' >>| pMany (pNoneOf illegal)
+
+pParam :: Parser Char String
+pParam = pMiddle <|> pTrailing
+
+pNoneOf :: [a] -> Parser a a | Eq a
+pNoneOf l = pSatisfy (not o flip isMember l)
+
+pNotSatisfy :: (a -> Bool) -> Parser a a | Eq a
+pNotSatisfy f = pSatisfy (not o f)
+
+pInt :: Parser Char Int
+pInt = toInt o toString <$> (spaceParser >>| pSome pDigit)
+
+illegal :: [Char]
+illegal = ['\x00','\r','\n']
+
+pCommand :: String -> Parser Char [Char]
+pCommand s = pList (map pToken $ fromString s)
+
+pCommand0 :: String IRCCommand -> Parser Char IRCCommand
+pCommand0 s c = pCommand s >>| pure c
+
+pCommand1 :: String (Parser Char a) (a -> IRCCommand) -> Parser Char IRCCommand
+pCommand1 s p c = pCommand s >>| liftM c p
+
+pCommand2 :: String (Parser Char a) (Parser Char b) (a b -> IRCCommand) -> Parser Char IRCCommand
+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
+	<|> pCommand1 "AWAY" pParam AWAY
+	<|> pCommand2 "CONNECT" pParam (optional $ liftM2 tuple pInt (optional pParam)) CONNECT
+	<|> pCommand0 "DIE" DIE
+	<|> pCommand1 "ERROR" pParam ERROR
+	<|> pCommand1 "INFO" (optional pParam) INFO
+	<|> pCommand2 "INVITE" pMiddle pMiddle INVITE
+	<|> pCommand1 "ISON" (pSome pMiddle) ISON
+	<|> 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
+	<|> 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 = jon " " (print r) +++ "\r\n"
+
+print :: IRCCommand -> [String]
+print r = case r of
+		ADMIN mm = ["ADMIN":maybeToList mm]
 	//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 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 
@@ -143,7 +230,7 @@ instance toString IRCCommands 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)
@@ -151,7 +238,10 @@ instance toString IRCCommands 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