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

diff --git a/IRC.icl b/IRC.icl
index 077334a..39e3f50 100644
--- a/IRC.icl
+++ b/IRC.icl
@@ -1,252 +1,134 @@
 implementation module IRC
 
-import StdList
-import GenPrint
-import StdOverloaded
-import Data.Maybe
-import Data.Either
-import StdFunc
-import StdString
-import StdChar
-import StdBool
+import StdEnv
 
-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(indexOf,concat), instance Text String
-import qualified Text
-from StdMisc import undef
-
-jon :== 'Text'.join
-
-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 ":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
-
-parseIRCMessage :: (String -> Either [Error] IRCMessage)
-parseIRCMessage = parse parseMessage o fromString
-
-parseMessage :: Parser Char IRCMessage
-parseMessage = optional (parseEither parseHost parseUser) <* spaceParser
-	>>= \mprefix->parseCommand
-	<* pToken '\r' <* pToken '\n' 
-	>>= \cmd->pure {IRCMessage | irc_prefix=mprefix, irc_command=cmd}
-
-spaceParser :: Parser Char [Char]
-spaceParser = pMany $ pToken ' '
-
-parseServer :: Parser Char String
-parseServer = pFail
-
-parseEither :: (Parser a b) (Parser a c) -> Parser a (Either b c)
-parseEither p q = Left <$> p <|> Right <$> q
-
-parseUser :: Parser Char IRCUser
-parseUser = pToken ':' >>| 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 ['-', '[', ']', '\\', '\`', '^', '{', '}']
+import Control.Monad => qualified join
+import Data.Either
+import Data.Func
+import Data.Maybe
+import Text
+import Text.GenPrint
+import Text.Parsers.Simple.Chars
+import Text.Parsers.Simple.Core
 
-parseHost :: Parser Char String
-parseHost = pToken ':' >>| parseName
-	>>= \nm->pMany (pToken '.' >>| parseName)
-	>>= \nms->pure (concat [nm:nms])
+import GenIRC
+
+derive gPrint IRCErrors, IRCReplies, Maybe, Either, IRCUser, IRCNumReply
+
+Start = (map (fmap toString) msgs, msgs)
+where
+	msgs =
+		[ 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"
+		, parseIRCMessage ":cherryh.freenode.net JOIN #cha,#ch-b #twilight\r\n"
+		, parseIRCMessage ":cherryh.freenode.net ISON a b c d e f :g h\r\n"
+		, parseIRCMessage ":wilhelm.freenode.net 001 clooglebot :Welcome to the freenode Internet Relay Chat Network clooglebot\r\n"
+		, parseIRCMessage "PING :orwell.freenode.net\r\n"
+		, parseIRCMessage ":ChanServ!ChanServ@services. MODE #cloogle +o frobnicator\r\n"
+		, parseIRCMessage ":qbot_v01!~qbot@ip-213-124-170-20.ip.prioritytelecom.net PRIVMSG ##chinees :[link] Cloogle - https://cloogle.org"
+		]
+
+parseIRCMessage :: String -> Either [Error] IRCMessage
+parseIRCMessage s = case runParser parsePrefix (fromString s) of
+	// Prefix is parsed
+	([(prefix, rest):_], _)
+		//Try parsing a numeric reply
+		= case parse parseReply rest of
+			//Try a normal command
+			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}
+	// Error parsing prefix
+	(_, es) = Left ["Error parsing prefix"]
+
+//Prefix
+parsePrefix :: Parser Char (Maybe (Either IRCUser String))
+parsePrefix
+	= optional (pToken ':' >>| parseEither parseUser parseHost <* pToken ' ')
+where
+	parseEither :: (Parser a b) (Parser a c) -> Parser a (Either b c)
+	parseEither p q = Left <$> p <|> Right <$> q
+
+	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 <|> pOneOf (fromString "_-[]\\`^{}"))
+		>>= \cs->pure (toString [c:cs])
+
+	parseHost :: Parser Char String
+	parseHost = join "." <$> (pSepBy parseName (pToken '.'))
+		>>= \s->optional (pToken '.') >>= pure o maybe s (\p->s+++toString s)
+		where
+			parseName :: Parser Char String
+			parseName = toString <$> pSome (pAlpha <|> pDigit <|> pOneOf ['-', '/'])
+
+//Parse Cmd
+parseCmd :: [Char] -> Either Error IRCCommand
+parseCmd cs = fst $ gIRCParse{|*|} $ argfun $ split " " $ toString cs
 	where
-		parseName :: Parser Char String
-		parseName = toString <$> pSome (pAlpha <|> pDigit <|> pToken '.')
-
-instance toString IRCMessage where
-	toString m = maybe "" (\s->either id ((<+) ":") s <+ " ") m.irc_prefix <+ 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
+		argfun :: [String] -> [String]
+		argfun [] = []
+		argfun [x:xs]
+		# x = trim x
+		| x.[0] == ':' = [join " " $ [x % (1, size x):map rtrim xs]]
+		| otherwise = [x:argfun xs]
+
+//Reply
+parseReply :: Parser Char IRCNumReply
+parseReply = spaceParser
+	>>|       (pMany (pToken '0') >>| pSome pDigit <* spaceParser)
+	>>= \rep->(toString <$> pSome (pNoneOf [' ':illegal]) <* spaceParser)
+	>>= \rec->(toString <$> pSome (pNoneOf illegal))
+	>>= \msg->pure {IRCNumReply
+		| irc_reply     = fromInt $ toInt $ toString rep
+		, irc_recipient = rec
+		, irc_message   = msg % (if (msg.[0] == ':') 1 0, size msg)
+		}
+	<* pToken '\r' <* pToken '\n'
+	where
+		spaceParser :: Parser Char [Char]
+		spaceParser = pMany $ pToken ' '
 
+//Common parsers
 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 IRCNumReply where
+	toString m = lpad (toString $ toInt m.irc_reply) 3 '0' <+ " " <+
+		m.irc_recipient <+ " " <+ concat (gIRCPrint{|*|} 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
 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 (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])]
-	//KICK String String (Maybe String)
-	//KILL String String
-	//LINKS (Maybe (Maybe String, String))
-	//LIST (Maybe ([String], Maybe String))
-	//LUSERS (Maybe (String, Maybe String))
-	//MODE String String (Maybe String) (Maybe String) (Maybe String)
-	//MOTD (Maybe String)
-	//NAMES [String]
-		NICK n ms = ["NICK", n]
-	//NJOIN 
-	//NOTICE String String
-	//OPER String String 
-	//PART [String]
-	//PASS String
-		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 
-	//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)
-		USER login mode rn = ["USER", login, mode, "*", ":"+++rn]
-	//USERHOST [String]
-	//USERS (Maybe String)
-	//VERSION (Maybe String)
-	//WALLOPS String
-	//WHO (Maybe String)
-	//WHOIS (Maybe String) [String]
-	//WHOWAS (Maybe String) [String]
-		_ = [printToString r]
-
-formatMSG :: String -> String
-formatMSG s = if (indexOf " " s > 0 || indexOf " " s > 0) (":" +++ s) s
-
-
+	toString m = join " " (gIRCPrint{|*|} m) +++ "\r\n"
 instance toString IRCReplies where toString r = printToString r
 instance toString IRCErrors where toString r = printToString r
 
+(<+) infixr 5 :: a b -> String | toString a & toString b
+(<+) a b = toString a +++ toString b
+
 instance fromInt IRCReplies where
 	fromInt r = case r of 
 		1 = RPL_WELCOME
@@ -333,7 +215,7 @@ instance fromInt IRCReplies where
 		393 = RPL_USERS
 		394 = RPL_ENDOFUSERS
 		395 = RPL_NOUSERS
-		_ = undef
+		_ = RPL_UNKNOWN
 
 instance toInt IRCReplies where
 	toInt r = case r of 
@@ -421,6 +303,7 @@ instance toInt IRCReplies where
 		RPL_USERS = 393
 		RPL_ENDOFUSERS = 394
 		RPL_NOUSERS = 395
+		RPL_UNKNOWN = 998
 
 instance fromInt IRCErrors where
 	fromInt r = case r of
@@ -477,6 +360,7 @@ instance fromInt IRCErrors where
 		491 = ERR_NOOPERHOST
 		501 = ERR_UMODEUNKNOWNFLAG
 		502 = ERR_USERSDONTMATCH
+		_ = ERR_UNKNOWN
 
 instance toInt IRCErrors where
 	toInt r = case r of
@@ -533,3 +417,4 @@ instance toInt IRCErrors where
 		ERR_NOOPERHOST = 491
 		ERR_UMODEUNKNOWNFLAG = 501
 		ERR_USERSDONTMATCH = 502
+		ERR_UNKNOWN = 999