X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=IRC.icl;h=a9b4c27db5d094320700978cb13c22297375310e;hp=8ab91dbfd58e5d92480cb865a62c63450cb98a3e;hb=226254ae192a8a5f2a69f3e35a6823fad36f4d0c;hpb=57707b61bf7f52bf8614dbf6860ff116519533e7

diff --git a/IRC.icl b/IRC.icl
index 8ab91db..a9b4c27 100644
--- a/IRC.icl
+++ b/IRC.icl
@@ -1,47 +1,258 @@
 implementation module IRC
 
+import StdGeneric
 import StdList
 import GenPrint
+import GenBimap
 import StdOverloaded
 import Data.Maybe
 import Data.Either
 import StdFunc
 import StdString
-from Text import class Text(..), instance Text String
+import StdChar
+import StdBool
+import _SystemArray
+
+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(ltrim,indexOf,concat), instance Text String
+import qualified Text
 from StdMisc import undef
+import StdDebug
+
+jon :== 'Text'.join
+
+derive gPrint IRCCommand, IRCReplies, IRCErrors, (,), Maybe, (), Either, IRCMessage, IRCUser, IRCNumReply
+
+Start = jon "\n" $ map printToString
+	[ parseIRCMessage ":clooglebot!~cloogle@dhcp-077-249-221-037.chello.nl QUIT\r\n"
+	, parseIRCMessage ":clooglebot!~cloogle QUIT\r\n"
+	, parseIRCMessage ":frobnicator!~frobnicat@92.110.128.124 QUIT\r\n"
+	, parseIRCMessage ":frobnicator!~frobnicat@92.110.128.124 AWAY test\r\n"
+	, parseIRCMessage ":frobnicator!~frobnicat@92.110.128.124 AWAY :test with spaces\r\n"
+	, parseIRCMessage ":cherryh.freenode.net NOTICE * :*** Found your hostname\r\n"
+	, parseIRCMessage ":cherryh.freenode.net QUIT :hoi hoi\r\n"
+	]
+
+(<+) infixr 5 :: a b -> String | toString a & toString b
+(<+) a b = toString a +++ toString b
+
+parseIRCMessage :: String -> Either [Error] IRCMessage
+parseIRCMessage s = case runParser parsePrefix (fromString s) of
+	([(prefix, rest):_], _)
+		= case parse parseReply rest of
+			Left e = case parseCmd rest of
+				Left e2 = Left $ e2 ++ e
+				Right cmd = Right {IRCMessage | irc_prefix=prefix, irc_command=Right cmd}
+			Right repl = Right {IRCMessage | irc_prefix=prefix, irc_command=Left repl}
+	(_, es) = Left ["couldn't parse prefix":es]
+
+parsePrefix :: Parser Char (Maybe (Either IRCUser String))
+parsePrefix = optional (pToken ':' >>| parseEither parseUser parseHost) <* pToken ' '
+
+generic gIRCParse a :: Parser String a
+gIRCParse{|String|} = pSatisfy (const True)
+gIRCParse{|Int|} = toInt <$> pSatisfy (const True)
+gIRCParse{|EITHER|} p b = LEFT <$> p <|> RIGHT <$> b
+gIRCParse{|PAIR|} p b = liftM2 PAIR p b
+gIRCParse{|UNIT|} = pFail
+gIRCParse{|OBJECT|} p = OBJECT <$> p
+gIRCParse{|CONS of d|} p = CONS <$> (pToken d.gcd_name >>| p)
+gIRCParse{|Maybe|} p = optional p
+gIRCParse{|(,)|} p s = liftM2 tuple p s
+gIRCParse{|[]|} p = pMany p
+gIRCParse{|(->)|} p b = undef
+
+derive gIRCParse IRCCommand
+
+parseCmd :: [Char] -> Either [Error] IRCCommand
+parseCmd cs
+= parse gIRCParse{|*|} $ argfun $ 'Text'.split " " $ toString cs
+//= parse cmdParser $ argfun $ 'Text'.split " " $ toString cs
+	where
+		argfun :: [String] -> [String]
+		argfun [] = []
+		argfun [x:xs]
+		# x = 'Text'.trim x
+		| x.[0] == ':' = [jon " " $ [x:map 'Text'.rtrim xs]]
+		| otherwise = [x:argfun xs]
+
+		p = pSatisfy (const True)
+		lst = fmap $ 'Text'.split ","
+		opt = optional p
+		pInt = toInt <$> p
+
+		nn p f = pToken p >>| f
+
+		cmdParser :: Parser String IRCCommand
+		cmdParser =
+			    (nn "ADMIN"   $ fmap ADMIN       opt)
+			<|> (nn "AWAY"    $ fmap AWAY        p)
+			<|> (nn "CONNECT" $ liftM2 CONNECT   p (optional $ liftM2 tuple pInt opt))
+			<|> (nn "DIE"     $ pure DIE)
+			<|> (nn "ERROR"   $ fmap ERROR       p)
+			<|> (nn "INFO"    $ fmap INFO        opt)
+			<|> (nn "INVITE"  $ liftM2 INVITE    p p)
+			<|> (nn "ISON"    $ fmap ISON      $ pMany p)
+//			<|> (nn "JOIN"    $ fmap JOIN      $ lst p >>= \ch->lst p >>= \ks->pure (zip2 ch (ks ++ repeat Nothing)))
+			<|> (nn "KICK"    $ liftM3 KICK      p p opt)
+			<|> (nn "KILL"    $ liftM2 KILL      p p)
+			<|> (nn "LINKS"   $ fmap LINKS     $ optional $ liftM2 tuple opt p)
+			<|> (nn "LIST"    $ fmap LIST      $ optional $ liftM2 tuple ('Text'.split "," <$> p) opt)
+			<|> (nn "LUSERS"  $ fmap LUSERS    $ optional $ liftM2 tuple p opt)
+			<|> (nn "MODE"    $ liftM5 MODE      p p opt opt opt)
+			<|> (nn "MOTD"    $ fmap MOTD      $ opt)
+			<|> (nn "NAMES"   $ fmap NAMES     $ lst p)
+			<|> (nn "NICK"    $ fmap NAMES     $ lst p)
+			//"NICK" = String (Maybe String)
+			//"NJOIN" = command0 NJOIN args
+			//"NOTICE" = String String
+			//"OPER" = String String 
+			//"PART" = [String]
+			//"PASS" = String
+			//"PING" = String (Maybe String)
+			//"PONG" = String (Maybe String)
+			//"PRIVMSG" = [String] String
+//			"QUIT" = case args of
+//				[_,_:_] = Left $ "QUIT has too many arguments"
+//				x = Right $ QUIT $ listToMaybe x
+//			"REHASH" = command0 REHASH args
+//			"RESTART" = command0 REHASH args
+//			"SERVER" = command0 REHASH args
+			//"SERVICE" = String String String String
+			//"SERVLIST" = (Maybe (String, Maybe String))
+			//"SQUERY" = String String
+//			"SQUIRT" = command0 REHASH args
+			//"SQUIT" = String String
+			//"STATS" = (Maybe (String, Maybe String))
+			//"SUMMON" = String (Maybe (String, Maybe String))
+			//"TIME" = (Maybe String)
+			//"TOPIC" = String (Maybe String)
+			//"TRACE" = (Maybe String)
+			//"USER" = String String String
+			//"USERHOST" = [String]
+			//"USERS" = (Maybe String)
+			//"VERSION" = (Maybe String)
+			//"WALLOPS" = String
+			//"WHO" = (Maybe String)
+			//"WHOIS" = (Maybe String) [String]
+			//"WHOWAS" = (Maybe String) [String]
+
+parseReply :: Parser Char IRCNumReply
+parseReply = (toString <$> pSome pDigit)
+	>>= \rep->pMiddle
+	>>= \recipient->spaceParser >>| (toString <$> pSome (pNoneOf illegal))
+	>>= \msg->pure {IRCNumReply|irc_reply=fs rep,irc_recipient=recipient,irc_message=msg}
+	where
+		fs :: String -> IRCReplies
+		fs s = fromInt $ toInt s
+
+spaceParser :: Parser Char [Char]
+spaceParser = pMany $ pToken ' '
+
+parseServer :: Parser Char String
+parseServer = pFail
 
-derive gPrint IRCCommands, IRCReplies, IRCErrors, (,), Maybe, (), Either
+parseEither :: (Parser a b) (Parser a c) -> Parser a (Either b c)
+parseEither p q = Left <$> p <|> Right <$> q
 
-instance toString IRCCommands where
-	toString r = flip (+++) "\r\n" case r of
-	//ADMIN (Maybe String)
-	//AWAY String
-	//CONNECT String Int (Maybe String)
+parseUser :: Parser Char IRCUser
+parseUser = parseNick
+		>>= \nick->optional (pToken '!' >>| parseUsr)
+		>>= \muser->optional (pToken '@' >>| parseHost)
+		>>= \mhost->pure {IRCUser | irc_nick=nick, irc_user=muser, irc_host=mhost}
+
+parseUsr :: Parser Char String
+parseUsr = toString <$> pSome (pNoneOf [' ', '@':illegal])
+
+parseNick :: Parser Char String
+parseNick = pAlpha >>= \c->pMany (pAlpha <|> pDigit <|> pSpecial)
+	>>= \cs->pure (toString [c:cs])
+
+pSpecial :: Parser Char Char
+pSpecial = pOneOf ['-', '[', ']', '\\', '\`', '^', '{', '}']
+
+parseHost :: Parser Char String
+parseHost = jon "." <$> pSepBy parseName (pToken '.')
+	where
+		parseName :: Parser Char String
+		parseName = toString <$> pSome (pAlpha <|> pDigit <|> pOneOf ['-'])
+
+instance toString IRCNumReply where
+	toString m = toInt m.irc_reply <+ " " <+ m.irc_recipient <+ " " <+ formatMSG m.irc_message
+instance toString IRCMessage where
+	toString m = maybe "" (\s->either ((<+) ":") id s <+ " ") m.irc_prefix
+		<+ either toString toString m.irc_command
+
+instance toString IRCUser where
+	toString m = m.irc_nick <+ maybe "" ((<+) "!") m.irc_user
+		<+ maybe "" ((<+) "@") m.irc_host
+
+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']
+
+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 m = ["AWAY",m]
+	//CONNECT String (Maybe (Int, Maybe String))
 	//DIE 
 	//ERROR String
 	//INFO (Maybe String)
 	//INVITE String String
 	//ISON [String]
-		JOIN chs = "JOIN " +++ (if (isEmpty chs) "0"
-			(join ", " [join " " [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 = join " " ["NICK", n]
+		NICK n ms = ["NICK", n]
 	//NJOIN 
 	//NOTICE String String
 	//OPER String String 
 	//PART [String]
 	//PASS String
-	//PING [String]
-	//PONG [String]
-		PRIVMSG dest msg = join " " ["PRIVMSG", dest, msg]
-		QUIT msg = join " " ["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 
@@ -55,7 +266,7 @@ instance toString IRCCommands where
 	//TIME (Maybe String)
 	//TOPIC String (Maybe String)
 	//TRACE (Maybe String)
-		USER login mode rn = join " " ["USER", login, toString mode, "*", ":", rn]
+		USER login mode rn = ["USER", login, mode, "*", ":"+++rn]
 	//USERHOST [String]
 	//USERS (Maybe String)
 	//VERSION (Maybe String)
@@ -63,7 +274,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